db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r190624 - in /incubator/jdo/trunk: README.txt tck20/maven.xml tck20/project.properties tck20/project.xml tck20/test/conf/jdori.properties
Date Tue, 14 Jun 2005 16:28:56 GMT
Author: mcaisse
Date: Tue Jun 14 09:28:54 2005
New Revision: 190624

URL: http://svn.apache.org/viewcvs?rev=190624&view=rev
Log:
JDO-53 JPOX connection pooling. Submitted by Michael Watzek

Modified:
    incubator/jdo/trunk/README.txt
    incubator/jdo/trunk/tck20/maven.xml
    incubator/jdo/trunk/tck20/project.properties
    incubator/jdo/trunk/tck20/project.xml
    incubator/jdo/trunk/tck20/test/conf/jdori.properties

Modified: incubator/jdo/trunk/README.txt
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/README.txt?rev=190624&r1=190623&r2=190624&view=diff
==============================================================================
--- incubator/jdo/trunk/README.txt (original)
+++ incubator/jdo/trunk/README.txt Tue Jun 14 09:28:54 2005
@@ -54,14 +54,20 @@
 'File System Service Provider, 1.2 Beta 3' and then unpack the downloaded zip.
  It includes the jars fscontext.jar and providerutil.jar.
 
-- jpox
+- JPOX
 The Reference Implementation for JDO 2.0 is JPOX. To run tck20 you must
 manually add the JPOX jar file and JPOX enhancer jar file to your local
 maven repository. Download both jars from
 http://www.jpox.org/docs/download.html and copy them to your local maven
-repository, changing the version number to "SNAPSHOT":
+repository, changing the version number to "SNAPSHOT".  You must also
+download the jpox plug-ins jpox-c3p0-<version>.jar and jpox-dbcp-<version>.jar
+for connection pooling.
   cp jpox-<version>.jar $HOME/.maven/repository/jpox/jars/jpox-SNAPSHOT.jar
   cp jpox-enhancer-<version>.jar $HOME/.maven/repository/jpox/jars/jpox-enhancer-SNAPSHOT.jar
+  cp jpox-c3p0-<version>.jar $HOME/.maven/repository/jpox/jars/jpox-c3p0-SNAPSHOT.jar
+  cp jpox-dbcp-<version>.jar $HOME/.maven/repository/jpox/jars/jpox-dbcp-SNAPSHOT.jar
+
+Finally, you must download c3p0-0.9.0-pre6.bin.zip, unzip it and copy c3p0-0.9.0-pre6.jar
to $HOME/.maven/repository/c3p0/jars.
 
 - derby
 To use Derby as the datastore for tck20, download version 10.0.2.1 from

Modified: incubator/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/maven.xml?rev=190624&r1=190623&r2=190624&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/maven.xml (original)
+++ incubator/jdo/trunk/tck20/maven.xml Tue Jun 14 09:28:54 2005
@@ -100,7 +100,7 @@
     <!--   maven -Dtest=api.jdohelper.GetObjectId runtck.single       -->
     <goal name="runtck.jdorisingle" prereqs="java:compile, jdorienhance, copyprops">
         <echo>Run TCK test org.apache.jdo.tck.${test} on the RI with configuration
${jdo.tck.configuration}</echo>
-        <java fork="yes" dir="${jdo.tck.testdir}" 
+        <java fork="yes" dir="${jdo.tck.testdir}"
               classname="org.apache.jdo.tck.${test}">
             <classpath refid="jdori.class.path"/>
             <sysproperty key="ResultPrinterClass" value="${jdo.tck.resultprinterclass}"/>
@@ -418,6 +418,13 @@
         <pathelement location="${derby.jarfile}" />
         <pathelement location="${core20.jarfile}" />
         <pathelement location="${enhancer20.jarfile}" />
+        <!-- Jar files for connection pooling -->
+        <pathelement location="${jpox.dbcp.jarfile}" />
+        <pathelement location="${jpox.c3p0.jarfile}" />
+        <pathelement location="${c3p0.jarfile}"/>
+        <pathelement location="${dbcp.jarfile}"/>
+        <pathelement location="${pool.jarfile}"/>
+        <pathelement location="${collections.jarfile}"/>
     </path>
 
     <!-- ==== -->

