db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r170799 - /incubator/jdo/trunk/tck11/maven.xml /incubator/jdo/trunk/tck20/maven.xml
Date Wed, 18 May 2005 19:25:27 GMT
Author: mbo
Date: Wed May 18 12:25:26 2005
New Revision: 170799

URL: http://svn.apache.org/viewcvs?rev=170799&view=rev
Log:
JDO-45: Need to do full build to get company.xml copied to target dir. Changed maven.xml:
renamed goal copylogginprops to copyprops and added copying .xml files.

Modified:
    incubator/jdo/trunk/tck11/maven.xml
    incubator/jdo/trunk/tck20/maven.xml

Modified: incubator/jdo/trunk/tck11/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/maven.xml?rev=170799&r1=170798&r2=170799&view=diff
==============================================================================
--- incubator/jdo/trunk/tck11/maven.xml (original)
+++ incubator/jdo/trunk/tck11/maven.xml Wed May 18 12:25:26 2005
@@ -49,7 +49,7 @@
     <!-- Running test cases -->
     <!-- ================== -->
 
-    <goal name="runtck" prereqs="java:compile, enhance, testrunner.set, database, copyloggingprops">
+    <goal name="runtck" prereqs="java:compile, enhance, testrunner.set, database, copyprops">
         <echo>Run JDO TCK on the IUT with configuration ${jdo.tck.configuration}</echo>
         <java fork="yes" dir="${jdo.tck.testdir}" 
               classname="${jdo.tck.testrunnerclass}">
@@ -66,7 +66,7 @@
     <!-- Run a single tck test. The property testcase defines the name of -->
     <!-- the tck test class w/o the prefix org.apache.jdo.tck, e.g.       --> 
     <!--   maven -Dtest=api.jdohelper.GetObjectId runtck.single       -->
-    <goal name="runtck.single" prereqs="java:compile, enhance, testrunner.set, database,
copyloggingprops">
+    <goal name="runtck.single" prereqs="java:compile, enhance, testrunner.set, database,
copyprops">
         <echo>Run TCK test org.apache.jdo.tck.${test} on the IUT with configuration
${jdo.tck.configuration}</echo>
         <java fork="yes" dir="${jdo.tck.testdir}" 
               classname="org.apache.jdo.tck.${test}">
@@ -79,7 +79,7 @@
         </java>
     </goal>
 
-    <goal name="runtck.jdori" prereqs="java:compile, jdorienhance, database, copyloggingprops">
+    <goal name="runtck.jdori" prereqs="java:compile, jdorienhance, database, copyprops">
         <echo>Run JDO TCK on the RI with configuration ${jdo.tck.configuration}</echo>
         <j:set var="jdo.tck.testrunnerclass" value="org.apache.jdo.tck.util.BatchTestRunner"/>
         <java fork="yes" dir="${jdo.tck.testdir}" 
@@ -96,7 +96,7 @@
     <!-- Run a single tck test. The property testcase defines the name of -->
     <!-- the tck test class w/o the prefix org.apache.jdo.tck, e.g.       --> 
     <!--   maven -Dtest=api.jdohelper.GetObjectId runtck.single       -->
-    <goal name="runtck.jdorisingle" prereqs="java:compile, jdorienhance, database, copyloggingprops">
+    <goal name="runtck.jdorisingle" prereqs="java:compile, jdorienhance, database, 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}" 
               classname="org.apache.jdo.tck.${test}">
@@ -365,12 +365,15 @@
        </condition>
     </goal>
 
-    <goal name="copyloggingprops">
+    <goal name="copyprops">
         <copy todir="${jdo.tck.testclasses.dir}" >
             <fileset dir="${basedir}/test/conf">
                <include name="commons-logging.properties"/>
                <include name="simplelog.properties"/>
                <include name="logging.properties"/>
+            </fileset>
+            <fileset dir="${basedir}/test/java">
+                <include name="**/*.xml"/>
             </fileset>
         </copy>
     </goal>

Modified: incubator/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/maven.xml?rev=170799&r1=170798&r2=170799&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/maven.xml (original)
+++ incubator/jdo/trunk/tck20/maven.xml Wed May 18 12:25:26 2005
@@ -49,7 +49,7 @@
     <!-- Running test cases -->
     <!-- ================== -->
 
-    <goal name="runtck" prereqs="java:compile, enhance, testrunner.set, database, copyloggingprops">
+    <goal name="runtck" prereqs="java:compile, enhance, testrunner.set, database, copyprops">
         <echo>Run JDO TCK on the IUT with configuration ${jdo.tck.configuration}</echo>
         <java fork="yes" dir="${jdo.tck.testdir}" 
               classname="${jdo.tck.testrunnerclass}">
@@ -66,7 +66,7 @@
     <!-- Run a single tck test. The property testcase defines the name of -->
     <!-- the tck test class w/o the prefix org.apache.jdo.tck, e.g.       --> 
     <!--   maven -Dtest=api.jdohelper.GetObjectId runtck.single       -->
-    <goal name="runtck.single" prereqs="java:compile, enhance, testrunner.set, copyloggingprops">
+    <goal name="runtck.single" prereqs="java:compile, enhance, testrunner.set, copyprops">
         <echo>Run TCK test org.apache.jdo.tck.${test} on the IUT with configuration
${jdo.tck.configuration}</echo>
         <java fork="yes" dir="${jdo.tck.testdir}" 
               classname="org.apache.jdo.tck.${test}">
@@ -79,7 +79,7 @@
         </java>
     </goal>
 
-    <goal name="runtck.jdori" prereqs="java:compile, jdorienhance, database, copyloggingprops">
+    <goal name="runtck.jdori" prereqs="java:compile, jdorienhance, database, copyprops">
         <echo>Run JDO TCK on the RI with configuration ${jdo.tck.configuration}</echo>
         <j:set var="jdo.tck.testrunnerclass" value="org.apache.jdo.tck.util.BatchTestRunner"/>
         <java fork="yes" dir="${jdo.tck.testdir}" 
@@ -98,7 +98,7 @@
     <!-- Run a single tck test. The property testcase defines the name of -->
     <!-- the tck test class w/o the prefix org.apache.jdo.tck, e.g.       --> 
     <!--   maven -Dtest=api.jdohelper.GetObjectId runtck.single       -->
-    <goal name="runtck.jdorisingle" prereqs="java:compile, jdorienhance, copyloggingprops">
+    <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}" 
               classname="org.apache.jdo.tck.${test}">
@@ -116,7 +116,7 @@
     <!-- Debug            -->
     <!-- ================ -->
     
-    <goal name="debug.runtck" prereqs="java:compile, enhance, testrunner.set, database,
copyloggingprops">
+    <goal name="debug.runtck" prereqs="java:compile, enhance, testrunner.set, database,
copyprops">
         <echo>Debug JDO TCK on the IUT with configuration ${jdo.tck.configuration}</echo>
         <ant:nbjpdastart name="runtck" addressproperty="jpda.address" transport="dt_socket"/>
         <java fork="yes" dir="${jdo.tck.testdir}" 
@@ -438,12 +438,15 @@
        </condition>
     </goal>
 
-    <goal name="copyloggingprops">
+    <goal name="copyprops">
         <copy todir="${jdo.tck.testclasses.dir}" >
             <fileset dir="${basedir}/test/conf">
                <include name="commons-logging.properties"/>
                <include name="simplelog.properties"/>
                <include name="logging.properties"/>
+            </fileset>
+            <fileset dir="${basedir}/test/java">
+                <include name="**/*.xml"/>
             </fileset>
         </copy>
     </goal>



Mime
View raw message