db-jdo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Michael Bouschen <mbo.t...@spree.de>
Subject Re: svn commit: r178824 - /incubator/jdo/trunk/tck20/maven.xml
Date Mon, 30 May 2005 11:49:35 GMT
Hi Craig,

I agree with the changes, but I have a question about the changes 
related to the enhancer call. Does the enhancer need the mapping files 
(*.orm) and and the testdata files (*.xml)? The uptodate tag in preGoals 
jdorienhance.applicationidentity and jdorienhance.datastoreidentity 
checks whether enhancement is necessary, because some of the files in 
question have been changed since the last enhancer call. I'm wondering 
whether we need to include the .orm and .xml files in the uptodate tag. 
What do you think?

Regards Michael


> Author: clr
> Date: Fri May 27 14:42:26 2005
> New Revision: 178824
> 
> URL: http://svn.apache.org/viewcvs?rev=178824&view=rev
> Log:
> fixed but in enhancement targets; add test data to enhanced jar file for completeness
test
> 
> Modified:
>     incubator/jdo/trunk/tck20/maven.xml
> 
> Modified: incubator/jdo/trunk/tck20/maven.xml
> URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/maven.xml?rev=178824&r1=178823&r2=178824&view=diff
> ==============================================================================
> --- incubator/jdo/trunk/tck20/maven.xml (original)
> +++ incubator/jdo/trunk/tck20/maven.xml Fri May 27 14:42:26 2005
> @@ -152,8 +152,11 @@
>                      <uptodate targetfile="${iut.enhanced.dir}/applicationidentity.jar">
>                          <srcfiles dir="${basedir}/test/jdo/applicationidentity"
>                                    includes="org/apache/jdo/tck/pc/**/*.jdo, 
> -                                            org/apache/jdo/tck/pc/**/*.orm, 
>                                              org/apache/jdo/tck/pc/**/jdoTest.properties"/>
> +                        <srcfiles dir="${basedir}/test/orm/applicationidentity"
> +                                  includes="org/apache/jdo/tck/pc/**/*.orm"/>
> +                        <srcfiles dir="${basedir}/test/testdata/applicationidentity"
> +                                  includes="org/apache/jdo/tck/pc/**/*.xml"/>
>                          <srcfiles dir="${basedir}/test/java"
>                                    includes="${jdo.tck.pcclasses.sources}
>                                              ${jdo.tck.paclasses.sources}"/>
> @@ -181,6 +184,8 @@
>                                              org/apache/jdo/tck/pc/**/jdoTest.properties"/>
>                          <srcfiles dir="${basedir}/test/orm/datastoreidentity"
>                                    includes="org/apache/jdo/tck/pc/**/*.orm"/>
> +                        <srcfiles dir="${basedir}/test/testdata/datastoreidentity"
> +                                  includes="org/apache/jdo/tck/pc/**/*.xml"/>
>                          <srcfiles dir="${basedir}/test/java"
>                                    includes="${jdo.tck.pcclasses.sources}
>                                              ${jdo.tck.paclasses.sources}"/>
> @@ -203,7 +208,9 @@
>              <fileset dir="${basedir}/test/jdo/${identitytype}"
>                       includes="**/*.jdo, **/jdoTest.properties"/>
>              <fileset dir="${basedir}/test/orm/${identitytype}"
> -                     includes="**/*.orm, **/jdoTest.properties"/>
> +                     includes="**/*.orm"/>
> +            <fileset dir="${basedir}/test/testdata/${identitytype}"
> +                     includes="**/*.xml"/>
>          </copy>
>          <!-- compile pc and pa classes -->
>          <javac srcdir="${basedir}/test/java"
> @@ -230,7 +237,7 @@
>          <delete file="${iut.enhanced.dir}/${identitytype}.jar"/>
>          <jar jarfile="${iut.enhanced.dir}/${identitytype}.jar">
>              <fileset dir="${iut.enhanced.dir}" 
> -                 includes="**/*.class, **/*.jdo, **/*.orm, **/jdoTest.properties"/>
> +                 includes="**/*.class, **/*.jdo, **/*.orm, **/*.xml, **/jdoTest.properties"/>
>          </jar>
>          <delete dir="${iut.enhanced.dir}/org"/>
>      </postGoal>
> @@ -249,6 +256,8 @@
>                                          org/apache/jdo/tck/pc/**/jdoTest.properties"/>
>                      <srcfiles dir="${basedir}/test/orm/applicationidentity"
>                                includes="org/apache/jdo/tck/pc/**/*.orm"/>
> +                        <srcfiles dir="${basedir}/test/testdata/applicationidentity"
> +                                  includes="org/apache/jdo/tck/pc/**/*.xml"/>
>                      <srcfiles dir="${basedir}/test/java"
>                                includes="${jdo.tck.pcclasses.sources}
>                                          ${jdo.tck.paclasses.sources}"/>
> @@ -270,8 +279,11 @@
>                  <uptodate targetfile="${jdo.enhanced.dir}/datastoreidentity.jar">
>                      <srcfiles dir="${basedir}/test/jdo/datastoreidentity"
>                                includes="org/apache/jdo/tck/pc/**/*.jdo, 
> -                                        org/apache/jdo/tck/pc/**/*.orm, 
>                                          org/apache/jdo/tck/pc/**/jdoTest.properties"/>
> +                        <srcfiles dir="${basedir}/test/orm/datastoreidentity"
> +                                  includes="org/apache/jdo/tck/pc/**/*.orm"/>
> +                        <srcfiles dir="${basedir}/test/testdata/datastoreidentity"
> +                                  includes="org/apache/jdo/tck/pc/**/*.xml"/>
>                      <srcfiles dir="${basedir}/test/java"
>                                includes="${jdo.tck.pcclasses.sources}
>                                          ${jdo.tck.paclasses.sources}"/>
> @@ -294,7 +306,9 @@
>              <fileset dir="${basedir}/test/jdo/${identitytype}"
>                       includes="**/*.jdo, **/jdoTest.properties"/>
>              <fileset dir="${basedir}/test/orm/${identitytype}"
> -                     includes="**/*.orm, **/jdoTest.properties"/>
> +                     includes="**/*.orm"/>
> +            <fileset dir="${basedir}/test/testdata/${identitytype}"
> +                     includes="**/*.xml"/>
>          </copy>
>          <!-- compile pc and pa classes -->
>          <javac srcdir="${basedir}/test/java"
> @@ -321,7 +335,7 @@
>          <delete file="${jdo.enhanced.dir}/${identitytype}.jar"/>
>          <jar jarfile="${jdo.enhanced.dir}/${identitytype}.jar">
>              <fileset dir="${jdo.enhanced.dir}" 
> -                 includes="**/*.class, **/*.jdo, **/*.orm, **/jdoTest.properties"/>
> +                 includes="**/*.class, **/*.jdo, **/*.orm, **/*.xml, **/jdoTest.properties"/>
>          </jar>
>          <delete dir="${jdo.enhanced.dir}/org"/>
>      </postGoal>
> 


-- 
Michael Bouschen		Tech@Spree Engineering GmbH
mailto:mbo.tech@spree.de	http://www.tech.spree.de/
Tel.:++49/30/235 520-33		Buelowstr. 66			
Fax.:++49/30/2175 2012		D-10783 Berlin			

Mime
View raw message