Merge branch 'build'

31 files changed, 79 insertions, 276 deletions

diff --git a/java/build.xml b/java/build.xml
index 3810f2c75d2..ab0474daa5c 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -404,7 +404,7 @@
         </slice2java>
     </target>
 
-    <target name="custom-test-generate4" depends="test-generate" if="java2">
+    <target name="test-generate-custom4" depends="test-generate" if="java2">
         <!-- Create the output directory for generated code -->
         <mkdir dir="${generated.test.dir}"/>
         <slice2java outputdir="${generated.test.dir}" dependencyfile="${generated.test.dir}/.depend.Test">
@@ -415,7 +415,7 @@
         </slice2java>
     </target>
 
-    <target name="custom-test-generate5" depends="test-generate" unless="java2">
+    <target name="test-generate-custom5" depends="test-generate" unless="java2">
         <!-- Create the output directory for generated code -->
         <mkdir dir="${generated.test.dir}"/>
         <slice2java outputdir="${generated.test.dir}" dependencyfile="${generated.test.dir}/.depend.Test">
@@ -425,80 +425,39 @@
         </slice2java>
     </target>
 
-    <target name="custom-test-generate" depends="custom-test-generate4,custom-test-generate5"/>
-
-    <target name="test-compile-generated" depends="ice-compile,test-generate,custom-test-generate">
-    </target>
-
-    <target name="test-compile-base" depends="test-compile-generated">
+    <target name="test-compile-base" depends="ice-compile,test-generate">
         <mkdir dir="${lib.dir}"/>
         <mkdir dir="${cache.dir}"/>
         <depend srcdir="." destdir="${lib.dir}" cache="${cache.dir}"/>
-        <javac destdir="${lib.dir}"
-            source="1.5" debug="${debug}"
-	    deprecation="on">
-
-            <src path="."/>
-            <src path="${generated.test.dir}"/>
-
-	    <include name="test/Util/"/>
-	    <include name="test/Ice/adapterDeactivation/"/>
-	    <include name="test/Ice/background/"/>
-	    <include name="test/Ice/binding/"/>
-	    <include name="test/Ice/exceptions/"/>
-	    <include name="test/Ice/checksum/"/>
-	    <include name="test/Ice/facets/"/>
-	    <include name="test/Ice/faultTolerance/"/>
-	    <include name="test/Ice/hold/"/>
-	    <include name="test/Ice/inheritance/"/>
-	    <include name="test/Ice/interceptor/"/>
-	    <include name="test/Ice/location/"/>
-	    <include name="test/Ice/objects/"/>
-	    <include name="test/Ice/operations/"/>
-	    <include name="test/Ice/packagemd/"/>
-	    <include name="test/Ice/proxy/"/>
-	    <include name="test/Ice/retry/"/>
-	    <include name="test/Ice/serialize/"/>
-	    <include name="test/Ice/servantLocator/"/>
-	    <include name="test/Ice/seqMapping/"/>
-	    <include name="test/Ice/slicing/exceptions/"/>
-	    <include name="test/Ice/slicing/objects/"/>
-	    <include name="test/Ice/stream/"/>
-	    <include name="test/Ice/timeout/"/>
-	    <include name="test/Ice/udp/"/>
-	    <include name="test/Freeze/complex/"/>
-	    <include name="test/Freeze/dbmap/"/>
-	    <include name="test/Freeze/evictor/"/>
-	    <include name="test/Freeze/oldevictor/"/>
-	    <include name="test/Glacier2/router/"/>
-	    <include name="test/IceGrid/simple/"/>
-	    <include name="test/IceBox/configuration/"/>
-	    <include name="test/IceSSL/configuration/"/>
-	    <include name="test/IceUtil/inputUtil/"/>
-	    <include name="test/Slice/keyword/"/>
-	    <include name="test/Ice/throughput/"/>
+        <javac srcdir=".:${generated.test.dir}" destdir="${lib.dir}" source="1.5" debug="${debug}" deprecation="on">
+
+            <exclude name="${generated.test.dir}/**"/>
+
+	    <include name="test/**"/>
+            <exclude name="test/Ice/translator/"/>
+            <exclude name="test/Ice/custom14/"/>
+            <exclude name="test/Ice/custom15/"/>
+            <exclude name="test/Ice/protobuf/"/>
             <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
