--- a/experiments/java/build.xml	Sat Aug 24 17:29:19 2013 +0100
+++ b/experiments/java/build.xml	Sat Aug 24 17:30:57 2013 +0100
@@ -3,14 +3,11 @@
               Any modifications will be overwritten.
               To include a user specific buildfile here, simply create one in the same
               directory with the processing instruction <?eclipse.ant.import?>
-              as the first entry and export the buildfile again. -->
-<project basedir="." default="build" name="stx.libjava.experiments">
+              as the first entry and export the buildfile again. --><project basedir="." default="build" name="stx.libjava.experiments">
     <property environment="env"/>
-    <property name="stx.libjava.benchmarks.location" value="../../benchmarks/java"/>
     <property name="stx.libjava.examples.location" value="../../examples/java"/>
     <property name="stx.libjava.examples.tomcat 6.x.location" value="../../examples/tomcat6/apache-tomcat-6.0.35-src"/>
     <property name="ECLIPSE_HOME" value="../../../../../../../../../../../../../opt/eclipse-4.2"/>
-    <property name="junit.output.dir" value="junit"/>
     <property name="stx.libjava.location" value="../../java"/>
     <property name="stx.libjava.libs.location" value="../../libs/java"/>
     <property name="stx.libjava.tools.location" value="../../tools/java"/>
@@ -19,7 +16,7 @@
     <property name="source" value="1.6"/>
     <import file="build.ivy.xml"/>
     <path id="stx.libjava.classpath">
-        <pathelement location="${stx.libjava.location}/libjava-support/bin"/>
+        <pathelement location="${stx.libjava.location}/bin"/>
         <pathelement location="${stx.libjava.location}/libs-src/groovy-all-1.8.2-sources.jar"/>
         <pathelement location="${stx.libjava.location}/libs-src/junit-4.8.2-sources.jar"/>
         <pathelement location="${stx.libjava.location}/libs/groovy-all-1.8.2.jar"/>
@@ -108,12 +105,6 @@
         </javac>
     </target>
     <target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects">
-        <ant antfile="build.xml" dir="${stx.libjava.benchmarks.location}" inheritAll="false" target="clean"/>
-        <ant antfile="build.xml" dir="${stx.libjava.benchmarks.location}" inheritAll="false" target="build">
-            <propertyset>
-                <propertyref name="build.compiler"/>
-            </propertyset>
-        </ant>
         <ant antfile="build.xml" dir="${stx.libjava.examples.location}" inheritAll="false" target="clean"/>
         <ant antfile="build.xml" dir="${stx.libjava.examples.location}" inheritAll="false" target="build">
             <propertyset>
@@ -140,36 +131,4 @@
         <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
         <antcall target="build"/>
     </target>
-    <target name="CompilerTests.test_04">
-        <mkdir dir="${junit.output.dir}"/>
-        <junit fork="yes" printsummary="withOutAndErr">
-            <formatter type="xml"/>
-            <test name="stx.libjava.tools.compiler.ecj.tests.CompilerTests" todir="${junit.output.dir}"/>
-            <classpath refid="stx.libjava.experiments.classpath"/>
-        </junit>
-    </target>
-    <target name="CompilerTests.test_05">
-        <mkdir dir="${junit.output.dir}"/>
-        <junit fork="yes" printsummary="withOutAndErr">
-            <formatter type="xml"/>
-            <test name="stx.libjava.tools.compiler.ecj.tests.CompilerTests" todir="${junit.output.dir}"/>
-            <classpath refid="stx.libjava.experiments.classpath"/>
-        </junit>
-    </target>
-    <target name="CompilerTests">
-        <mkdir dir="${junit.output.dir}"/>
-        <junit fork="yes" printsummary="withOutAndErr">
-            <formatter type="xml"/>
-            <test name="stx.libjava.tools.compiler.ecj.tests.CompilerTests" todir="${junit.output.dir}"/>
-            <classpath refid="stx.libjava.experiments.classpath"/>
-        </junit>
-    </target>
-    <target name="junitreport">
-        <junitreport todir="${junit.output.dir}">
-            <fileset dir="${junit.output.dir}">
-                <include name="TEST-*.xml"/>
-            </fileset>
-            <report format="frames" todir="${junit.output.dir}"/>
-        </junitreport>
-    </target>
 </project>