--- jsr166/build.xml	2013/01/20 03:34:23	1.111
+++ jsr166/build.xml	2013/01/20 03:51:38	1.113
@@ -49,7 +49,7 @@
 
   <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
   <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
-  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>
+  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
   <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
 
   <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
@@ -324,8 +324,6 @@
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
 
-      <classpath refid="test.classpath"/>
-
     </javac>
 
     <javac srcdir="${test.src.dir}"
@@ -334,7 +332,7 @@
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            source="6"
-           classpath="${junit.jar}"
+           classpath=""
            bootclasspath="${product.jar}:${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
@@ -347,8 +345,6 @@
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
 
-      <classpath refid="test.classpath"/>
-
     </javac>
 
 <!--
@@ -364,8 +360,6 @@
       <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
 
-      <classpath refid="test.classpath"/>
-
     </javac>
 -->