You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2009/06/21 17:07:08 UTC

svn commit: r787028 - in /commons/proper/dbcp/trunk: build.properties.sample doc/BasicDataSourceExample.java doc/JOCLPoolingDriverExample.java doc/ManualPoolingDataSourceExample.java doc/ManualPoolingDriverExample.java maven.xml pom.xml project.xml

Author: markt
Date: Sun Jun 21 15:07:07 2009
New Revision: 787028

URL: http://svn.apache.org/viewvc?rev=787028&view=rev
Log:
Update to commons-pool-1.5.1
I don't use maven so those changes were done blind

Modified:
    commons/proper/dbcp/trunk/build.properties.sample
    commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java
    commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java
    commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java
    commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java
    commons/proper/dbcp/trunk/maven.xml
    commons/proper/dbcp/trunk/pom.xml
    commons/proper/dbcp/trunk/project.xml

Modified: commons/proper/dbcp/trunk/build.properties.sample
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.properties.sample?rev=787028&r1=787027&r2=787028&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/build.properties.sample (original)
+++ commons/proper/dbcp/trunk/build.properties.sample Sun Jun 21 15:07:07 2009
@@ -23,9 +23,9 @@
 # Repository base path
 repository=${user.home}/.maven/repository
 
-# commons-pool.jar - path to commons-pool-1.3.jar
+# commons-pool.jar - path to commons-pool-1.5.1.jar
 commons-pool.home=${repository}/commons-pool/jars
-commons-pool.jar=${commons-pool.home}/commons-pool-1.3.jar
+commons-pool.jar=${commons-pool.home}/commons-pool-1.5.1.jar
 
 # JDBC Optional Package 2.0 (also included in j2ee.jar)
 jdbc20ext.home=${user.home}/jdbc2_0-stdext

Modified: commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java?rev=787028&r1=787027&r2=787028&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java (original)
+++ commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java Sun Jun 21 15:07:07 2009
@@ -41,13 +41,13 @@
 
 //
 // To compile this example, you'll want:
-//  * commons-pool-1.3.jar
+//  * commons-pool-1.5.1.jar
 //  * commons-dbcp-1.2.2.jar
 //  * j2ee.jar (for the javax.sql classes)
 // in your classpath.
 //
 // To run this example, you'll want:
-//  * commons-pool-1.3.jar
+//  * commons-pool-1.5.1.jar
 //  * commons-dbcp-1.2.2.jar
 //  * j2ee.jar (for the javax.sql classes)
 //  * the classes for your (underlying) JDBC driver
@@ -62,7 +62,7 @@
 //
 // For example:
 //  java -Djdbc.drivers=oracle.jdbc.driver.OracleDriver \
-//       -classpath commons-pool-1.3.jar:commons-dbcp-1.2.2.jar:j2ee.jar:oracle-jdbc.jar:. \
+//       -classpath commons-pool-1.5.1.jar:commons-dbcp-1.2.2.jar:j2ee.jar:oracle-jdbc.jar:. \
 //       ManualPoolingDataSourceExample
 //       "jdbc:oracle:thin:scott/tiger@myhost:1521:mysid"
 //       "SELECT * FROM DUAL"

Modified: commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java?rev=787028&r1=787027&r2=787028&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java (original)
+++ commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java Sun Jun 21 15:07:07 2009
@@ -38,7 +38,7 @@
 // in your classpath.
 //
 // To run this example, you'll want:
-//  * commons-pool-1.3.jar
+//  * commons-pool-1.5.1.jar
 //  * commons-dbcp-1.2.2.jar
 //  * the classes for your (underlying) JDBC driver
 //  * sax2.jar (the SAX 2 API)
@@ -73,7 +73,7 @@
 // For pooling:
 //
 //  java -Djdbc.drivers=oracle.jdbc.driver.OracleDriver:org.apache.commons.dbcp.PoolingDriver \
-//       -classpath commons-pool-1.3.jar:commons-dbcp-1.2.2.jar:oracle-jdbc.jar:jaxp.jar:parser.jar:sax2.jar:. \
+//       -classpath commons-pool-1.5.1.jar:commons-dbcp-1.2.2.jar:oracle-jdbc.jar:jaxp.jar:parser.jar:sax2.jar:. \
 //       JOCLPoolingDriverExample
 //       "jdbc:apache:commons:dbcp:/poolingDriverExample"
 //       "SELECT * FROM DUAL"

Modified: commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java?rev=787028&r1=787027&r2=787028&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java (original)
+++ commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java Sun Jun 21 15:07:07 2009
@@ -71,7 +71,7 @@
 //
 // For example:
 //  java -Djdbc.drivers=oracle.jdbc.driver.OracleDriver \
