tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Filip Hanik Mailing Lists <devli...@hanik.com>
Subject Re: svn commit: r1360729 - in /tomcat/trunk: ./ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ res/dbcp/
Date Sat, 14 Jul 2012 20:25:52 GMT
I know, it's the same patch for DBCP as for DBCP2.
we can fix it, not urgent though

----- Original Message -----
> From: "Rainer Jung" <rainer.jung@kippdata.de>
> To: dev@tomcat.apache.org
> Sent: Friday, July 13, 2012 3:47:27 AM
> Subject: Re: svn commit: r1360729 - in /tomcat/trunk: ./
> modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ res/dbcp/
> 
> On 12.07.2012 17:38, fhanik@apache.org wrote:
> > 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)
> 
> Just an info: when compiling TC trunk with Java 7 and ant 1.8.2 a few
> minutes ago, many of the offsets when applying the patch were quite
> big:
> 
>       [copy] Copying 68 files to
> /shared/build/dev/tomcat/deps/tomcat8-deps/tomcat8-deps/dbcp
>      [patch] patching file
> src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
>      [patch] Hunk #1 succeeded at 660 (offset -114 lines).
>      [patch] patching file
> src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
>      [patch] patching file
> src/java/org/apache/commons/dbcp/DelegatingResultSet.java
>      [patch] Hunk #1 succeeded at 1078 (offset -196 lines).
>      [patch] patching file
> src/java/org/apache/commons/dbcp/PoolingDataSource.java
>      [patch] Hunk #1 succeeded at 437 (offset -52 lines).
>      [patch] patching file
> src/java/org/apache/commons/dbcp/DelegatingConnection.java
>      [patch] Hunk #1 succeeded at 678 (offset -126 lines).
>      [patch] patching file
> src/java/org/apache/commons/dbcp/PoolingDriver.java
>      [patch] Hunk #1 succeeded at 496 (offset -5 lines).
>      [patch] patching file
> src/java/org/apache/commons/dbcp/DelegatingStatement.java
>      [patch] Hunk #1 succeeded at 385 (offset -144 lines).
>      [patch] patching file
> src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
>      [patch] Hunk #1 succeeded at 1206 (offset -171 lines).
>      [patch] patching file
> src/java/org/apache/commons/dbcp/BasicDataSource.java
>      [patch] Hunk #1 succeeded at 28 with fuzz 1.
>      [patch] Hunk #2 succeeded at 1580 (offset -221 lines).
>      [patch] patching file
> src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
>      [patch] Hunk #1 succeeded at 887 (offset -1 lines).
> 
> Compilation for everything including DBCP works though.
> 
> Regards,
> 
> Rainer
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
> 
> 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message