--- a/java/build.xml	Wed Feb 06 13:42:25 2013 -0800
+++ b/java/build.xml	Wed Feb 06 23:28:15 2013 +0100
@@ -3,16 +3,18 @@
               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="jv2 - stx:libjava">
+              as the first entry and export the buildfile again. --><project basedir="." default="build" name="stx:libjava">
     <property environment="env"/>
-    <property name="!!ext!! - stx:libjava - tests.location" value="../../../../../../../../../../Projects/libjava/sources/libjava/branches/jk_new_structure/tests/libjava"/>
-    <property name="jv2 - stx:libjava|examples.location" value="../examples/java"/>
-    <property name="ECLIPSE_HOME" value="../../../../../../../../../../../../usr/lib/eclipse"/>
+    <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="stx:libjava | experiments.location" value="../experiments/java"/>
+    <property name="stx:libjava | tests.location" value="../tests/libjava"/>
+    <property name="ECLIPSE_HOME" value="../../../../../../../../../../../../opt/eclipse-4.2"/>
     <property name="debuglevel" value="source,lines,vars"/>
-    <property name="target" value="1.6"/>
-    <property name="source" value="1.6"/>
-    <path id="jv2 - stx:libjava.classpath">
+    <property name="target" value="1.7"/>
+    <property name="source" value="1.7"/>
+    <path id="stx:libjava.classpath">
         <pathelement location="bin"/>
         <pathelement location="libs/groovy-all-1.8.2.jar"/>
         <pathelement location="libs/junit4-4.8.2.jar"/>
@@ -33,20 +35,38 @@
     <target name="build-subprojects"/>
     <target depends="init" name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
-        <javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
+        <javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
             <src path="src"/>
-            <classpath refid="jv2 - stx:libjava.classpath"/>
+            <classpath refid="stx:libjava.classpath"/>
         </javac>
     </target>
     <target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects">
-        <ant antfile="build.xml" dir="${!!ext!! - stx:libjava - tests.location}" inheritAll="false" target="clean"/>
-        <ant antfile="build.xml" dir="${!!ext!! - stx:libjava - tests.location}" inheritAll="false" target="build">
+        <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="${jv2 - stx:libjava|examples.location}" inheritAll="false" target="clean"/>
-        <ant antfile="build.xml" dir="${jv2 - stx:libjava|examples.location}" inheritAll="false" target="build">
+        <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>
+                <propertyref name="build.compiler"/>
+            </propertyset>
+        </ant>
+        <ant antfile="build.xml" dir="${stx:libjava | examples | tomcat 6.x.location}" inheritAll="false" target="clean"/>
+        <ant antfile="build.xml" dir="${stx:libjava | examples | tomcat 6.x.location}" inheritAll="false" target="build">
+            <propertyset>
+                <propertyref name="build.compiler"/>
+            </propertyset>
+        </ant>
+        <ant antfile="build.xml" dir="${stx:libjava | experiments.location}" inheritAll="false" target="clean"/>
+        <ant antfile="build.xml" dir="${stx:libjava | experiments.location}" inheritAll="false" target="build">
+            <propertyset>
+                <propertyref name="build.compiler"/>
+            </propertyset>
+        </ant>
+        <ant antfile="build.xml" dir="${stx:libjava | tests.location}" inheritAll="false" target="clean"/>
+        <ant antfile="build.xml" dir="${stx:libjava | tests.location}" inheritAll="false" target="build">
             <propertyset>
                 <propertyref name="build.compiler"/>
             </propertyset>
@@ -66,4 +86,3 @@
         <antcall target="build"/>
     </target>
 </project>
-