You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2005/12/24 02:02:36 UTC
svn commit: r358890 - in /db/jdo/trunk/tck20: maven.xml project.properties
Author: mcaisse
Date: Fri Dec 23 17:02:33 2005
New Revision: 358890
URL: http://svn.apache.org/viewcvs?rev=358890&view=rev
Log:
JDO-264 (partial)
Modified:
db/jdo/trunk/tck20/maven.xml
db/jdo/trunk/tck20/project.properties
Modified: db/jdo/trunk/tck20/maven.xml
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/maven.xml?rev=358890&r1=358889&r2=358890&view=diff
==============================================================================
--- db/jdo/trunk/tck20/maven.xml (original)
+++ db/jdo/trunk/tck20/maven.xml Fri Dec 23 17:02:33 2005
@@ -412,41 +412,40 @@
</goal>
<goal name="enhance.prepare" prereqs="java:compile, copyprops">
+ <!-- create enhancer log dir -->
+ <mkdir dir="${jdo.tck.log.directory.enhancer}"/>
<!-- copy metadata -->
- <mkdir dir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}" />
- <copy todir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}">
+ <mkdir dir="${enhanced.dir}" />
+ <copy todir="${enhanced.dir}">
<fileset dir="${basedir}/test/jdo/${jdo.tck.identitytype}"
includes="**/*.jdo, **/*.jdoquery, **/jdoTest.properties"/>
</copy>
<!-- compile pc and pa classes -->
<javac srcdir="${basedir}/test/java"
includes="${jdo.tck.pcclasses.sources} ${jdo.tck.paclasses.sources}"
- destdir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"
+ destdir="${enhanced.dir}"
debug="on"
classpathref="project.class.path">
</javac>
- <!-- classpath -->
- <path id="this.enhance.class.path">
- <path refid="enhance.class.path"/>
- <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"/>
- </path>
-
</goal>
<goal name="doEnhance.iut">
- <mkdir dir="${jdo.tck.log.directory.enhancer}"/>
<j:set var="jdo.tck.enhanced.dir" value="${iut.enhanced.dir}"/>
<j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
+ <j:set var="enhanced.dir"
+ value="${iut.enhanced.dir}/${jdo.tck.identitytype}"/>
<attainGoal name="enhance.check"/>
<j:if test="${enhancement.required}">
- <attainGoal name="enhance.prepare"/>
- <j:set var="iut.enhanced.dir"
- value="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"/>
<echo>Run IUT enhancer for ${jdo.tck.identitytype}</echo>
+ <attainGoal name="enhance.prepare"/>
+ <path id="enhance.classpath">
+ <path refid="iut.enhancer.classpath"/>
+ <pathelement location="${enhanced.dir}"/>
+ </path>
<java fork="yes" failonerror="yes"
dir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"
classname="${iut.enhancer.main}"
- classpathref="this.enhance.class.path">
+ classpathref="enhance.classpath">
<sysproperty key="jdo.tck.identitytype"
value="${jdo.tck.identitytype}"/>
<sysproperty key="jdo.tck.log.directory"
@@ -461,26 +460,29 @@
</goal>
<goal name="doEnhance.jdori">
- <mkdir dir="${jdo.tck.log.directory.enhancer}"/>
- <j:set var="jdo.tck.enhanced.dir" value="${jdo.enhanced.dir}"/>
+ <j:set var="jdo.tck.enhanced.dir" value="${jdori.enhanced.dir}"/>
<j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
+ <j:set var="enhanced.dir"
+ value="${jdori.enhanced.dir}/${jdo.tck.identitytype}"/>
<attainGoal name="enhance.check"/>
<j:if test="${enhancement.required}">
<echo>Run JDORI enhancer for ${jdo.tck.identitytype}</echo>
<attainGoal name="enhance.prepare"/>
- <j:set var="jdo.enhanced.dir"
- value="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"/>
+ <path id="enhance.classpath">
+ <path refid="jdori.enhancer.classpath"/>
+ <pathelement location="${enhanced.dir}"/>
+ </path>
<java fork="yes" failonerror="yes"
- dir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"
- classname="${jdo.enhancer.main}"
- classpathref="this.enhance.class.path">
+ dir="${enhanced.dir}"
+ classname="${jdori.enhancer.main}"
+ classpathref="enhance.classpath">
<sysproperty key="jdo.tck.identitytype"
value="${jdo.tck.identitytype}"/>
<sysproperty key="jdo.tck.log.directory"
value="${jdo.tck.log.directory.enhancer}"/>
- <jvmarg line="${jdo.enhancer.sysproperties}"/>
- <arg line="${jdo.enhancer.options}"/>
- <arg line="${jdo.enhancer.args}"/>
+ <jvmarg line="${jdori.enhancer.sysproperties}"/>
+ <arg line="${jdori.enhancer.options}"/>
+ <arg line="${jdori.enhancer.args}"/>
</java>
</j:if>
<attainGoal name="package.jdori"/>
@@ -555,15 +557,12 @@
<pathelement location="${collections.jarfile}"/>
</path>
- <!-- Paths needed for enhancement. Must not include
- "${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar" -->
- <path id="enhance.class.path">
+ <!-- Paths needed for enhancement by jdori enhancer. -->
+ <path id="jdori.enhancer.classpath">
<!-- Directory where JDOTCK class files are located -->
<pathelement location="${jdo.tck.testclasses.dir}"/>
<!-- JDO jar file -->
<pathelement location="${jdo.jdoapi.jarfile}"/>
- <!-- Jar files for the implementation to be tested -->
- <path refid="test_iut_jars" />
<!-- JUnit jar file -->
<pathelement location="${junit.jarfile}"/>
<!-- Jar files for the reference implementation -->
@@ -573,6 +572,19 @@
<pathelement location="${xmlparser}" />
<pathelement location="${bcel.jarfile}" />
<pathelement location="${log4j.jarfile}" />
+ </path>
+
+ <!-- Paths needed for enhancement by iut enhancer. -->
+ <path id="iut.enhancer.classpath">
+ <!-- Directory where JDOTCK class files are located -->
+ <pathelement location="${jdo.tck.testclasses.dir}"/>
+ <!-- JDO jar file -->
+ <pathelement location="${jdo.jdoapi.jarfile}"/>
+ <!-- JUnit jar file -->
+ <pathelement location="${junit.jarfile}"/>
+ <!-- Jar files for the implementation to be tested -->
+ <path refid="test_iut_jars" />
+ <pathelement path="${iut.enhancer.classpath}" />
</path>
<path id="jdori.class.path">
Modified: db/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/project.properties?rev=358890&r1=358889&r2=358890&view=diff
==============================================================================
--- db/jdo/trunk/tck20/project.properties (original)
+++ db/jdo/trunk/tck20/project.properties Fri Dec 23 17:02:33 2005
@@ -29,12 +29,11 @@
# The IUT enhancer, defaults to JPOX enhancer
iut.enhanced.dir = ${maven.build.dir}/enhanced/iut
-iut.enhancer.main = ${jdo.enhancer.main}
-iut.enhancer.options = -v -d "${iut.enhanced.dir}"
+iut.enhancer.main = ${jdori.enhancer.main}
+iut.enhancer.options = -v -d "${enhanced.dir}"
iut.enhancer.args = ${jdo.tck.jdometadata.files}
iut.enhancer.sysproperties =
-iut.enhancer.sourcepath = ${jdo.tck.testclasses.dir}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${junit.jarfile}${path.separator}${log4j.jarfile}
-iut.enhancer.classpath = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}${path.separator}${jdo.tck.testclasses.dir}
+iut.enhancer.classpath = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}
# JUnit settings
# Start new JVM for junit tests
@@ -75,12 +74,10 @@
xmlparser =
# JDORI enhancer
-jdo.enhanced.dir = ${maven.build.dir}/enhanced/jdori
-jdo.enhancer.main = org.jpox.enhancer.JPOXEnhancer
-jdo.enhancer.options = -v -d "${jdo.enhanced.dir}"
-jdo.enhancer.args = ${jdo.tck.jdometadata.files}
-jdo.enhancer.sourcepath = ${jdo.tck.testclasses.dir}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${junit.jarfile}${path.separator}${log4j.jarfile}
-jdo.enhancer.classpath = ${jpox.enhancer.jarfile}${path.separator}${jpox.jdori.jarfile}${path.separator}${jdo.jdoapi.jarfile}${path.separator}${log4j.jarfile}${path.separator}${bcel.jarfile}${path.separator}${jdo.tck.testclasses.dir}
+jdori.enhanced.dir = ${maven.build.dir}/enhanced/jdori
+jdori.enhancer.main = org.jpox.enhancer.JPOXEnhancer
+jdori.enhancer.options = -v -d "${enhanced.dir}"
+jdori.enhancer.args = ${jdo.tck.jdometadata.files}
# connection pooling dependencies
jpox.dbcp.jarfile = ${pom.getDependencyPath('jpox:jpox-dbcp')}