-    <target name="test-custom-compile4" depends="test-compile-generated" if="java2">
+    <target name="test-custom-compile4" depends="test-generate-custom4,test-compile-base" if="java2">
         <mkdir dir="${lib.dir}"/>
         <mkdir dir="${cache.dir}"/>
         <depend srcdir="." destdir="${lib.dir}" cache="${cache.dir}"/>
-        <javac destdir="${lib.dir}" debug="${debug}">
-            <src path="."/>
-            <src path="${generated.test.dir}"/>
+        <javac srcdir=".:${generated.test.dir}" destdir="${lib.dir}" debug="${debug}">
+            <exclude name="${generated.test.dir}/**"/>
 	    <include name="test/Ice/custom14/"/>
 	</javac>
     </target>
 
-    <target name="test-custom-compile5" depends="test-compile-generated" unless="java2">
+    <target name="test-custom-compile5" depends="test-generate-custom5,test-compile-base" unless="java2">
         <mkdir dir="${lib.dir}"/>
         <mkdir dir="${cache.dir}"/>
         <depend srcdir="." destdir="${lib.dir}" cache="${cache.dir}"/>
-        <javac destdir="${lib.dir}" debug="${debug}" source="1.5">
-            <src path="."/>
-            <src path="${generated.test.dir}"/>
+        <javac srcdir=".:${generated.test.dir}" destdir="${lib.dir}" debug="${debug}" source="1.5">
+            <exclude name="${generated.test.dir}/**"/>
 	    <include name="test/Ice/custom15/"/>
             <compilerarg value="${javac.lint}"/>
 	</javac>
diff --git a/java/demo/Database/library/build.xml b/java/demo/Database/library/build.xml
index 915b235a438..fe32ffec3d3 100644
--- a/java/demo/Database/library/build.xml
+++ b/java/demo/Database/library/build.xml
@@ -33,15 +33,10 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-            debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
-            <compilerarg value="${javac.lint}"/>
-        </javac>
-        <javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
-            <classpath refid="ice.classpath"/>
-            <compilerarg value="${javac.lint}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Freeze/bench/build.xml b/java/demo/Freeze/bench/build.xml
index 309f7c9ed9c..e94d6c06b80 100644
--- a/java/demo/Freeze/bench/build.xml
+++ b/java/demo/Freeze/bench/build.xml
@@ -55,19 +55,14 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath>
                 <path refid="ice.classpath"/>
                 <path refid="db.classpath"/>
             </classpath>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
     </target>
 
     <target name="all" depends="compile"/>
diff --git a/java/demo/Freeze/casino/build.xml b/java/demo/Freeze/casino/build.xml
index c5e1ed1536f..023c7051bae 100644
--- a/java/demo/Freeze/casino/build.xml
+++ b/java/demo/Freeze/casino/build.xml
@@ -32,13 +32,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath>
                 <path refid="ice.classpath"/>
                 <path refid="db.classpath"/>
diff --git a/java/demo/Freeze/library/build.xml b/java/demo/Freeze/library/build.xml
index 41ec51eeafa..d78ed2bb8c8 100644
--- a/java/demo/Freeze/library/build.xml
+++ b/java/demo/Freeze/library/build.xml
@@ -42,13 +42,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath>
                 <path refid="ice.classpath"/>
                 <path refid="db.classpath"/>
