db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r367456 - in /db/jdo/trunk/tck20: maven.xml project.properties
Date Tue, 10 Jan 2006 01:30:45 GMT
Author: mcaisse
Date: Mon Jan  9 17:30:44 2006
New Revision: 367456

URL: http://svn.apache.org/viewcvs?rev=367456&view=rev
Log:
JDO-264 (interim)

Modified:
    db/jdo/trunk/tck20/maven.xml
    db/jdo/trunk/tck20/project.properties

Modified: db/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/maven.xml?rev=367456&r1=367455&r2=367456&view=diff
==============================================================================
--- db/jdo/trunk/tck20/maven.xml (original)
+++ db/jdo/trunk/tck20/maven.xml Mon Jan  9 17:30:44 2006
@@ -245,7 +245,7 @@
     </goal>
 
     <goal name="privateRuntck.iut"
-          prereqs="java:compile, testrunner.set, copyprops, doEnhance.iut">
+          prereqs="java:compile, copyprops, doEnhance.iut">
         <!-- Run tests for all databases, identity types, and configurations -->
         <tstamp>
             <format property="timestamp" pattern="yyyyMMdd-HHmmss"/>
@@ -287,7 +287,7 @@
     </goal>
 
     <goal name="privateRuntck.jdori"
-          prereqs="java:compile, testrunner.set, copyprops, doEnhance.jdori">
+          prereqs="java:compile, copyprops, doEnhance.jdori">
         <!-- Run tests for all databases, identity types, and configurations -->
         <tstamp>
             <format property="timestamp" pattern="yyyyMMdd-HHmmss"/>
@@ -317,12 +317,10 @@
 
     <goal name="doRuntck.iut">
         <echo>Run JDO TCK on the IUT with configuration ${jdo.tck.configuration}</echo>
-        <path id="this.project.class.path">
+        <path id="this.iut.classpath">
             <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar"/>
-            <path refid="project.class.path"/>
+            <path refid="iut.classpath"/>
         </path>
-        <j:set var="jdo.tck.testrunnerclass"
-               value="org.apache.jdo.tck.util.BatchTestRunner"/>
          <u:loadText file="${basedir}/test/conf/${iut.runtck.properties}"
                     var="PMFProps"/>
         <j:file name="${jdo.tck.testclasses.dir}/${iut.runtck.properties}"
@@ -341,7 +339,7 @@
         
         <java fork="yes" dir="${jdo.tck.testdir}"
               classname="${jdo.tck.testrunnerclass}">
-            <classpath refid="this.project.class.path"/>
+            <classpath refid="this.iut.classpath"/>
             <sysproperty key="ResultPrinterClass"
                          value="${jdo.tck.resultprinterclass}"/>
             <sysproperty key="verbose" value="${verbose}"/>
@@ -378,9 +376,9 @@
     </goal>
 
     <goal name="doRuntck.jdori">
-        <path id="this.jdori.class.path">
+        <path id="this.jdori.classpath">
             <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar"/>
-            <path refid="jdori.class.path"/>
+            <path refid="jdori.classpath"/>
         </path>
         <u:loadText file="${basedir}/test/conf/${PMFProperties}"
                     var="PMFProps"/>
@@ -397,11 +395,9 @@
             <echo>JVM will wait until debugger attaches on port ${jdo.tck.debug.port}...</echo>
         </j:if>
         
-        <j:set var="jdo.tck.testrunnerclass"
-               value="org.apache.jdo.tck.util.BatchTestRunner"/>
         <java fork="yes" dir="${jdo.tck.testdir}"
                classname="${jdo.tck.testrunnerclass}">
-            <classpath refid="this.jdori.class.path"/>
+            <classpath refid="this.jdori.classpath"/>
             <sysproperty key="ResultPrinterClass"
                          value="${jdo.tck.resultprinterclass}"/>
             <sysproperty key="verbose" value="${verbose}"/>
@@ -441,7 +437,7 @@
     <goal name="result">
         <java fork="yes" dir="${jdo.tck.testdir}"
                classname="org.apache.jdo.tck.util.ResultSummary">
-            <classpath refid="jdori.class.path"/>
+            <classpath refid="jdori.classpath"/>
             <arg line="${jdo.tck.log.directory}/${timestamp}"/>
         </java>
     </goal>
