svn commit: r161790 - in incubator/jdo/trunk/tck20: maven.xml project.properties

[mb...@apache.org]

Author: mbo
Date: Mon Apr 18 12:28:26 2005
New Revision: 161790

URL: http://svn.apache.org/viewcvs?view=rev&rev=161790
Log:
JDO-14: jdori enhancement occurs unnecessarily with runtck* goals

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

Modified: incubator/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/maven.xml?view=diff&r1=161789&r2=161790
==============================================================================
--- incubator/jdo/trunk/tck20/maven.xml (original)
+++ incubator/jdo/trunk/tck20/maven.xml Mon Apr 18 12:28:26 2005
@@ -177,9 +177,9 @@
         <!-- copy metadata -->
         <copy todir="${iut.enhanced.dir}">
             <fileset dir="${basedir}/test/jdo/${identitytype}"
-                     includes="**/*.jdo, **/*.jdoTest.properties"/>
+                     includes="**/*.jdo, **/jdoTest.properties"/>
             <fileset dir="${basedir}/test/orm/${identitytype}"
-                     includes="**/*.orm, **/*.jdoTest.properties"/>
+                     includes="**/*.orm, **/jdoTest.properties"/>
         </copy>
         <!-- compile pc and pa classes -->
         <javac srcdir="${basedir}/test/java"
@@ -217,9 +217,9 @@
     </goal>
 
     <preGoal name="jdorienhance.applicationidentity">
-        <condition property="enhancement.required">
+        <condition property="jdorienhancement.required">
             <not>
-                <uptodate targetfile="${jdori.enhanced.dir}/applicationidentity.jar">
+                <uptodate targetfile="${jdo.enhanced.dir}/applicationidentity.jar">
                     <srcfiles dir="${basedir}/test/jdo/applicationidentity"
                               includes="org/apache/jdo/tck/pc/**/*.jdo, 
                                         org/apache/jdo/tck/pc/**/*.orm, 
@@ -233,14 +233,14 @@
     </preGoal>
 
     <goal name="jdorienhance.applicationidentity">
-        <j:if test="${enhancement.required}">
+        <j:if test="${jdorienhancement.required}">
             <j:set var="identitytype" value="applicationidentity"/>
-            <attainGoal name="enhance.run"/>
+            <attainGoal name="jdorienhance.run"/>
         </j:if>
     </goal>
 
     <preGoal name="jdorienhance.datastoreidentity">
-        <condition property="enhancement.required">
+        <condition property="jdorienhancement.required">
             <not>
                 <uptodate targetfile="${jdo.enhanced.dir}/datastoreidentity.jar">
                     <srcfiles dir="${basedir}/test/jdo/datastoreidentity"
@@ -256,19 +256,20 @@
     </preGoal>
 
     <goal name="jdorienhance.datastoreidentity">
-        <j:if test="${enhancement.required}">
+        <j:if test="${jdorienhancement.required}">
             <j:set var="identitytype" value="datastoreidentity"/>
-            <attainGoal name="enhance.run"/>
+            <attainGoal name="jdorienhance.run"/>
         </j:if>
     </goal>
 
     <preGoal name="jdorienhance.run">
+        <mkdir dir="${jdo.enhanced.dir}" />
         <!-- copy metadata -->
         <copy todir="${jdo.enhanced.dir}">
             <fileset dir="${basedir}/test/jdo/${identitytype}"
-                     includes="**/*.jdo, **/*.jdoTest.properties"/>
+                     includes="**/*.jdo, **/jdoTest.properties"/>
             <fileset dir="${basedir}/test/orm/${identitytype}"
-                     includes="**/*.orm, **/*.jdoTest.properties"/>
+                     includes="**/*.orm, **/jdoTest.properties"/>
         </copy>
         <!-- compile pc and pa classes -->
         <javac srcdir="${basedir}/test/java"
@@ -280,7 +281,7 @@
     </preGoal>
 
     <goal name="jdorienhance.run">
-        <echo>Run IUT enhancer</echo>
+        <echo>Run JDORI enhancer</echo>
         <java fork="yes" failonerror="yes" 
               dir="${jdo.enhanced.dir}"
               classname="${jdo.enhancer.main}"
@@ -357,7 +358,7 @@
 
     <path id="jdori.class.path">
         <!-- Directory where jdori enhanced class files are located  -->
-        <pathelement location="${iut.enhanced.dir}/${jdo.tck.identitytype}.jar"/>
+        <pathelement location="${jdo.enhanced.dir}/${jdo.tck.identitytype}.jar"/>
         <!-- Directory where JDOTCK class files are located  -->
         <pathelement location="${jdo.tck.testclasses.dir}"/>
         <!-- JDO jar file  -->

Modified: incubator/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/project.properties?view=diff&r1=161789&r2=161790
==============================================================================
--- incubator/jdo/trunk/tck20/project.properties (original)
+++ incubator/jdo/trunk/tck20/project.properties Mon Apr 18 12:28:26 2005
@@ -61,7 +61,7 @@
 xmlparser =
 
 # JDORI enhancer
-jdo.enhanced.dir = ${maven.build.dir}/enhanced
+jdo.enhanced.dir = ${maven.build.dir}/enhanced/jdori
 jdo.enhancer.main = org.jpox.enhancer.JPOXEnhancer
 jdo.enhancer.options = -v -d "${iut.enhanced.dir}"
 jdo.enhancer.args = ${jdo.tck.jdometadata.files}