diff --git a/java/demo/Freeze/phonebook/build.xml b/java/demo/Freeze/phonebook/build.xml
index c5616897bdd..c2d595f026a 100644
--- a/java/demo/Freeze/phonebook/build.xml
+++ b/java/demo/Freeze/phonebook/build.xml
@@ -39,17 +39,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath>
-                <path refid="ice.classpath"/>
-                <path refid="db.classpath"/>
-            </classpath>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
-            <classpath refid="ice.classpath"/>
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath>
                 <path refid="ice.classpath"/>
                 <path refid="db.classpath"/>
diff --git a/java/demo/Freeze/transform/build.xml b/java/demo/Freeze/transform/build.xml
index 0250da01c04..13446f0c27b 100644
--- a/java/demo/Freeze/transform/build.xml
+++ b/java/demo/Freeze/transform/build.xml
@@ -41,19 +41,14 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath>
                 <path refid="ice.classpath"/>
                 <path refid="db.classpath"/>
             </classpath>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
     </target>
 
     <target name="all" depends="compile"/>
diff --git a/java/demo/Glacier2/callback/build.xml b/java/demo/Glacier2/callback/build.xml
index 35ca424f1f0..2462f736bb5 100644
--- a/java/demo/Glacier2/callback/build.xml
+++ b/java/demo/Glacier2/callback/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}" deprecation="on">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}" deprecation="on">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/applet/build.xml b/java/demo/Ice/applet/build.xml
index adfc97057af..ef75a8acb1d 100644
--- a/java/demo/Ice/applet/build.xml
+++ b/java/demo/Ice/applet/build.xml
@@ -35,13 +35,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/async/build.xml b/java/demo/Ice/async/build.xml
index 8c35a00e1fa..78395da53e6 100644
--- a/java/demo/Ice/async/build.xml
+++ b/java/demo/Ice/async/build.xml
@@ -31,13 +31,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/bidir/build.xml b/java/demo/Ice/bidir/build.xml
index b3fb8fcd131..c8e58804a1c 100644
--- a/java/demo/Ice/bidir/build.xml
+++ b/java/demo/Ice/bidir/build.xml
@@ -31,11 +31,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-	<javac srcdir="${generated.dir}" destdir="${class.dir}" debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac> 
-	<javac srcdir="." destdir="${class.dir}" excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/callback/build.xml b/java/demo/Ice/callback/build.xml
index 95d2df99ccc..1c800bbdaaa 100644
--- a/java/demo/Ice/callback/build.xml
+++ b/java/demo/Ice/callback/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/hello/build.xml b/java/demo/Ice/hello/build.xml
index 7ea82eccc29..d7a548d52ee 100644
--- a/java/demo/Ice/hello/build.xml
+++ b/java/demo/Ice/hello/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/invoke/build.xml b/java/demo/Ice/invoke/build.xml
index 9f7ddd08ef2..e0195ef0c35 100644
--- a/java/demo/Ice/invoke/build.xml
+++ b/java/demo/Ice/invoke/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/latency/build.xml b/java/demo/Ice/latency/build.xml
index bce2e06d80b..c2f2c804b6c 100644
--- a/java/demo/Ice/latency/build.xml
+++ b/java/demo/Ice/latency/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/minimal/build.xml b/java/demo/Ice/minimal/build.xml
index a3a310c0749..d08c08702f4 100644
--- a/java/demo/Ice/minimal/build.xml
+++ b/java/demo/Ice/minimal/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/multicast/build.xml b/java/demo/Ice/multicast/build.xml
index 18f3ab1fbd9..20e382ef2c9 100644
--- a/java/demo/Ice/multicast/build.xml
+++ b/java/demo/Ice/multicast/build.xml
@@ -29,13 +29,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/nested/build.xml b/java/demo/Ice/nested/build.xml
index af14c38b0d9..195469ff998 100644
--- a/java/demo/Ice/nested/build.xml
+++ b/java/demo/Ice/nested/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/protobuf/build.xml b/java/demo/Ice/protobuf/build.xml
index aa336420300..3fde0caa899 100644
--- a/java/demo/Ice/protobuf/build.xml
+++ b/java/demo/Ice/protobuf/build.xml
@@ -41,13 +41,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**, ant/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/serialize/build.xml b/java/demo/Ice/serialize/build.xml
index 96b3470fb12..e43616e3199 100644
--- a/java/demo/Ice/serialize/build.xml
+++ b/java/demo/Ice/serialize/build.xml
@@ -28,15 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-	<javac srcdir="." destdir="${class.dir}" includes="Demo/**" debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}" debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}" excludes="generated/**,Serialize/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/session/build.xml b/java/demo/Ice/session/build.xml
index 989954a31ee..f5622b9fc02 100644
--- a/java/demo/Ice/session/build.xml
+++ b/java/demo/Ice/session/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/throughput/build.xml b/java/demo/Ice/throughput/build.xml
index c6f86fdf086..7d5d1f3e15e 100644
--- a/java/demo/Ice/throughput/build.xml
+++ b/java/demo/Ice/throughput/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/Ice/value/build.xml b/java/demo/Ice/value/build.xml
index 2bd6e425085..3c63201afef 100644
--- a/java/demo/Ice/value/build.xml
+++ b/java/demo/Ice/value/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/IceBox/hello/build.xml b/java/demo/IceBox/hello/build.xml
index 7473dc3f874..a5b04840141 100644
--- a/java/demo/IceBox/hello/build.xml
+++ b/java/demo/IceBox/hello/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/IceGrid/icebox/build.xml b/java/demo/IceGrid/icebox/build.xml
index b16d4e53d1e..2e132572e3c 100644
--- a/java/demo/IceGrid/icebox/build.xml
+++ b/java/demo/IceGrid/icebox/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/IceGrid/simple/build.xml b/java/demo/IceGrid/simple/build.xml
index fee773495bb..729ca925dd1 100644
--- a/java/demo/IceGrid/simple/build.xml
+++ b/java/demo/IceGrid/simple/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/IceStorm/clock/build.xml b/java/demo/IceStorm/clock/build.xml
index c2a6da4f215..4126516da2b 100644
--- a/java/demo/IceStorm/clock/build.xml
+++ b/java/demo/IceStorm/clock/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/book/freeze_filesystem/build.xml b/java/demo/book/freeze_filesystem/build.xml
index 51564430850..49aef48c5c2 100644
--- a/java/demo/book/freeze_filesystem/build.xml
+++ b/java/demo/book/freeze_filesystem/build.xml
@@ -32,13 +32,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath>
                 <path refid="ice.classpath"/>
                 <path refid="db.classpath"/>
