[pkg-java] r17044 - in trunk/jbossas4/debian: . patches
Shuxiong Ye
yesx-guest at alioth.debian.org
Sat Jul 20 02:01:24 UTC 2013
Author: yesx-guest
Date: 2013-07-20 02:01:24 +0000 (Sat, 20 Jul 2013)
New Revision: 17044
Added:
trunk/jbossas4/debian/patches/compatible-with-java7
Modified:
trunk/jbossas4/debian/changelog
trunk/jbossas4/debian/patches/series
Log:
fix FTBFS with Java7
Modified: trunk/jbossas4/debian/changelog
===================================================================
--- trunk/jbossas4/debian/changelog 2013-07-19 12:14:38 UTC (rev 17043)
+++ trunk/jbossas4/debian/changelog 2013-07-20 02:01:24 UTC (rev 17044)
@@ -1,11 +1,17 @@
jbossas4 (4.2.3.GA-8) UNRELEASED; urgency=low
+ [ Niels Thykier ]
* Team upload.
* Compile Java with source 1.5 and target 1.5 if it did
not explicitly had another source marker.
- -- Niels Thykier <niels at thykier.net> Thu, 21 Jun 2012 13:49:33 +0200
+ [ ShuxiongYe ]
+ * Team upload.
+ * Compatible with Java7. (Closes: #717116)
+ - debian/compatible-with-java7
+ -- ShuxiongYe <yeshuxiong at gmail.com> Sat, 20 Jul 2013 08:08:50 +0800
+
jbossas4 (4.2.3.GA-7) unstable; urgency=low
* Team upload.
Added: trunk/jbossas4/debian/patches/compatible-with-java7
===================================================================
--- trunk/jbossas4/debian/patches/compatible-with-java7 (rev 0)
+++ trunk/jbossas4/debian/patches/compatible-with-java7 2013-07-20 02:01:24 UTC (rev 17044)
@@ -0,0 +1,240 @@
+Index: jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/WrapperDataSource.java
+===================================================================
+--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/adapter/jdbc/WrapperDataSource.java 2008-07-18 23:06:08.000000000 +0800
++++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/WrapperDataSource.java 2013-07-19 05:11:45.372280951 +0800
+@@ -25,6 +25,8 @@
+ import java.io.Serializable;
+ import java.sql.Connection;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+
+ import javax.naming.Reference;
+ import javax.resource.Referenceable;
+@@ -165,4 +167,9 @@
+ throw new NestedSQLException(e);
+ }
+ }
++
++
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
+ }
+Index: jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/CachedCallableStatementJDK6.java
+===================================================================
+--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/CachedCallableStatementJDK6.java 2008-07-18 23:06:08.000000000 +0800
++++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/CachedCallableStatementJDK6.java 2013-07-19 05:11:45.400281067 +0800
+@@ -30,6 +30,7 @@
+ import java.sql.RowId;
+ import java.sql.SQLException;
+ import java.sql.SQLXML;
++import java.util.Map;
+
+ import org.jboss.resource.adapter.jdbc.CachedCallableStatement;
+
+@@ -310,4 +311,24 @@
+ {
+ getWrappedObject().setSQLXML(parameterName, xmlObject);
+ }
++
++
++ public <T> T getObject(int parameterIndex, Class<T> type) throws SQLException {
++ throw new SQLException();
++ }
++
++
++ public <T> T getObject(String parameterName, Class<T> type) throws SQLException {
++ throw new SQLException();
++ }
++
++
++ public void closeOnCompletion() throws SQLException {
++ throw new SQLException();
++ }
++
++
++ public boolean isCloseOnCompletion() throws SQLException {
++ throw new SQLException();
++ }
+ }
+Index: jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/CachedPreparedStatementJDK6.java
+===================================================================
+--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/CachedPreparedStatementJDK6.java 2008-07-18 23:06:08.000000000 +0800
++++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/CachedPreparedStatementJDK6.java 2013-07-19 05:11:45.400281067 +0800
+@@ -148,4 +148,14 @@
+ {
+ getWrappedObject().setPoolable(poolable);
+ }
++
++
++ public void closeOnCompletion() throws SQLException {
++ throw new SQLException();
++ }
++
++
++ public boolean isCloseOnCompletion() throws SQLException {
++ throw new SQLException();
++ }
+ }
+Index: jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedCallableStatementJDK6.java
+===================================================================
+--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedCallableStatementJDK6.java 2008-07-18 23:06:08.000000000 +0800
++++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedCallableStatementJDK6.java 2013-07-19 05:11:45.400281067 +0800
+@@ -32,6 +32,7 @@
+ import java.sql.RowId;
+ import java.sql.SQLException;
+ import java.sql.SQLXML;
++import java.util.Map;
+
+ import org.jboss.resource.adapter.jdbc.WrappedCallableStatement;
+ import org.jboss.resource.adapter.jdbc.WrappedResultSet;
+@@ -745,4 +746,24 @@
+ }
+ }
+
++
++ public <T> T getObject(int parameterIndex, Class<T> type) throws SQLException {
++ throw new SQLException();
++ }
++
++
++ public <T> T getObject(String parameterName, Class<T> type) throws SQLException {
++ throw new SQLException();
++ }
++
++
++ public void closeOnCompletion() throws SQLException {
++ throw new SQLException();
++ }
++
++
++ public boolean isCloseOnCompletion() throws SQLException {
++ throw new SQLException();
++ }
++
+ }
+Index: jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedConnectionJDK6.java
+===================================================================
+--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedConnectionJDK6.java 2008-07-18 23:06:08.000000000 +0800
++++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedConnectionJDK6.java 2013-07-19 05:11:45.400281067 +0800
+@@ -33,7 +33,9 @@
+ import java.sql.SQLXML;
+ import java.sql.Statement;
+ import java.sql.Struct;
++import java.util.Map;
+ import java.util.Properties;
++import java.util.concurrent.Executor;
+
+ import org.jboss.resource.adapter.jdbc.BaseWrapperManagedConnection;
+ import org.jboss.resource.adapter.jdbc.WrappedCallableStatement;
+@@ -343,4 +345,30 @@
+ unlock();
+ }
+ }
++
++
++ public void setSchema(String schema) throws SQLException {
++ throw new SQLException();
++ }
++
++
++ public String getSchema() throws SQLException {
++ throw new SQLException();
++ }
++
++
++ public void abort(Executor executor) throws SQLException {
++ throw new SQLException();
++ }
++
++
++ public void setNetworkTimeout(Executor executor, int milliseconds)
++ throws SQLException {
++ throw new SQLException();
++ }
++
++
++ public int getNetworkTimeout() throws SQLException {
++ throw new SQLException();
++ }
+ }
+Index: jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedPreparedStatementJDK6.java
+===================================================================
+--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedPreparedStatementJDK6.java 2008-07-18 23:06:08.000000000 +0800
++++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedPreparedStatementJDK6.java 2013-07-19 05:11:45.400281067 +0800
+@@ -490,4 +490,14 @@
+ unlock();
+ }
+ }
++
++
++ public void closeOnCompletion() throws SQLException {
++ throw new SQLException();
++ }
++
++
++ public boolean isCloseOnCompletion() throws SQLException {
++ throw new SQLException();
++ }
+ }
+Index: jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedResultSetJDK6.java
+===================================================================
+--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedResultSetJDK6.java 2008-07-18 23:06:08.000000000 +0800
++++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedResultSetJDK6.java 2013-07-19 05:11:45.400281067 +0800
+@@ -28,6 +28,7 @@
+ import java.sql.RowId;
+ import java.sql.SQLException;
+ import java.sql.SQLXML;
++import java.util.Map;
+
+ import org.jboss.resource.adapter.jdbc.WrappedResultSet;
+ import org.jboss.resource.adapter.jdbc.WrappedStatement;
+@@ -670,4 +671,14 @@
+ throw checkException(t);
+ }
+ }
++
++
++ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
++ throw new SQLException();
++ }
++
++
++ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
++ throw new SQLException();
++ }
+ }
+Index: jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedStatementJDK6.java
+===================================================================
+--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedStatementJDK6.java 2008-07-18 23:06:08.000000000 +0800
++++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/WrappedStatementJDK6.java 2013-07-19 05:11:45.400281067 +0800
+@@ -107,4 +107,14 @@
+ unlock();
+ }
+ }
++
++
++ public void closeOnCompletion() throws SQLException {
++ throw new SQLException();
++ }
++
++
++ public boolean isCloseOnCompletion() throws SQLException {
++ throw new SQLException();
++ }
+ }
+Index: jbossas4-4.2.3.GA/ejb3/src/main/org/jboss/ejb/ResourceImpl.java
+===================================================================
+--- jbossas4-4.2.3.GA.orig/ejb3/src/main/org/jboss/ejb/ResourceImpl.java 2008-07-18 23:00:50.000000000 +0800
++++ jbossas4-4.2.3.GA/ejb3/src/main/org/jboss/ejb/ResourceImpl.java 2013-07-19 05:28:44.365333867 +0800
+@@ -99,4 +99,9 @@
+ {
+ return javax.annotation.Resource.class;
+ }
++
++
++ public String lookup() {
++ return null;
++ }
+ }
Modified: trunk/jbossas4/debian/patches/series
===================================================================
--- trunk/jbossas4/debian/patches/series 2013-07-19 12:14:38 UTC (rev 17043)
+++ trunk/jbossas4/debian/patches/series 2013-07-20 02:01:24 UTC (rev 17044)
@@ -9,3 +9,4 @@
deployers.diff
hibernate35.diff
hibernate36.diff
+compatible-with-java7
More information about the pkg-java-commits
mailing list