Author: fhanik
Date: Thu Jul 12 15:38:28 2012
New Revision: 1360729
URL: http://svn.apache.org/viewvc?rev=1360729&view=rev
Log:
Configure Tomcat trunk to build with Java 7.
This includes adding a patch to the Commons-DBCP code from res/dbcp
Added:
tomcat/trunk/res/dbcp/
tomcat/trunk/res/dbcp/dbcp-java-7.patch (with props)
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ResultSet.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Statement.java
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1360729&r1=1360728&r2=1360729&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Jul 12 15:38:28 2012
@@ -57,8 +57,8 @@ base.path=/usr/share/java
#base.path=C:/path/to/the/repository
#base.path=/usr/local
-compile.source=1.6
-compile.target=1.6
+compile.source=1.7
+compile.target=1.7
compile.debug=true
base-apache.loc.1=http://www.apache.org/dist
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1360729&r1=1360728&r2=1360729&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Jul 12 15:38:28 2012
@@ -2426,6 +2426,13 @@ Apache Tomcat ${version} native binaries
<exclude name="**/managed/**" />
</fileset>
</copy>
+ <echo>Copied files to ${tomcat-dbcp.home}</echo>
+
+ <patch patchfile="${basedir}/res/dbcp/dbcp-java-7.patch"
+ dir="${tomcat-dbcp.home}"
+ ignorewhitespace="true"
+ strip="0"/>
+
<replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
encoding="ISO-8859-1">
<replacefilter token="org.apache.commons"
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java?rev=1360729&r1=1360728&r2=1360729&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
Thu Jul 12 15:38:28 2012
@@ -285,25 +285,36 @@ public class Connection implements java.
return null;
}
- // ---------------------------------------------------------- Java 7
methods
- // Can't add @Override annotations since this code also has to compile with
- // Java 6 for Tomcat 7.
-
+ @Override
public void setSchema(String schema) throws SQLException {
+ // TODO Auto-generated method stub
+
}
+ @Override
public String getSchema() throws SQLException {
+ // TODO Auto-generated method stub
return null;
}
+ @Override
public void abort(Executor executor) throws SQLException {
+ // TODO Auto-generated method stub
+
}
- public void setNetworkTimeout(Executor executor, int milliseconds)
- throws SQLException {
+ @Override
+ public void setNetworkTimeout(Executor executor, int milliseconds) throws
SQLException {
+ // TODO Auto-generated method stub
+
}
+ @Override
public int getNetworkTimeout() throws SQLException {
+ // TODO Auto-generated method stub
return 0;
}
+
+
+
}
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java?rev=1360729&r1=1360728&r2=1360729&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
Thu Jul 12 15:38:28 2012
@@ -78,12 +78,11 @@ public class Driver implements java.sql.
return false;
}
- // ---------------------------------------------------------- Java 7
methods
- // Can't add @Override annotations since this code also has to compile with
- // Java 6 for Tomcat 7.
-
@Override
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ // TODO Auto-generated method stub
return null;
}
+
+
}
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ResultSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ResultSet.java?rev=1360729&r1=1360728&r2=1360729&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ResultSet.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ResultSet.java
Thu Jul 12 15:38:28 2012
@@ -1208,16 +1208,17 @@ public class ResultSet implements java.s
return null;
}
- // ---------------------------------------------------------- Java 7
methods
- // Can't add @Override annotations since this code also has to compile with
- // Java 6 for Tomcat 7.
-
+ @Override
public <T> T getObject(int columnIndex, Class<T> type) throws SQLException
{
+ // TODO Auto-generated method stub
return null;
}
- public <T> T getObject(String columnLabel, Class<T> type)
- throws SQLException {
+ @Override
+ public <T> T getObject(String columnLabel, Class<T> type) throws
SQLException {
+ // TODO Auto-generated method stub
return null;
}
+
+
}
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Statement.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Statement.java?rev=1360729&r1=1360728&r2=1360729&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Statement.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Statement.java
Thu Jul 12 15:38:28 2012
@@ -1291,24 +1291,30 @@ public class Statement implements Callab
return null;
}
- // ---------------------------------------------------------- Java 7
methods
- // Can't add @Override annotations since this code also has to compile with
- // Java 6 for Tomcat 7.
-
+ @Override
public void closeOnCompletion() throws SQLException {
+ // TODO Auto-generated method stub
+
}
+ @Override
public boolean isCloseOnCompletion() throws SQLException {
+ // TODO Auto-generated method stub
return false;
}
- public <T> T getObject(int parameterIndex, Class<T> type)
- throws SQLException {
+ @Override
+ public <T> T getObject(int parameterIndex, Class<T> type) throws
SQLException {
+ // TODO Auto-generated method stub
return null;
}
- public <T> T getObject(String parameterName, Class<T> type)
- throws SQLException {
+ @Override
+ public <T> T getObject(String parameterName, Class<T> type) throws
SQLException {
+ // TODO Auto-generated method stub
return null;
}
+
+
+
}
Added: tomcat/trunk/res/dbcp/dbcp-java-7.patch
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/dbcp/dbcp-java-7.patch?rev=1360729&view=auto
==============================================================================
--- tomcat/trunk/res/dbcp/dbcp-java-7.patch (added)
+++ tomcat/trunk/res/dbcp/dbcp-java-7.patch Thu Jul 12 15:38:28 2012
@@ -0,0 +1,244 @@
+Index: src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
+===================================================================
+--- src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
(revision 1360707)
++++ src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
(working copy)
+@@ -774,5 +774,20 @@
+ handleException(e);
+ }
+ }
++
++ @Override
++ public <T> T getObject(int parameterIndex, Class<T> type) throws
SQLException {
++ checkOpen();
++ return ((CallableStatement)_stmt).getObject(parameterIndex, type);
++ }
++
++ @Override
++ public <T> T getObject(String parameterName, Class<T> type) throws
SQLException {
++ checkOpen();
++ return ((CallableStatement)_stmt).getObject(parameterName, type);
++ }
++
++
++
+ /* JDBC_4_ANT_KEY_END */
+ }
+Index: src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
+===================================================================
+--- src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
(revision 1360707)
++++ src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
(working copy)
+@@ -23,6 +23,7 @@
+ import java.io.Serializable;
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
++
+ import javax.sql.PooledConnection;
+ import javax.sql.ConnectionPoolDataSource;
+ import javax.naming.Name;
+@@ -719,4 +720,15 @@
+ {
+ _maxPreparedStatements = maxPreparedStatements;
+ }
++
++ /* JDBC_4_ANT_KEY_BEGIN */
++
++ @Override
++ public java.util.logging.Logger getParentLogger() throws
java.sql.SQLFeatureNotSupportedException {
++ throw new java.sql.SQLFeatureNotSupportedException();
+ }
++
++ /* JDBC_4_ANT_KEY_END */
++
++
++}
+Index: src/java/org/apache/commons/dbcp/DelegatingResultSet.java
+===================================================================
+--- src/java/org/apache/commons/dbcp/DelegatingResultSet.java (revision
1360707)
++++ src/java/org/apache/commons/dbcp/DelegatingResultSet.java (working copy)
+@@ -1274,5 +1274,17 @@
+ handleException(e);
+ }
+ }
++
++ @Override
++ public <T> T getObject(int columnIndex, Class<T> type) throws
SQLException {
++ return _res.getObject(columnIndex, type);
++ }
++
++ @Override
++ public <T> T getObject(String columnLabel, Class<T> type) throws
SQLException {
++ return _res.getObject(columnLabel, type);
++ }
++
++
+ /* JDBC_4_ANT_KEY_END */
+ }
+Index: src/java/org/apache/commons/dbcp/PoolingDataSource.java
+===================================================================
+--- src/java/org/apache/commons/dbcp/PoolingDataSource.java (revision
1360707)
++++ src/java/org/apache/commons/dbcp/PoolingDataSource.java (working copy)
+@@ -489,4 +489,11 @@
+ }
+ }
+ }
++ /* JDBC_4_ANT_KEY_BEGIN */
++ @Override
++ public java.util.logging.Logger getParentLogger() throws
java.sql.SQLFeatureNotSupportedException {
++ throw new java.sql.SQLFeatureNotSupportedException();
+ }
++ /* JDBC_4_ANT_KEY_END */
++
++}
+Index: src/java/org/apache/commons/dbcp/DelegatingConnection.java
+===================================================================
+--- src/java/org/apache/commons/dbcp/DelegatingConnection.java (revision
1360707)
++++ src/java/org/apache/commons/dbcp/DelegatingConnection.java (working copy)
+@@ -804,5 +804,37 @@
+ return null;
+ }
+ }
++
++ @Override
++ public void setSchema(String schema) throws SQLException {
++ checkOpen();
++ _conn.setSchema(schema);
++ }
++
++ @Override
++ public String getSchema() throws SQLException {
++ checkOpen();
++ return _conn.getSchema();
++ }
++
++ @Override
++ public void abort(java.util.concurrent.Executor executor) throws
SQLException {
++ checkOpen();
++ _conn.abort(executor);
++ }
++
++ @Override
++ public void setNetworkTimeout(java.util.concurrent.Executor executor, int
milliseconds) throws SQLException {
++ checkOpen();
++ _conn.setNetworkTimeout(executor, milliseconds);
++ }
++
++ @Override
++ public int getNetworkTimeout() throws SQLException {
++ checkOpen();
++ return _conn.getNetworkTimeout();
++ }
++
++
+ /* JDBC_4_ANT_KEY_END */
+ }
+Index: src/java/org/apache/commons/dbcp/PoolingDriver.java
+===================================================================
+--- src/java/org/apache/commons/dbcp/PoolingDriver.java (revision
1360707)
++++ src/java/org/apache/commons/dbcp/PoolingDriver.java (working copy)
+@@ -501,4 +501,11 @@
+ }
+ }
+ }
++ /* JDBC_4_ANT_KEY_BEGIN */
++ @Override
++ public java.util.logging.Logger getParentLogger() throws
java.sql.SQLFeatureNotSupportedException {
++ throw new java.sql.SQLFeatureNotSupportedException();
+ }
++ /* JDBC_4_ANT_KEY_END */
++
++}
+Index: src/java/org/apache/commons/dbcp/DelegatingStatement.java
+===================================================================
+--- src/java/org/apache/commons/dbcp/DelegatingStatement.java (revision
1360707)
++++ src/java/org/apache/commons/dbcp/DelegatingStatement.java (working copy)
+@@ -529,5 +529,19 @@
+ return false;
+ }
+ }
++
++ @Override
++ public void closeOnCompletion() throws SQLException {
++ checkOpen();
++ _stmt.closeOnCompletion();
++ }
++
++ @Override
++ public boolean isCloseOnCompletion() throws SQLException {
++ checkOpen();
++ return _stmt.isCloseOnCompletion();
++ }
++
++
+ /* JDBC_4_ANT_KEY_END */
+ }
+Index: src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
+===================================================================
+--- src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
(revision 1360707)
++++ src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
(working copy)
+@@ -1377,6 +1377,20 @@
+ }
+ }
+
++ @Override
++ public ResultSet getPseudoColumns(String catalog, String schemaPattern,
String tableNamePattern,
++ String columnNamePattern) throws SQLException {
++ _conn.checkOpen();
++ return DelegatingResultSet.wrapResultSet(_conn,
_meta.getPseudoColumns(catalog, schemaPattern, tableNamePattern,
columnNamePattern));
++ }
++
++ @Override
++ public boolean generatedKeyAlwaysReturned() throws SQLException {
++ return _meta.generatedKeyAlwaysReturned();
++ }
++
++
++
+ /* JDBC_4_ANT_KEY_END */
+
+ }
+Index: src/java/org/apache/commons/dbcp/BasicDataSource.java
+===================================================================
+--- src/java/org/apache/commons/dbcp/BasicDataSource.java (revision
1360707)
++++ src/java/org/apache/commons/dbcp/BasicDataSource.java (working copy)
+@@ -28,6 +28,7 @@
+ import java.sql.Driver;
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
++
+ import javax.sql.DataSource;
+
+ import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
+@@ -1800,4 +1801,13 @@
+ logWriter.println(message);
+ }
+ }
++ /* JDBC_4_ANT_KEY_BEGIN */
++
++ @Override
++ public java.util.logging.Logger getParentLogger() throws
java.sql.SQLFeatureNotSupportedException {
++ throw new java.sql.SQLFeatureNotSupportedException();
+ }
++ /* JDBC_4_ANT_KEY_END */
++
++
++}
+Index: src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
+===================================================================
+--- src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
(revision 1360707)
++++ src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
(working copy)
+@@ -888,4 +888,15 @@
+ ref.add(new StringRefAddr("instanceKey", instanceKey));
+ return ref;
+ }
++
++ /* JDBC_4_ANT_KEY_BEGIN */
++
++ @Override
++ public java.util.logging.Logger getParentLogger() throws
java.sql.SQLFeatureNotSupportedException {
++ throw new java.sql.SQLFeatureNotSupportedException();
+ }
++ /* JDBC_4_ANT_KEY_END */
++
++
++
++}
Propchange: tomcat/trunk/res/dbcp/dbcp-java-7.patch
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