-//       -classpath commons-pool-1.3.jar:commons-dbcp-1.2.2.jar:j2ee.jar:oracle-jdbc.jar:. \
+//       -classpath commons-pool-1.5.1.jar:commons-dbcp-1.2.2.jar:j2ee.jar:oracle-jdbc.jar:. \
 //       ManualPoolingDataSourceExample
 //       "jdbc:oracle:thin:scott/tiger@myhost:1521:mysid"
 //       "SELECT * FROM DUAL"

Modified: commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java?rev=787028&r1=787027&r2=787028&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java (original)
+++ commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java Sun Jun 21 15:07:07 2009
@@ -44,13 +44,13 @@
 
 //
 // To compile this example, you'll want:
-//  * commons-pool-1.3.jar
+//  * commons-pool-1.5.1.jar
 //  * commons-dbcp-1.2.2.jar
 // in your classpath.
 //
 // To run this example, you'll want:
 //  * commons-collections.jar
-//  * commons-pool-1.3.jar
+//  * commons-pool-1.5.1.jar
 //  * commons-dbcp-1.2.2.jar
 //  * the classes for your (underlying) JDBC driver
 // in your classpath.
@@ -64,7 +64,7 @@
 //
 // For example:
 //  java -Djdbc.drivers=oracle.jdbc.driver.OracleDriver \
-//       -classpath commons-pool-1.3.jar:commons-dbcp-1.2.2.jar:oracle-jdbc.jar:. \
+//       -classpath commons-pool-1.5.1.jar:commons-dbcp-1.2.2.jar:oracle-jdbc.jar:. \
 //       ManualPoolingDriverExample
 //       "jdbc:oracle:thin:scott/tiger@myhost:1521:mysid"
 //       "SELECT * FROM DUAL"

Modified: commons/proper/dbcp/trunk/maven.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/maven.xml?rev=787028&r1=787027&r2=787028&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/maven.xml (original)
+++ commons/proper/dbcp/trunk/maven.xml Sun Jun 21 15:07:07 2009
@@ -95,7 +95,7 @@
     <j:set var="libDir" value="${user.home}/.maven/repository"/>
     <ant:path id="build.classpath">
       <ant:pathelement 
-        location="${libDir}/commons-pool/jars/commons-pool-1.3.jar">
+        location="${libDir}/commons-pool/jars/commons-pool-1.5.1.jar">
       </ant:pathelement>
       <ant:pathelement 
         location="${libdir}/xerces/jars/xercesImpl-2.8.0.jar">

Modified: commons/proper/dbcp/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=787028&r1=787027&r2=787028&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/pom.xml (original)
+++ commons/proper/dbcp/trunk/pom.xml Sun Jun 21 15:07:07 2009
@@ -318,7 +318,7 @@
           <configuration>
             <links>
               <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-              <link>http://commons.apache.org/pool/api-1.4</link>
+              <link>http://commons.apache.org/pool/api-1.5</link>
               <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api</link>
             </links>
           </configuration>

Modified: commons/proper/dbcp/trunk/project.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/project.xml?rev=787028&r1=787027&r2=787028&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/project.xml (original)
+++ commons/proper/dbcp/trunk/project.xml Sun Jun 21 15:07:07 2009
@@ -181,7 +181,7 @@
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>1.3</version>
+      <version>1.5.1</version>
     </dependency>
 
     <dependency>



Re: svn commit: r787028 - in /commons/proper/dbcp/trunk: build.properties.sample doc/BasicDataSourceExample.java doc/JOCLPoolingDriverExample.java doc/ManualPoolingDataSourceExample.java doc/ManualPoolingDriverExample.java maven.xml pom.xml project.xml

Posted by Mark Thomas <ma...@apache.org>.
Phil Steitz wrote:
> markt@apache.org wrote:
>> Author: markt
>> Date: Sun Jun 21 15:07:07 2009
>> New Revision: 787028
>>
>> URL: http://svn.apache.org/viewvc?rev=787028&view=rev
>> Log:
>> Update to commons-pool-1.5.1
>> I don't use maven so those changes were done blind

<snip/>

> Looks OK.
Thanks.

> I would be in favor of dropping the maven 1 build at this
> point.  That would eliminate
>
> maven.xml
> project.xml
> and build.properties.sample unless the Ant build depends on this.
> 
> If no one complains in the next couple of days, I will kill the first two.

Yes, please leave build.properties.sample. It is a useful starting point
for anyone trying to build using Ant.

Mark



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


Re: svn commit: r787028 - in /commons/proper/dbcp/trunk: build.properties.sample doc/BasicDataSourceExample.java doc/JOCLPoolingDriverExample.java doc/ManualPoolingDataSourceExample.java doc/ManualPoolingDriverExample.java maven.xml pom.xml project.xml

