You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2005/04/19 02:13:03 UTC

svn commit: r161817 - in incubator/jdo/trunk/tck20: maven.xml project.xml test/conf/derby.properties

Author: mcaisse
Date: Mon Apr 18 17:13:02 2005
New Revision: 161817

URL: http://svn.apache.org/viewcvs?view=rev&rev=161817
Log:
JDO-5 (Use jpox snapshot with jdo2-api*.jar); JDO-15 (Support for Derby Mac bug work-around)

Added:
    incubator/jdo/trunk/tck20/test/conf/derby.properties   (with props)
Modified:
    incubator/jdo/trunk/tck20/maven.xml
    incubator/jdo/trunk/tck20/project.xml

Modified: incubator/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/maven.xml?view=diff&r1=161816&r2=161817
==============================================================================
--- incubator/jdo/trunk/tck20/maven.xml (original)
+++ incubator/jdo/trunk/tck20/maven.xml Mon Apr 18 17:13:02 2005
@@ -362,9 +362,7 @@
         <!-- Directory where JDOTCK class files are located  -->
         <pathelement location="${jdo.tck.testclasses.dir}"/>
         <!-- JDO jar file  -->
-        <!--
         <pathelement location="${jdo.jdoapi.jarfile}"/>
-        -->
         <pathelement location="${jta.jarfile}" />
         <!-- JUnit jar file -->
         <pathelement location="${junit.jarfile}"/>
@@ -386,6 +384,11 @@
     <goal name="database">
         <delete dir="${jdo.tck.testdir}/database/${jdo.tck.database}"/>
         <mkdir dir="${jdo.tck.testdir}/database/${jdo.tck.database}"/>
+        <copy todir="${jdo.tck.testdir}/database/${jdo.tck.database}">
+            <fileset dir="${basedir}/test/conf">
+               <include name="derby.properties"/>
+            </fileset>
+        </copy>
         <java classname="org.apache.derby.tools.ij" fork="true">
               <classpath>
                   <pathelement location="${derbytools.jarfile}"/>

Modified: incubator/jdo/trunk/tck20/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.xml?view=diff&r1=161816&r2=161817
==============================================================================
--- incubator/jdo/trunk/tck20/project.xml (original)
+++ incubator/jdo/trunk/tck20/project.xml Mon Apr 18 17:13:02 2005
@@ -55,20 +55,20 @@
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox</artifactId>
-            <version>1.1.0-beta-2</version>
-            <url>http://prdownloads.sourceforge.net/jpox/jpox-1.1.0-beta-2.jar?use_mirror=easynews</url>
+            <version>SNAPSHOT</version>
+            <url>http://www.jpox.org/docs/download.html</url>
         </dependency>
         <dependency>
             <groupId>jpox</groupId>
             <artifactId>jpox-enhancer</artifactId>
-            <version>1.1.0-beta-2</version>
-            <url>http://prdownloads.sourceforge.net/jpox/jpox-enhancer-1.1.0-beta-2.jar?use_mirror=easynews</url>
+            <version>SNAPSHOT</version>
+            <url>http://www.jpox.org/docs/download.html</url>
         </dependency>
         <dependency>
             <groupId>bcel</groupId>
             <artifactId>bcel</artifactId>
             <version>5.1</version>
-            <url>http://prdownloads.sourceforge.net/jpox/jpox-enhancer-1.1.0-beta-2.jar?use_mirror=easynews</url>
+            <url>http://jakarta.apache.org/bcel/</url>
         </dependency>
         <dependency>
             <groupId>springframework</groupId>

Added: incubator/jdo/trunk/tck20/test/conf/derby.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/derby.properties?view=auto&rev=161817
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/derby.properties (added)
+++ incubator/jdo/trunk/tck20/test/conf/derby.properties Mon Apr 18 17:13:02 2005
@@ -0,0 +1,2 @@
+# This flag must be set on Mac OSX
+#derby.storage.fileSyncTransactionLog=true

Propchange: incubator/jdo/trunk/tck20/test/conf/derby.properties
------------------------------------------------------------------------------
    svn:executable = *