Modified: incubator/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.properties?rev=190624&r1=190623&r2=190624&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/project.properties (original)
+++ incubator/jdo/trunk/tck20/project.properties Tue Jun 14 09:28:54 2005
@@ -26,9 +26,10 @@
 iut.enhancer.main = ${jdo.enhancer.main}
 iut.enhancer.options = -v -d "${iut.enhanced.dir}"
 iut.enhancer.args = ${jdo.tck.jdometadata.files}
-iut.enhancer.sourcepath = ${jdo.tck.testclasses.dir}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${junit.jarfile}${path.separator}${log4j.jarfile}
-iut.enhancer.classpath = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}
-iut.enhancer.sysproperties = -Dlog4j.configuration=file:${basedir}/test/conf/logging.properties
+iut.enhancer.sysproperties = 
+jdo.enhancer.sourcepath = ${jdo.tck.testclasses.dir}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${junit.jarfile}${path.separator}${log4j.jarfile}
+jdo.enhancer.classpath = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}
+jdo.enhancer.sysproperties = -Dlog4j.configuration=file:${basedir}/test/conf/logging.properties
 
 # JUnit settings
 # Start new JVM for junit tests
@@ -62,6 +63,13 @@
 core20.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-core')}
 enhancer20.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-enhancer')}
 xmlparser =
+# connection pooling dependencies
+jpox.dbcp.jarfile = ${pom.getDependencyPath('jpox:jpox-dbcp')}
+jpox.c3p0.jarfile = ${pom.getDependencyPath('jpox:jpox-c3p0')}
+c3p0.jarfile = ${pom.getDependencyPath('c3p0')}
+dbcp.jarfile = ${pom.getDependencyPath('commons-dbcp')}
+pool.jarfile = ${pom.getDependencyPath('commons-pool')}
+collections.jarfile = ${pom.getDependencyPath('commons-collections')}
 
 # JDORI enhancer
 jdo.enhanced.dir = ${maven.build.dir}/enhanced/jdori
@@ -305,6 +313,7 @@
     org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo \
     org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo \
     org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo \
+    org/apache/jdo/tck/pc/fieldtypes/SimpleClass.jdo \
     org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo \
     org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo \
     org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo \

Modified: incubator/jdo/trunk/tck20/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.xml?rev=190624&r1=190623&r2=190624&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/project.xml (original)
+++ incubator/jdo/trunk/tck20/project.xml Tue Jun 14 09:28:54 2005
@@ -104,6 +104,40 @@
             <artifactId>jdo2-core</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
+        <!-- dependencies for connection pooling -->
+        <dependency>
+            <groupId>jpox</groupId>
+            <artifactId>jpox-c3p0</artifactId>
+            <version>SNAPSHOT</version>
+            <url>http://www.jpox.org/docs/download.html</url>
+        </dependency>
+        <dependency>
+            <groupId>jpox</groupId>
+            <artifactId>jpox-dbcp</artifactId>
+            <version>SNAPSHOT</version>
+            <url>http://www.jpox.org/docs/download.html</url>
+        </dependency>
+        <dependency>
+            <groupId>c3p0</groupId>
+            <artifactId>c3p0</artifactId>
+            <version>0.9.0-pre6</version>
+            <url>http://prdownloads.sourceforge.net/c3p0/c3p0-0.9.0-pre6.bin.zip?use_mirror=easynews</url>
+        </dependency>
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-pool</groupId>
+            <artifactId>commons-pool</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.1</version>
+        </dependency>
     </dependencies>
     <!-- =================== -->
     <!-- Build Specification -->

Modified: incubator/jdo/trunk/tck20/test/conf/jdori.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/jdori.properties?rev=190624&r1=190623&r2=190624&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/jdori.properties (original)
+++ incubator/jdo/trunk/tck20/test/conf/jdori.properties Tue Jun 14 09:28:54 2005
@@ -21,3 +21,5 @@
 org.jpox.autoCreateColumns=false
 org.jpox.rdbms.CheckExistTablesOrViews=false
 org.jpox.autoStartMechanism=None
+#org.jpox.connectionPoolingType=DBCP
+org.jpox.connectionPoolingType=C3P0



Mime
View raw message