Posted by Phil Steitz <ph...@gmail.com>.
markt@apache.org wrote:
> Author: markt
> Date: Sun Jun 21 15:07:07 2009
> New Revision: 787028
>
> URL: http://svn.apache.org/viewvc?rev=787028&view=rev
> Log:
> Update to commons-pool-1.5.1
> I don't use maven so those changes were done blind
>
> Modified:
>     commons/proper/dbcp/trunk/build.properties.sample
>     commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java
>     commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java
>     commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java
>     commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java
>     commons/proper/dbcp/trunk/maven.xml
>     commons/proper/dbcp/trunk/pom.xml
>     commons/proper/dbcp/trunk/project.xml
>
> Modified: commons/proper/dbcp/trunk/build.properties.sample
> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.properties.sample?rev=787028&r1=787027&r2=787028&view=diff
> ==============================================================================
> --- commons/proper/dbcp/trunk/build.properties.sample (original)
> +++ commons/proper/dbcp/trunk/build.properties.sample Sun Jun 21 15:07:07 2009
> @@ -23,9 +23,9 @@
>  # Repository base path
>  repository=${user.home}/.maven/repository
>  
> -# commons-pool.jar - path to commons-pool-1.3.jar
> +# commons-pool.jar - path to commons-pool-1.5.1.jar
>  commons-pool.home=${repository}/commons-pool/jars
> -commons-pool.jar=${commons-pool.home}/commons-pool-1.3.jar
> +commons-pool.jar=${commons-pool.home}/commons-pool-1.5.1.jar
>  
>  # JDBC Optional Package 2.0 (also included in j2ee.jar)
>  jdbc20ext.home=${user.home}/jdbc2_0-stdext
>
> Modified: commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java
> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java?rev=787028&r1=787027&r2=787028&view=diff
> ==============================================================================
> --- commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java (original)
> +++ commons/proper/dbcp/trunk/doc/BasicDataSourceExample.java Sun Jun 21 15:07:07 2009
> @@ -41,13 +41,13 @@
>  
>  //
>  // To compile this example, you'll want:
> -//  * commons-pool-1.3.jar
> +//  * commons-pool-1.5.1.jar
>  //  * commons-dbcp-1.2.2.jar
>  //  * j2ee.jar (for the javax.sql classes)
>  // in your classpath.
>  //
>  // To run this example, you'll want:
> -//  * commons-pool-1.3.jar
> +//  * commons-pool-1.5.1.jar
>  //  * commons-dbcp-1.2.2.jar
>  //  * j2ee.jar (for the javax.sql classes)
>  //  * the classes for your (underlying) JDBC driver
> @@ -62,7 +62,7 @@
>  //
>  // For example:
>  //  java -Djdbc.drivers=oracle.jdbc.driver.OracleDriver \
> -//       -classpath commons-pool-1.3.jar:commons-dbcp-1.2.2.jar:j2ee.jar:oracle-jdbc.jar:. \
> +//       -classpath commons-pool-1.5.1.jar:commons-dbcp-1.2.2.jar:j2ee.jar:oracle-jdbc.jar:. \
>  //       ManualPoolingDataSourceExample
>  //       "jdbc:oracle:thin:scott/tiger@myhost:1521:mysid"
>  //       "SELECT * FROM DUAL"
>
> Modified: commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java
> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java?rev=787028&r1=787027&r2=787028&view=diff
> ==============================================================================
> --- commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java (original)
> +++ commons/proper/dbcp/trunk/doc/JOCLPoolingDriverExample.java Sun Jun 21 15:07:07 2009
> @@ -38,7 +38,7 @@
>  // in your classpath.
>  //
>  // To run this example, you'll want:
> -//  * commons-pool-1.3.jar
> +//  * commons-pool-1.5.1.jar
>  //  * commons-dbcp-1.2.2.jar
>  //  * the classes for your (underlying) JDBC driver
>  //  * sax2.jar (the SAX 2 API)
> @@ -73,7 +73,7 @@
>  // For pooling:
>  //
>  //  java -Djdbc.drivers=oracle.jdbc.driver.OracleDriver:org.apache.commons.dbcp.PoolingDriver \
> -//       -classpath commons-pool-1.3.jar:commons-dbcp-1.2.2.jar:oracle-jdbc.jar:jaxp.jar:parser.jar:sax2.jar:. \
> +//       -classpath commons-pool-1.5.1.jar:commons-dbcp-1.2.2.jar:oracle-jdbc.jar:jaxp.jar:parser.jar:sax2.jar:. \
>  //       JOCLPoolingDriverExample
>  //       "jdbc:apache:commons:dbcp:/poolingDriverExample"
>  //       "SELECT * FROM DUAL"
>
> Modified: commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java
> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java?rev=787028&r1=787027&r2=787028&view=diff
> ==============================================================================
> --- commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java (original)
> +++ commons/proper/dbcp/trunk/doc/ManualPoolingDataSourceExample.java Sun Jun 21 15:07:07 2009
> @@ -71,7 +71,7 @@
>  //
>  // For example:
>  //  java -Djdbc.drivers=oracle.jdbc.driver.OracleDriver \
> -//       -classpath commons-pool-1.3.jar:commons-dbcp-1.2.2.jar:j2ee.jar:oracle-jdbc.jar:. \
> +//       -classpath commons-pool-1.5.1.jar:commons-dbcp-1.2.2.jar:j2ee.jar:oracle-jdbc.jar:. \
>  //       ManualPoolingDataSourceExample
>  //       "jdbc:oracle:thin:scott/tiger@myhost:1521:mysid"
>  //       "SELECT * FROM DUAL"
>
> Modified: commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java
> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java?rev=787028&r1=787027&r2=787028&view=diff
> ==============================================================================
> --- commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java (original)
> +++ commons/proper/dbcp/trunk/doc/ManualPoolingDriverExample.java Sun Jun 21 15:07:07 2009
> @@ -44,13 +44,13 @@
>  
>  //
>  // To compile this example, you'll want:
> -//  * commons-pool-1.3.jar
> +//  * commons-pool-1.5.1.jar
>  //  * commons-dbcp-1.2.2.jar
>  // in your classpath.
>  //
>  // To run this example, you'll want:
>  //  * commons-collections.jar
> -//  * commons-pool-1.3.jar
> +//  * commons-pool-1.5.1.jar
>  //  * commons-dbcp-1.2.2.jar
>  //  * the classes for your (underlying) JDBC driver
>  // in your classpath.
> @@ -64,7 +64,7 @@
>  //
>  // For example:
>  //  java -Djdbc.drivers=oracle.jdbc.driver.OracleDriver \
> -//       -classpath commons-pool-1.3.jar:commons-dbcp-1.2.2.jar:oracle-jdbc.jar:. \
> +//       -classpath commons-pool-1.5.1.jar:commons-dbcp-1.2.2.jar:oracle-jdbc.jar:. \
>  //       ManualPoolingDriverExample
>  //       "jdbc:oracle:thin:scott/tiger@myhost:1521:mysid"
>  //       "SELECT * FROM DUAL"
>
> Modified: commons/proper/dbcp/trunk/maven.xml
> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/maven.xml?rev=787028&r1=787027&r2=787028&view=diff
> ==============================================================================
> --- commons/proper/dbcp/trunk/maven.xml (original)
> +++ commons/proper/dbcp/trunk/maven.xml Sun Jun 21 15:07:07 2009
> @@ -95,7 +95,7 @@
>      <j:set var="libDir" value="${user.home}/.maven/repository"/>
>      <ant:path id="build.classpath">
>        <ant:pathelement 
> -        location="${libDir}/commons-pool/jars/commons-pool-1.3.jar">
> +        location="${libDir}/commons-pool/jars/commons-pool-1.5.1.jar">
>        </ant:pathelement>
>        <ant:pathelement 
>          location="${libdir}/xerces/jars/xercesImpl-2.8.0.jar">
>
> Modified: commons/proper/dbcp/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=787028&r1=787027&r2=787028&view=diff
> ==============================================================================
> --- commons/proper/dbcp/trunk/pom.xml (original)
> +++ commons/proper/dbcp/trunk/pom.xml Sun Jun 21 15:07:07 2009
> @@ -318,7 +318,7 @@
>            <configuration>
>              <links>
>                <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
> -              <link>http://commons.apache.org/pool/api-1.4</link>
> +              <link>http://commons.apache.org/pool/api-1.5</link>
>                <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api</link>
>              </links>
>            </configuration>
>
> Modified: commons/proper/dbcp/trunk/project.xml
> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/project.xml?rev=787028&r1=787027&r2=787028&view=diff
> ==============================================================================
> --- commons/proper/dbcp/trunk/project.xml (original)
> +++ commons/proper/dbcp/trunk/project.xml Sun Jun 21 15:07:07 2009
> @@ -181,7 +181,7 @@
>      <dependency>
>        <groupId>commons-pool</groupId>
>        <artifactId>commons-pool</artifactId>
> -      <version>1.3</version>
> +      <version>1.5.1</version>
>      </dependency>
>  
>      <dependency>
>
>
>   
Looks OK.   I would be in favor of dropping the maven 1 build at this 
point.  That would eliminate

maven.xml
project.xml
and build.properties.sample unless the Ant build depends on this.

If no one complains in the next couple of days, I will kill the first two.

Phil



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