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 2006/01/11 00:53:04 UTC
svn commit: r367838 - in /db/jdo/trunk/tck20: maven.xml project.properties
test/conf/iut.properties test/conf/jdori.properties
Author: mcaisse
Date: Tue Jan 10 15:53:02 2006
New Revision: 367838
URL: http://svn.apache.org/viewcvs?rev=367838&view=rev
Log:
JDO-264 backing out the last commit, there are problems
Modified:
db/jdo/trunk/tck20/maven.xml
db/jdo/trunk/tck20/project.properties
db/jdo/trunk/tck20/test/conf/iut.properties
db/jdo/trunk/tck20/test/conf/jdori.properties
Modified: db/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/maven.xml?rev=367838&r1=367837&r2=367838&view=diff
==============================================================================
--- db/jdo/trunk/tck20/maven.xml (original)
+++ db/jdo/trunk/tck20/maven.xml Tue Jan 10 15:53:02 2006
@@ -477,10 +477,6 @@
<fileset dir="${basedir}/test/jdo/${jdo.tck.identitytype}"
includes="**/*.jdo, **/*.jdoquery, **/jdoTest.properties"/>
</copy>
- <path id="project.classpath">
- <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}/${jdo.tck.identitytype}.jar"/>
- <path refid="iut.enhancer.classpath"/>
- </path>
<!-- compile pc and pa classes -->
<javac srcdir="${basedir}/test/java"
includes="${jdo.tck.pcclasses.sources} ${jdo.tck.paclasses.sources}"
@@ -584,6 +580,38 @@
<path id="test_iut_jars" >
<fileset dir="iut_jars" includes="*.jar"/>
+ </path>
+
+ <!-- Added jpox.enhancer.jarfile, renamed jpox.jdori.jarfile,
+ added bcel.jarfile, log4j.jarfile(for jpox enhancer) -->
+ <path id="project.classpath">
+ <!-- Directory where enhanced class files are located -->
+ <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}/${jdo.tck.identitytype}.jar"/>
+ <!-- Directory where JDOTCK class files are located -->
+ <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"/>
+ <pathelement location="${jdo.tck.testclasses.dir}"/>
+ <!-- JDO jar file -->
+ <pathelement location="${jdo.jdoapi.jarfile}"/>
+ <!-- Jar files for the implementation to be tested -->
+ <path refid="test_iut_jars" />
+ <!-- JUnit jar file -->
+ <pathelement location="${junit.jarfile}"/>
+ <!-- Spring jar files -->
+ <pathelement location="${springcore.jarfile}"/>
+ <pathelement location="${springbeans.jarfile}"/>
+ <pathelement location="${logging.jarfile}"/>
+ <!-- Jar files for other dependencies -->
+ <pathelement location="${jta.jarfile}" />
+ <pathelement location="${xmlparser}" />
+ <pathelement location="${bcel.jarfile}" />
+ <pathelement location="${log4j.jarfile}" />
+ <!-- Jar files for database -->
+ <pathelement location="${derby.jarfile}" />
+ <!-- Jar files for connection pooling -->
+ <pathelement location="${c3p0.jarfile}"/>
+ <pathelement location="${dbcp.jarfile}"/>
+ <pathelement location="${pool.jarfile}"/>
+ <pathelement location="${collections.jarfile}"/>
</path>
<!-- Paths needed for enhancement by jdori enhancer. -->
Modified: db/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/project.properties?rev=367838&r1=367837&r2=367838&view=diff
==============================================================================
--- db/jdo/trunk/tck20/project.properties (original)
+++ db/jdo/trunk/tck20/project.properties Tue Jan 10 15:53:02 2006
@@ -21,7 +21,7 @@
# iut properties file
iut.runtck.properties = iut.properties
-iut.runtck.sysproperties = -Xmx512m
+iut.runtck.sysproperties = -Dderby.system.home=${jdo.tck.testdir}/database/${jdo.tck.database}
# Flags indicating whether IUT supports application/datastore identity
iut.applicationidentity.supported = yes
Modified: db/jdo/trunk/tck20/test/conf/iut.properties
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/conf/iut.properties?rev=367838&r1=367837&r2=367838&view=diff
==============================================================================
--- db/jdo/trunk/tck20/test/conf/iut.properties (original)
+++ db/jdo/trunk/tck20/test/conf/iut.properties Tue Jan 10 15:53:02 2006
@@ -2,7 +2,7 @@
# P R O J E C T P R O P E R T I E S
# -------------------------------------------------------------------
#
-# IUT Properties
+# IUT PMF Properties
# Edit these properties for the Implementation Under Test
javax.jdo.PersistenceManagerFactoryClass=org.jpox.PersistenceManagerFactoryImpl
javax.jdo.option.ConnectionDriverName=org.apache.derby.jdbc.EmbeddedDriver
Modified: db/jdo/trunk/tck20/test/conf/jdori.properties
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/conf/jdori.properties?rev=367838&r1=367837&r2=367838&view=diff
==============================================================================
--- db/jdo/trunk/tck20/test/conf/jdori.properties (original)
+++ db/jdo/trunk/tck20/test/conf/jdori.properties Tue Jan 10 15:53:02 2006
@@ -2,7 +2,7 @@
# P R O J E C T P R O P E R T I E S
# -------------------------------------------------------------------
#
-# PMF Properties
+# JDORI PMF Properties
javax.jdo.PersistenceManagerFactoryClass=org.jpox.PersistenceManagerFactoryImpl
javax.jdo.option.ConnectionDriverName=org.apache.derby.jdbc.EmbeddedDriver
javax.jdo.option.ConnectionURL=jdbc:derby:jdotckdb