Hi Michelle,
I looked into the JIRA issue JDO-45: Need to do full build to get company.xml copied to target dir
http://issues.apache.org/jira/browse/JDO-45
I propose to rename the maven goal copyloggingprops to copyprops and add copying the company.xml file to it. Attached you find a patch including this change for tck11 and tck20. You can run the patch by calling 'patch -p0 < JDO-45.patch' in the directory trunk. Please let me know whether it works for you, then I can check in the change.
Regards Michael
-- Michael Bouschen [EMAIL PROTECTED] Engineering GmbH mailto:[EMAIL PROTECTED] http://www.tech.spree.de/ Tel.:++49/30/235 520-33 Buelowstr. 66 Fax.:++49/30/2175 2012 D-10783 Berlin
Index: tck11/maven.xml
===================================================================
--- tck11/maven.xml (revision 170441)
+++ tck11/maven.xml (working copy)
@@ -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,13 +365,16 @@
</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>
Index: tck20/maven.xml
===================================================================
--- tck20/maven.xml (revision 170441)
+++ tck20/maven.xml (working copy)
@@ -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,13 +438,16 @@
</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>
