Return-Path: 
 <jdo-commits-return-416-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 12809 invoked from network); 18 Apr 2005 19:28:29 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 18 Apr 2005 19:28:29 -0000
Received: (qmail 13426 invoked by uid 500); 18 Apr 2005 19:28:29 -0000
Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-commits-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-commits-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-commits@db.apache.org>
List-Id: <jdo-commits.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-commits@db.apache.org
Received: (qmail 13404 invoked by uid 99); 18 Apr 2005 19:28:29 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Mon, 18 Apr 2005 12:28:28 -0700
Received: (qmail 12805 invoked by uid 65534); 18 Apr 2005 19:28:27 -0000
Message-ID: <20050418192827.12804.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Mon, 18 Apr 2005 19:28:27 -0000
Subject: svn commit: r161790 - in incubator/jdo/trunk/tck20: maven.xml
 project.properties
To: jdo-commits@db.apache.org
From: mbo@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

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

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161790
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=
=3Ddiff&r1=3D161789&r2=3D161790
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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=3D"${iut.enhanced.dir}">
             <fileset dir=3D"${basedir}/test/jdo/${identitytype}"
-                     includes=3D"**/*.jdo, **/*.jdoTest.properties"/>
+                     includes=3D"**/*.jdo, **/jdoTest.properties"/>
             <fileset dir=3D"${basedir}/test/orm/${identitytype}"
-                     includes=3D"**/*.orm, **/*.jdoTest.properties"/>
+                     includes=3D"**/*.orm, **/jdoTest.properties"/>
         </copy>
         <!-- compile pc and pa classes -->
         <javac srcdir=3D"${basedir}/test/java"
@@ -217,9 +217,9 @@
     </goal>
=20
     <preGoal name=3D"jdorienhance.applicationidentity">
-        <condition property=3D"enhancement.required">
+        <condition property=3D"jdorienhancement.required">
             <not>
-                <uptodate targetfile=3D"${jdori.enhanced.dir}/applicationi=
dentity.jar">
+                <uptodate targetfile=3D"${jdo.enhanced.dir}/applicationide=
ntity.jar">
                     <srcfiles dir=3D"${basedir}/test/jdo/applicationidenti=
ty"
                               includes=3D"org/apache/jdo/tck/pc/**/*.jdo,=20
                                         org/apache/jdo/tck/pc/**/*.orm,=20
@@ -233,14 +233,14 @@
     </preGoal>
=20
     <goal name=3D"jdorienhance.applicationidentity">
-        <j:if test=3D"${enhancement.required}">
+        <j:if test=3D"${jdorienhancement.required}">
             <j:set var=3D"identitytype" value=3D"applicationidentity"/>
-            <attainGoal name=3D"enhance.run"/>
+            <attainGoal name=3D"jdorienhance.run"/>
         </j:if>
     </goal>
=20
     <preGoal name=3D"jdorienhance.datastoreidentity">
-        <condition property=3D"enhancement.required">
+        <condition property=3D"jdorienhancement.required">
             <not>
                 <uptodate targetfile=3D"${jdo.enhanced.dir}/datastoreident=
ity.jar">
                     <srcfiles dir=3D"${basedir}/test/jdo/datastoreidentity"
@@ -256,19 +256,20 @@
     </preGoal>
=20
     <goal name=3D"jdorienhance.datastoreidentity">
-        <j:if test=3D"${enhancement.required}">
+        <j:if test=3D"${jdorienhancement.required}">
             <j:set var=3D"identitytype" value=3D"datastoreidentity"/>
-            <attainGoal name=3D"enhance.run"/>
+            <attainGoal name=3D"jdorienhance.run"/>
         </j:if>
     </goal>
=20
     <preGoal name=3D"jdorienhance.run">
+        <mkdir dir=3D"${jdo.enhanced.dir}" />
         <!-- copy metadata -->
         <copy todir=3D"${jdo.enhanced.dir}">
             <fileset dir=3D"${basedir}/test/jdo/${identitytype}"
-                     includes=3D"**/*.jdo, **/*.jdoTest.properties"/>
+                     includes=3D"**/*.jdo, **/jdoTest.properties"/>
             <fileset dir=3D"${basedir}/test/orm/${identitytype}"
-                     includes=3D"**/*.orm, **/*.jdoTest.properties"/>
+                     includes=3D"**/*.orm, **/jdoTest.properties"/>
         </copy>
         <!-- compile pc and pa classes -->
         <javac srcdir=3D"${basedir}/test/java"
@@ -280,7 +281,7 @@
     </preGoal>
=20
     <goal name=3D"jdorienhance.run">
-        <echo>Run IUT enhancer</echo>
+        <echo>Run JDORI enhancer</echo>
         <java fork=3D"yes" failonerror=3D"yes"=20
               dir=3D"${jdo.enhanced.dir}"
               classname=3D"${jdo.enhancer.main}"
@@ -357,7 +358,7 @@
=20
     <path id=3D"jdori.class.path">
         <!-- Directory where jdori enhanced class files are located  -->
-        <pathelement location=3D"${iut.enhanced.dir}/${jdo.tck.identitytyp=
e}.jar"/>
+        <pathelement location=3D"${jdo.enhanced.dir}/${jdo.tck.identitytyp=
e}.jar"/>
         <!-- Directory where JDOTCK class files are located  -->
         <pathelement location=3D"${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.proper=
ties?view=3Ddiff&r1=3D161789&r2=3D161790
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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 =3D
=20
 # JDORI enhancer
-jdo.enhanced.dir =3D ${maven.build.dir}/enhanced
+jdo.enhanced.dir =3D ${maven.build.dir}/enhanced/jdori
 jdo.enhancer.main =3D org.jpox.enhancer.JPOXEnhancer
 jdo.enhancer.options =3D -v -d "${iut.enhanced.dir}"
 jdo.enhancer.args =3D ${jdo.tck.jdometadata.files}