@@ -47,7 +42,6 @@
         </javac>
     </target>
 
-
     <target name="all" depends="compile"/>
 
     <target name="clean">
diff --git a/java/demo/book/lifecycle/build.xml b/java/demo/book/lifecycle/build.xml
index d2eb8aaed7d..e6f3ba74d52 100644
--- a/java/demo/book/lifecycle/build.xml
+++ b/java/demo/book/lifecycle/build.xml
@@ -31,13 +31,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/book/printer/build.xml b/java/demo/book/printer/build.xml
index 6c301709715..3e96fe09c14 100755
--- a/java/demo/book/printer/build.xml
+++ b/java/demo/book/printer/build.xml
@@ -28,13 +28,8 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
diff --git a/java/demo/book/simple_filesystem/build.xml b/java/demo/book/simple_filesystem/build.xml
index fce7a7f8981..f0cc7854b5e 100755
--- a/java/demo/book/simple_filesystem/build.xml
+++ b/java/demo/book/simple_filesystem/build.xml
@@ -28,19 +28,13 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-        <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    debug="${debug}">
-            <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}"/>
-        </javac>
-	<javac srcdir="." destdir="${class.dir}"
-            excludes="generated/**" debug="${debug}">
+	<javac srcdir=".:${generated.dir}" destdir="${class.dir}" debug="${debug}">
+            <exclude name="${generated.dir}/**"/>
             <classpath refid="ice.classpath"/>
 	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
-
     <target name="all" depends="compile"/>
 
     <target name="clean">