Index: project.properties
===================================================================
--- project.properties	(revision 358067)
+++ project.properties	(working copy)
@@ -30,11 +30,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.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.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}${log4j.jarfile}${path.separator}${bcel.jarfile}
 
 # JUnit settings
 # Start new JVM for junit tests
@@ -77,10 +77,10 @@
 # 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.options = -v -d "${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}
+#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}
 
 # connection pooling dependencies
 jpox.dbcp.jarfile = ${pom.getDependencyPath('jpox:jpox-dbcp')}
Index: maven.xml
===================================================================
--- maven.xml	(revision 358164)
+++ maven.xml	(working copy)
@@ -398,6 +398,8 @@
     </goal>
 
     <goal name="enhance.check">
+        <echo> targetfile=${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar
+        </echo>
         <condition property="enhancement.required">
             <not>
                 <uptodate targetfile="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar">
@@ -412,41 +414,41 @@
     </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}">
+        <echo>In enhance.prepare enhanced.dir is ${enhanced.dir}</echo>
+        <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}">
+                <echo>Run IUT enhancer for ${jdo.tck.identitytype}</echo>
                 <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>
+                <path id="enhance.classpath">
+                    <path refid="enhance.iut.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,19 +463,22 @@
     </goal>
 
     <goal name="doEnhance.jdori">
-        <mkdir dir="${jdo.tck.log.directory.enhancer}"/>
         <j:set var="jdo.tck.enhanced.dir" value="${jdo.enhanced.dir}"/>
         <j:forEach var="jdo.tck.identitytype" items="${jdo.tck.identitytypes}">
+            <j:set var="enhanced.dir"
+                   value="${jdo.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="enhance.jdori.classpath"/>
+                    <pathelement location="${enhanced.dir}"/>
+                </path>
                 <java fork="yes" failonerror="yes" 
-                      dir="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}"
+                      dir="${enhanced.dir}"
                       classname="${jdo.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"
@@ -555,15 +560,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="enhance.jdori.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 -->
@@ -575,6 +577,19 @@
         <pathelement location="${log4j.jarfile}" />
     </path>
 
+    <!-- Paths needed for enhancement by iut enhancer. -->
+    <path id="enhance.iut.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">
         <!-- Directory where JDOTCK class files are located  -->
         <pathelement location="${jdo.tck.testclasses.dir}"/>