@@ -486,7 +482,7 @@
            includes="${jdo.tck.pcclasses.sources} ${jdo.tck.paclasses.sources}"
            destdir="${enhanced.dir}"
            debug="on"
-           classpathref="project.class.path">
+           classpathref="project.classpath">
         </javac>
     </goal>
 
@@ -588,7 +584,7 @@
 
     <!-- Added jpox.enhancer.jarfile, renamed jpox.jdori.jarfile,
     added bcel.jarfile, log4j.jarfile(for jpox enhancer) -->
-    <path id="project.class.path">
+    <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  -->
@@ -648,7 +644,7 @@
         <pathelement path="${iut.enhancer.classpath}" />
     </path>
 
-    <path id="jdori.class.path">
+    <path id="jdori.classpath">
         <!-- Directory where JDOTCK class files are located  -->
         <pathelement location="${jdo.tck.testclasses.dir}"/>
         <!-- JDO jar file  -->
@@ -666,8 +662,10 @@
         <pathelement location="${bcel.jarfile}" />
         <pathelement location="${log4j.jarfile}" />
         <pathelement location="${derby.jarfile}" />
+        <!--
         <pathelement location="${core20.jarfile}" />
         <pathelement location="${enhancer20.jarfile}" />
+        -->
         <!-- Jar files for reference implmentation connection pooling -->
         <pathelement location="${jpox.dbcp.jarfile}" />
         <pathelement location="${jpox.c3p0.jarfile}" />
@@ -680,21 +678,44 @@
         <pathelement path="${jndi}"/>
     </path>
 
+    <path id="iut.classpath">
+        <!-- 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}"/>
+        <!-- Spring jar files -->
+        <pathelement location="${springcore.jarfile}"/>
+        <pathelement location="${springbeans.jarfile}"/>
+        <pathelement location="${logging.jarfile}"/>
+        <!-- Jar files for the implementation under test -->
+        <pathelement location="${jpox.jdori.jarfile}" />
+        <pathelement location="${xmlparser}" />
+        <pathelement location="${bcel.jarfile}" />
+        <pathelement location="${log4j.jarfile}" />
+        <!--
+        <pathelement location="${core20.jarfile}" />
+        <pathelement location="${enhancer20.jarfile}" />
+        -->
+        <!-- Jar files for database -->
+        <pathelement location="${derby.jarfile}" />
+        <!-- Jar files for implmentation under test connection pooling -->
+        <pathelement location="${jpox.dbcp.jarfile}" />
+        <pathelement location="${jpox.c3p0.jarfile}" />
+        <!-- Jar files for connection pooling -->
+        <pathelement location="${c3p0.jarfile}"/>
+        <pathelement location="${dbcp.jarfile}"/>
+        <pathelement location="${pool.jarfile}"/>
+        <pathelement location="${collections.jarfile}"/>
+        <!-- Jar files for jndi -->
+        <pathelement path="${jndi}"/>
+    </path>
+
     <!-- ==== -->
     <!-- Misc -->
     <!-- ==== -->
-
-    <goal name="testrunner.set">
-       <echo>testrunner.set:</echo>
-       <condition property="jdo.tck.testrunnerclass" 
-                  value="org.apache.jdo.tck.util.SwingTestRunner">
-           <istrue value="${gui}"/>
-       </condition>
-       <condition property="jdo.tck.testrunnerclass" 
-                  value="org.apache.jdo.tck.util.BatchTestRunner">
-           <isfalse value="${gui}"/>
-       </condition>
-    </goal>
 
     <goal name="copyprops">
        <echo>copyprops:</echo>

Modified: db/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/project.properties?rev=367456&r1=367455&r2=367456&view=diff
==============================================================================
--- db/jdo/trunk/tck20/project.properties (original)
+++ db/jdo/trunk/tck20/project.properties Mon Jan  9 17:30:44 2006
@@ -34,8 +34,10 @@
 iut.enhancer.args = ${jdo.tck.jdometadata.files}
 iut.enhancer.sysproperties =
 iut.enhancer.classpath = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}
+iut.execution.classpath = ${jpox.jdori.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}
 
 # JUnit settings
+jdo.tck.testrunnerclass = org.apache.jdo.tck.util.BatchTestRunner
 # Start new JVM for junit tests
 maven.junit.fork = yes
 maven.junit.dir = ${jdo.tck.testdir}



Mime
View raw message