db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r264982 - in /incubator/jdo/trunk: README.txt tck20/project.properties tck20/project.xml
Date Wed, 31 Aug 2005 09:07:10 GMT
Author: mbo
Date: Wed Aug 31 02:07:01 2005
New Revision: 264982

URL: http://svn.apache.org/viewcvs?rev=264982&view=rev
Log:
Upgrade to derby 10.1.1.0; Updated README.txt

Modified:
    incubator/jdo/trunk/README.txt
    incubator/jdo/trunk/tck20/project.properties
    incubator/jdo/trunk/tck20/project.xml

Modified: incubator/jdo/trunk/README.txt
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/README.txt?rev=264982&r1=264981&r2=264982&view=diff
==============================================================================
--- incubator/jdo/trunk/README.txt (original)
+++ incubator/jdo/trunk/README.txt Wed Aug 31 02:07:01 2005
@@ -46,27 +46,14 @@
 the downloaded zip. It includes the jars fscontext.jar and providerutil.jar.
 
 - 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".  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.
+The Reference Implementation for JDO 2.0 is JPOX. The tck20 subproject 
+automatically downloads the latest JPPOX snapshot.
 
 - derby
-To use Derby as the datastore for tck20, download version 10.0.2.1 from
-http://incubator.apache.org/derby/derby_downloads.html and add derby.jar
-and derbytools.jar your maven repository. Rename them to include the version
-number: derby-10.0.2.1.jar and derby-tools-10.0.2.1.jar.  NOTE!! Mac OSX users
-must ncomment derby.storage.fileSyncTransactionLog=true in tck20/test/conf/derby.properties.
+The default datastore for tck20 is derby. The tck20 subproject 
+automatically downloads version 10.1.1.0 of derby and derbytools.
+NOTE!! Mac OSX users must uncomment derby.storage.fileSyncTransactionLog=true 
+in tck20/test/conf/derby.properties.
 
 -------
 Remarks

Modified: incubator/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.properties?rev=264982&r1=264981&r2=264982&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/project.properties (original)
+++ incubator/jdo/trunk/tck20/project.properties Wed Aug 31 02:07:01 2005
@@ -65,8 +65,8 @@
 spring.jarfile = ${pom.getDependencyPath('springframework:spring-core')}
 logging.jarfile = ${pom.getDependencyPath('commons-logging')}
 log4j.jarfile = ${pom.getDependencyPath('log4j')}
-derby.jarfile = ${pom.getDependencyPath('derby:derby')}
-derbytools.jarfile = ${pom.getDependencyPath('derby:derbytools')}
+derby.jarfile = ${pom.getDependencyPath('org.apache.derby:derby')}
+derbytools.jarfile = ${pom.getDependencyPath('org.apache.derby:derbytools')}
 core20.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-core')}
 enhancer20.jarfile = ${pom.getDependencyPath('apache-jdo:jdo2-enhancer')}
 xmlparser =

Modified: incubator/jdo/trunk/tck20/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.xml?rev=264982&r1=264981&r2=264982&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/project.xml (original)
+++ incubator/jdo/trunk/tck20/project.xml Wed Aug 31 02:07:01 2005
@@ -36,11 +36,20 @@
     <!-- ============ -->
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
+            <groupId>apache-jdo</groupId>
+            <artifactId>jdo2-api</artifactId>
+            <version>SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>apache-jdo</groupId>
+            <artifactId>jdo2-enhancer</artifactId>
+            <version>SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>apache-jdo</groupId>
+            <artifactId>jdo2-core</artifactId>
+            <version>SNAPSHOT</version>
         </dependency>
-        <!-- You must manually download jpox until it is available from ibiblio.org -->
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox</artifactId>
@@ -48,6 +57,27 @@
             <url>http://www.jpox.org/docs/download.html</url>
         </dependency>
         <dependency>
+            <groupId>jpox</groupId>
+            <artifactId>jpox-enhancer</artifactId>
+            <version>SNAPSHOT</version>
+            <url>http://www.jpox.org/docs/download.html</url>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
+            <version>10.1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+        </dependency>
+        <dependency>
             <groupId>bcel</groupId>
             <artifactId>bcel</artifactId>
             <version>5.1</version>
@@ -64,45 +94,14 @@
             <version>1.0.4</version>
         </dependency>
         <dependency>
-            <groupId>derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.0.2.1</version>
-        </dependency>
-        <dependency>
             <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-jta</artifactId>
             <version>1.0.1B-rc2</version>
         </dependency>
         <dependency>
-            <groupId>apache-jdo</groupId>
-            <artifactId>jdo2-api</artifactId>
-            <version>SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>jpox</groupId>
-            <artifactId>jpox-enhancer</artifactId>
-            <version>SNAPSHOT</version>
-            <url>http://www.jpox.org/docs/download.html</url>
-        </dependency>
-        <dependency>
             <groupId>springframework</groupId>
             <artifactId>spring-core</artifactId>
             <version>1.1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>derby</groupId>
-            <artifactId>derbytools</artifactId>
-            <version>10.0.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>apache-jdo</groupId>
-            <artifactId>jdo2-enhancer</artifactId>
-            <version>SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>apache-jdo</groupId>
-            <artifactId>jdo2-core</artifactId>
-            <version>SNAPSHOT</version>
         </dependency>
         <!-- dependencies for connection pooling -->
         <dependency>



Mime
View raw message