using Java5 types in Ice core; general cleanup

41 files changed, 189 insertions, 187 deletions

diff --git a/java/demo/Freeze/bench/build.xml b/java/demo/Freeze/bench/build.xml
index 0803522b94f..0c27f052934 100644
--- a/java/demo/Freeze/bench/build.xml
+++ b/java/demo/Freeze/bench/build.xml
@@ -56,14 +56,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Freeze/casino/build.xml b/java/demo/Freeze/casino/build.xml
index c50df895bfa..9a9b6cf5b4c 100644
--- a/java/demo/Freeze/casino/build.xml
+++ b/java/demo/Freeze/casino/build.xml
@@ -33,14 +33,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Freeze/library/build.xml b/java/demo/Freeze/library/build.xml
index 34e9a4a090a..34f2b41d529 100644
--- a/java/demo/Freeze/library/build.xml
+++ b/java/demo/Freeze/library/build.xml
@@ -43,14 +43,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Freeze/phonebook/build.xml b/java/demo/Freeze/phonebook/build.xml
index 69c3e795633..a90696ddc5c 100644
--- a/java/demo/Freeze/phonebook/build.xml
+++ b/java/demo/Freeze/phonebook/build.xml
@@ -40,14 +40,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Freeze/transform/build.xml b/java/demo/Freeze/transform/build.xml
index d496c89a0fb..ec4a9881dfb 100644
--- a/java/demo/Freeze/transform/build.xml
+++ b/java/demo/Freeze/transform/build.xml
@@ -42,14 +42,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Glacier2/callback/Client.java b/java/demo/Glacier2/callback/Client.java
index 985e9f9c1f4..418f5f31af7 100644
--- a/java/demo/Glacier2/callback/Client.java
+++ b/java/demo/Glacier2/callback/Client.java
@@ -150,7 +150,7 @@ public class Client extends Ice.Application
                 }
                 if(line.equals("t"))
                 {
-                    java.util.Map context = new java.util.HashMap();
+                    java.util.Map<String, String> context = new java.util.HashMap<String, String>();
                     context.put("_fwd", "t");
                     if(override != null)
                     {
@@ -160,7 +160,7 @@ public class Client extends Ice.Application
                 }
                 else if(line.equals("o"))
                 {
-                    java.util.Map context = new java.util.HashMap();
+                    java.util.Map<String, String> context = new java.util.HashMap<String, String>();
                     context.put("_fwd", "o");
                     if(override != null)
                     {
@@ -170,7 +170,7 @@ public class Client extends Ice.Application
                 }
                 else if(line.equals("O"))
                 {
-                    java.util.Map context = new java.util.HashMap();
+                    java.util.Map<String, String> context = new java.util.HashMap<String, String>();
                     context.put("_fwd", "O");
                     if(override != null)
                     {
diff --git a/java/demo/Glacier2/callback/build.xml b/java/demo/Glacier2/callback/build.xml
index 48302d39bce..bd57a2ee23a 100644
--- a/java/demo/Glacier2/callback/build.xml
+++ b/java/demo/Glacier2/callback/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}" deprecation="on">
+	    debug="${debug}" deprecation="on">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}" deprecation="on">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Ice/async/HelloI.java b/java/demo/Ice/async/HelloI.java
index 8eac890b038..8104075a027 100644
--- a/java/demo/Ice/async/HelloI.java
+++ b/java/demo/Ice/async/HelloI.java
@@ -36,7 +36,7 @@ public class HelloI extends _HelloDisp
     {
         System.out.println("Shutting down...");
 
-        _workQueue.destroy();
+        _workQueue._destroy();
         current.adapter.getCommunicator().shutdown();
     }
 
diff --git a/java/demo/Ice/async/Server.java b/java/demo/Ice/async/Server.java
index bb6e446bc6d..32ec6c61c44 100644
--- a/java/demo/Ice/async/Server.java
+++ b/java/demo/Ice/async/Server.java
@@ -16,7 +16,7 @@ public class Server extends Ice.Application
         public void
         run()
         {
-            _workQueue.destroy();
+            _workQueue._destroy();
             communicator().shutdown();
         }
     }
diff --git a/java/demo/Ice/async/WorkQueue.java b/java/demo/Ice/async/WorkQueue.java
index d7336fbb778..e523330f025 100644
--- a/java/demo/Ice/async/WorkQueue.java
+++ b/java/demo/Ice/async/WorkQueue.java
@@ -68,10 +68,10 @@ public class WorkQueue extends Thread
         //
         // Throw exception for any outstanding requests.
         //
-        java.util.Iterator p = _callbacks.iterator();
+        java.util.Iterator<CallbackEntry> p = _callbacks.iterator();
         while(p.hasNext())
         {
-            CallbackEntry entry = (CallbackEntry)p.next();
+            CallbackEntry entry = p.next();
             entry.cb.ice_exception(new RequestCanceledException());
         }
     }
@@ -104,12 +104,12 @@ public class WorkQueue extends Thread
     }
 
     public synchronized void
-    destroy()
+    _destroy()                  // Thread.destroy is deprecated.
     {
         _done = true;
         notify();
     }
 
-    private java.util.LinkedList _callbacks = new java.util.LinkedList();
+    private java.util.LinkedList<CallbackEntry> _callbacks = new java.util.LinkedList<CallbackEntry>();
     private boolean _done = false;
 }
diff --git a/java/demo/Ice/async/build.xml b/java/demo/Ice/async/build.xml
index e56523afb4a..a15d757ebee 100644
--- a/java/demo/Ice/async/build.xml
+++ b/java/demo/Ice/async/build.xml
@@ -32,14 +32,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Ice/bidir/CallbackSenderI.java b/java/demo/Ice/bidir/CallbackSenderI.java
index ccce1c4fa4d..332c1c75614 100755
--- a/java/demo/Ice/bidir/CallbackSenderI.java
+++ b/java/demo/Ice/bidir/CallbackSenderI.java
@@ -32,7 +32,7 @@ class CallbackSenderI extends _CallbackSenderDisp implements java.lang.Runnable
 
         Ice.ObjectPrx base = current.con.createProxy(ident);
         CallbackReceiverPrx client = CallbackReceiverPrxHelper.uncheckedCast(base);
-        _clients.addElement(client);
+        _clients.add(client);
     }
 
     public void
@@ -41,7 +41,7 @@ class CallbackSenderI extends _CallbackSenderDisp implements java.lang.Runnable
         int num = 0;
         while(true)
         {
-            java.util.Vector clients;
+            java.util.List<CallbackReceiverPrx> clients;
             synchronized(this)
             {
                 try
@@ -51,31 +51,30 @@ class CallbackSenderI extends _CallbackSenderDisp implements java.lang.Runnable
                 catch(java.lang.InterruptedException ex)
                 {
                 }
-                
+
                 if(_destroy)
                 {
                     break;
                 }
-                
-                
-                clients = new java.util.Vector(_clients);
+
+                clients = new java.util.ArrayList<CallbackReceiverPrx>(_clients);
             }
 
             if(!clients.isEmpty())
             {
                 ++num;
 
-                java.util.Iterator p = clients.iterator();
+                java.util.Iterator<CallbackReceiverPrx> p = clients.iterator();
                 while(p.hasNext())
                 {
-                    CallbackReceiverPrx r = (CallbackReceiverPrx)p.next();
+                    CallbackReceiverPrx r = p.next();
                     try
                     {
                         r.callback(num);
                     }
                     catch(Exception ex)
                     {
-                        System.out.println("removing client `" + _communicator.identityToString(r.ice_getIdentity()) + 
+                        System.out.println("removing client `" + _communicator.identityToString(r.ice_getIdentity()) +
                                            "':");
                         ex.printStackTrace();
 
@@ -91,5 +90,5 @@ class CallbackSenderI extends _CallbackSenderDisp implements java.lang.Runnable
 
     private Ice.Communicator _communicator;
     private boolean _destroy = false;
-    private java.util.Vector _clients = new java.util.Vector();
+    private java.util.List<CallbackReceiverPrx> _clients = new java.util.ArrayList<CallbackReceiverPrx>();
 }
diff --git a/java/demo/Ice/bidir/build.xml b/java/demo/Ice/bidir/build.xml
index e32ad369242..ca217abe522 100755
--- a/java/demo/Ice/bidir/build.xml
+++ b/java/demo/Ice/bidir/build.xml
@@ -31,13 +31,13 @@
 
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
-	<javac srcdir="${generated.dir}" destdir="${class.dir}" source="${jdk.version}" debug="${debug}">
+	<javac srcdir="${generated.dir}" destdir="${class.dir}" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac> 
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}" excludes="generated/**" debug="${debug}">
+	<javac srcdir="." destdir="${class.dir}" excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Ice/callback/build.xml b/java/demo/Ice/callback/build.xml
index c78bee1420e..df254a00f18 100644
--- a/java/demo/Ice/callback/build.xml
+++ b/java/demo/Ice/callback/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Ice/hello/build.xml b/java/demo/Ice/hello/build.xml
index 751a8bb8ea4..b18621f16a4 100644
--- a/java/demo/Ice/hello/build.xml
+++ b/java/demo/Ice/hello/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Ice/invoke/Client.java b/java/demo/Ice/invoke/Client.java
index c73eac84b0f..9817c168686 100644
--- a/java/demo/Ice/invoke/Client.java
+++ b/java/demo/Ice/invoke/Client.java
@@ -123,7 +123,7 @@ public class Client extends Ice.Application
                     // Marshal the in parameter.
                     //
                     Ice.OutputStream out = Ice.Util.createOutputStream(communicator());
-                    java.util.Map dict = new java.util.HashMap();
+                    java.util.Map<String, String> dict = new java.util.HashMap<String, String>();
                     dict.put("The", "streaming");
                     dict.put("API", "works!");
                     Demo.StringDictHelper.write(out, dict);
diff --git a/java/demo/Ice/invoke/PrinterI.java b/java/demo/Ice/invoke/PrinterI.java
index 481f873a510..f7a6b02c8ae 100644
--- a/java/demo/Ice/invoke/PrinterI.java
+++ b/java/demo/Ice/invoke/PrinterI.java
@@ -45,20 +45,20 @@ public class PrinterI extends Ice.Blobject
         }
         else if(current.operation.equals("printDictionary"))
         {
-            java.util.Map dict = Demo.StringDictHelper.read(in);
+            java.util.Map<String, String> dict = Demo.StringDictHelper.read(in);
             in.destroy();
             System.out.print("Printing dictionary {");
-            java.util.Iterator i = dict.entrySet().iterator();
+            java.util.Iterator<java.util.Map.Entry<String, String> > i = dict.entrySet().iterator();
             boolean first = true;
             while(i.hasNext())
             {
-                java.util.Map.Entry e = (java.util.Map.Entry)i.next();
+                java.util.Map.Entry<String, String> e = i.next();
                 if(!first)
                 {
                     System.out.print(", ");
                 }
                 first = false;
-                System.out.print(e.getKey().toString() + "=" + e.getValue().toString());
+                System.out.print(e.getKey() + "=" + e.getValue());
             }
             System.out.println("}");
             return true;
diff --git a/java/demo/Ice/invoke/build.xml b/java/demo/Ice/invoke/build.xml
index 29ec0da3246..c42fa4c8eb7 100644
--- a/java/demo/Ice/invoke/build.xml
+++ b/java/demo/Ice/invoke/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Ice/latency/build.xml b/java/demo/Ice/latency/build.xml
index 8da020b0106..6c9e24aa9e3 100644
--- a/java/demo/Ice/latency/build.xml
+++ b/java/demo/Ice/latency/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Ice/minimal/build.xml b/java/demo/Ice/minimal/build.xml
index 07e01f9b2e2..7592eca1991 100644
--- a/java/demo/Ice/minimal/build.xml
+++ b/java/demo/Ice/minimal/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Ice/multicast/build.xml b/java/demo/Ice/multicast/build.xml
index 734a8b7653f..192dd9f5b06 100644
--- a/java/demo/Ice/multicast/build.xml
+++ b/java/demo/Ice/multicast/build.xml
@@ -30,14 +30,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Ice/nested/build.xml b/java/demo/Ice/nested/build.xml
index f826e5dda97..fd544a6579b 100644
--- a/java/demo/Ice/nested/build.xml
+++ b/java/demo/Ice/nested/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Ice/session/Client.java b/java/demo/Ice/session/Client.java
index 94abe556799..e880dec4545 100644
--- a/java/demo/Ice/session/Client.java
+++ b/java/demo/Ice/session/Client.java
@@ -139,7 +139,7 @@ public class Client extends Ice.Application
             _refresh.start();
         }
             
-        java.util.ArrayList hellos = new java.util.ArrayList();
+        java.util.ArrayList<HelloPrx> hellos = new java.util.ArrayList<HelloPrx>();
 
         menu();
 
@@ -170,7 +170,7 @@ public class Client extends Ice.Application
                     }
                     if(index < hellos.size())
                     {
-                        HelloPrx hello = (HelloPrx)hellos.get(index);
+                        HelloPrx hello = hellos.get(index);
                         hello.sayHello();
                     }
                     else
@@ -182,7 +182,7 @@ public class Client extends Ice.Application
                 else if(line.equals("c"))
                 {
                     hellos.add(_session.createHello());
-                    System.out.println("created hello object " + (hellos.size()-1));
+                    System.out.println("created hello object " + (hellos.size() - 1));
                 }
                 else if(line.equals("s"))
                 {
diff --git a/java/demo/Ice/session/ReapThread.java b/java/demo/Ice/session/ReapThread.java
index 96b8b28b8c7..88ffeeebf4f 100644
--- a/java/demo/Ice/session/ReapThread.java
+++ b/java/demo/Ice/session/ReapThread.java
@@ -38,10 +38,10 @@ class ReapThread extends Thread
             
             if(!_terminated)
             {
-                java.util.Iterator p = _sessions.iterator();
+                java.util.Iterator<SessionProxyPair> p = _sessions.iterator();
                 while(p.hasNext())
                 {
-                    SessionProxyPair s = (SessionProxyPair)p.next();
+                    SessionProxyPair s = p.next();
                     try
                     {
                         //
@@ -83,5 +83,5 @@ class ReapThread extends Thread
 
     private final long _timeout = 10 * 1000; // 10 seconds.
     private boolean _terminated = false;
-    private java.util.List _sessions = new java.util.LinkedList();
+    private java.util.List<SessionProxyPair> _sessions = new java.util.LinkedList<SessionProxyPair>();
 }
diff --git a/java/demo/Ice/session/SessionI.java b/java/demo/Ice/session/SessionI.java
index 085d0bf2479..85e9c9559d2 100644
--- a/java/demo/Ice/session/SessionI.java
+++ b/java/demo/Ice/session/SessionI.java
@@ -64,10 +64,10 @@ class SessionI extends _SessionDisp
         try
         {
             c.adapter.remove(c.id);
-            java.util.Iterator p = _objs.iterator();
+            java.util.Iterator<HelloPrx> p = _objs.iterator();
             while(p.hasNext())
             {
-                c.adapter.remove(((HelloPrx)p.next()).ice_getIdentity());
+                c.adapter.remove(p.next().ice_getIdentity());
             }
         }
         catch(Ice.ObjectAdapterDeactivatedException e)
@@ -92,5 +92,6 @@ class SessionI extends _SessionDisp
     private boolean _destroy = false; // true if destroy() was called, false otherwise.
     private long _timestamp; // The last time the session was refreshed.
     private int _nextId = 0; // The id of the next hello object. This is used for tracing purposes.
-    private java.util.List _objs = new java.util.LinkedList(); // List of per-client allocated Hello objects.
+    private java.util.List<HelloPrx> _objs =
+        new java.util.LinkedList<HelloPrx>(); // List of per-client allocated Hello objects.
 }
diff --git a/java/demo/Ice/session/build.xml b/java/demo/Ice/session/build.xml
index 8a54daf0719..b808a375af0 100644
--- a/java/demo/Ice/session/build.xml
+++ b/java/demo/Ice/session/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/Ice/throughput/build.xml b/java/demo/Ice/throughput/build.xml
index a9bf0b5c503..13597eed3c3 100644
--- a/java/demo/Ice/throughput/build.xml
+++ b/java/demo/Ice/throughput/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
     
diff --git a/java/demo/Ice/value/build.xml b/java/demo/Ice/value/build.xml
index 822267675a6..a691fff2f1d 100644
--- a/java/demo/Ice/value/build.xml
+++ b/java/demo/Ice/value/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/IceBox/hello/build.xml b/java/demo/IceBox/hello/build.xml
index ffd0bc2b35f..09bd4202e7b 100644
--- a/java/demo/IceBox/hello/build.xml
+++ b/java/demo/IceBox/hello/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/IceGrid/icebox/build.xml b/java/demo/IceGrid/icebox/build.xml
index 7f5b64909af..2152a64f35c 100644
--- a/java/demo/IceGrid/icebox/build.xml
+++ b/java/demo/IceGrid/icebox/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/IceGrid/simple/build.xml b/java/demo/IceGrid/simple/build.xml
index b74a61f4ef2..0705fc6ef48 100644
--- a/java/demo/IceGrid/simple/build.xml
+++ b/java/demo/IceGrid/simple/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/IceStorm/clock/Subscriber.java b/java/demo/IceStorm/clock/Subscriber.java
index 3d5bcf98624..047e0e16329 100644
--- a/java/demo/IceStorm/clock/Subscriber.java
+++ b/java/demo/IceStorm/clock/Subscriber.java
@@ -114,7 +114,7 @@ public class Subscriber extends Ice.Application
         //
         // Add a Servant for the Ice Object.
         //
-        java.util.Map qos = new java.util.HashMap();
+        java.util.Map<String, String> qos = new java.util.HashMap<String, String>();
         Ice.ObjectPrx subscriber = adapter.addWithUUID(new ClockI());
         //
         // Set up the proxy.
diff --git a/java/demo/IceStorm/clock/build.xml b/java/demo/IceStorm/clock/build.xml
index bb2f4d6c749..18de5a55cf9 100644
--- a/java/demo/IceStorm/clock/build.xml
+++ b/java/demo/IceStorm/clock/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/book/freeze_filesystem/build.xml b/java/demo/book/freeze_filesystem/build.xml
index d5ee4ca7b5b..b2c9993bb02 100644
--- a/java/demo/book/freeze_filesystem/build.xml
+++ b/java/demo/book/freeze_filesystem/build.xml
@@ -33,14 +33,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/book/lifecycle/FilesystemI/DirectoryI.java b/java/demo/book/lifecycle/FilesystemI/DirectoryI.java
index 99d767c800b..d3ebea1d195 100644
--- a/java/demo/book/lifecycle/FilesystemI/DirectoryI.java
+++ b/java/demo/book/lifecycle/FilesystemI/DirectoryI.java
@@ -53,13 +53,13 @@ public class DirectoryI extends _DirectoryDisp implements NodeI, _DirectoryOpera
             reap();
 
             NodeDesc[] ret = new NodeDesc[_contents.size()];
-            java.util.Iterator pos = _contents.entrySet().iterator();
+            java.util.Iterator<java.util.Map.Entry<String, NodeI> > pos = _contents.entrySet().iterator();
             for(int i = 0; i < _contents.size(); ++i)
             {
-                java.util.Map.Entry e = (java.util.Map.Entry)pos.next();
-                NodeI p = (NodeI)e.getValue();
+                java.util.Map.Entry<String, NodeI> e = pos.next();
+                NodeI p = e.getValue();
                 ret[i] = new NodeDesc();
-                ret[i].name = (String)e.getKey();
+                ret[i].name = e.getKey();
                 ret[i].type = p instanceof FileI ? NodeType.FileType : NodeType.DirType;
                 ret[i].proxy = NodePrxHelper.uncheckedCast(c.adapter.createProxy(p.id()));
             }
@@ -198,7 +198,7 @@ public class DirectoryI extends _DirectoryDisp implements NodeI, _DirectoryOpera
         _parent = parent;
         _id = new Identity();
         _destroyed = false;
-        _contents = new java.util.HashMap();
+        _contents = new java.util.HashMap<String, NodeI>();
 
         if(parent == null)
         {
@@ -225,16 +225,16 @@ public class DirectoryI extends _DirectoryDisp implements NodeI, _DirectoryOpera
     public void
     addReapEntry(String name)
     {
-        java.util.List l = (java.util.List)_reapMap.get(this);
+        java.util.List<String> l = _reapMap.get(this);
         if(l != null)
         {
             l.add(name);
         }
         else
         {
-            java.util.ArrayList v = new java.util.ArrayList();
-            v.add(name);
-            _reapMap.put(this, v);
+            l = new java.util.ArrayList<String>();
+            l.add(name);
+            _reapMap.put(this, l);
         }
     }
 
@@ -243,13 +243,14 @@ public class DirectoryI extends _DirectoryDisp implements NodeI, _DirectoryOpera
     private static void
     reap()
     {
-        java.util.Iterator i = _reapMap.entrySet().iterator();
+        java.util.Iterator<java.util.Map.Entry<DirectoryI, java.util.List<String> > > i =
+            _reapMap.entrySet().iterator();
         while(i.hasNext())
         {
-            java.util.Map.Entry e = (java.util.Map.Entry)i.next();
-            DirectoryI dir = (DirectoryI)e.getKey();
-            java.util.List v = (java.util.List)e.getValue();
-            java.util.Iterator j = v.iterator();
+            java.util.Map.Entry<DirectoryI, java.util.List<String> > e = i.next();
+            DirectoryI dir = e.getKey();
+            java.util.List<String> l = e.getValue();
+            java.util.Iterator<String> j = l.iterator();
             while(j.hasNext())
             {
                 dir._contents.remove(j.next());
@@ -264,7 +265,8 @@ public class DirectoryI extends _DirectoryDisp implements NodeI, _DirectoryOpera
     private DirectoryI _parent; // Immutable
     private Identity _id;       // Immutable
     private boolean _destroyed;
-    private java.util.Map _contents;
+    private java.util.Map<String, NodeI> _contents;
 
-    private static java.util.Map _reapMap = new java.util.HashMap();
+    private static java.util.Map<DirectoryI, java.util.List<String> > _reapMap =
+        new java.util.HashMap<DirectoryI, java.util.List<String> >();
 }
diff --git a/java/demo/book/lifecycle/Grammar.java b/java/demo/book/lifecycle/Grammar.java
index 1bef5606464..92da79a56d0 100644
--- a/java/demo/book/lifecycle/Grammar.java
+++ b/java/demo/book/lifecycle/Grammar.java
@@ -69,7 +69,7 @@ class Grammar
                 }
                 else if(_token.type == Token.TOK_CREATE_FILE)
                 {
-                    java.util.List s = strings();
+                    java.util.List<String> s = strings();
                     if(_token.type != Token.TOK_SEMI)
                     {
                         throw new ParseError("Expected ';'");
@@ -82,7 +82,7 @@ class Grammar
                 }
                 else if(_token.type == Token.TOK_CREATE_DIR)
                 {
-                    java.util.List s = strings();
+                    java.util.List<String> s = strings();
                     if(_token.type != Token.TOK_SEMI)
                     {
                         throw new ParseError("Expected ';'");
@@ -104,7 +104,7 @@ class Grammar
                 }
                 else if(_token.type == Token.TOK_CD)
                 {
-                    java.util.List s = strings();
+                    java.util.List<String> s = strings();
                     if(_token.type != Token.TOK_SEMI)
                     {
                         throw new ParseError("Expected ';'");
@@ -124,7 +124,7 @@ class Grammar
                 }
                 else if(_token.type == Token.TOK_CAT)
                 {
-                    java.util.List s = strings();
+                    java.util.List<String> s = strings();
                     if(_token.type != Token.TOK_SEMI)
                     {
                         throw new ParseError("Expected ';'");
@@ -137,7 +137,7 @@ class Grammar
                 }
                 else if(_token.type == Token.TOK_WRITE)
                 {
-                    java.util.LinkedList s = strings();
+                    java.util.LinkedList<String> s = strings();
                     if(_token.type != Token.TOK_SEMI)
                     {
                         throw new ParseError("Expected ';'");
@@ -150,7 +150,7 @@ class Grammar
                 }
                 else if(_token.type == Token.TOK_RM)
                 {
-                    java.util.List s = strings();
+                    java.util.List<String> s = strings();
                     if(_token.type != Token.TOK_SEMI)
                     {
                         throw new ParseError("Expected ';'");
@@ -173,10 +173,10 @@ class Grammar
         }
     }
 
-    private java.util.LinkedList
+    private java.util.LinkedList<String>
     strings()
     {
-        java.util.LinkedList l = new java.util.LinkedList();
+        java.util.LinkedList<String> l = new java.util.LinkedList<String>();
         while(true)
         {
             _token = _scanner.nextToken();
diff --git a/java/demo/book/lifecycle/Parser.java b/java/demo/book/lifecycle/Parser.java
index 402ddfd51d6..94e4af53654 100644
--- a/java/demo/book/lifecycle/Parser.java
+++ b/java/demo/book/lifecycle/Parser.java
@@ -13,7 +13,7 @@ class Parser
 {
     Parser(DirectoryPrx root)
     {
-        _dirs = new java.util.LinkedList();
+        _dirs = new java.util.LinkedList<DirectoryPrx>();
         _dirs.addFirst(root);
     }
 
@@ -39,7 +39,7 @@ class Parser
     {
         try
         {
-            list((DirectoryPrx)_dirs.get(0), recursive, 0);
+            list(_dirs.get(0), recursive, 0);
         }
         catch(Ice.LocalException ex)
         {
@@ -79,14 +79,14 @@ class Parser
     }
 
     void
-    createFile(java.util.List names)
+    createFile(java.util.List<String> names)
     {
-        DirectoryPrx dir = (DirectoryPrx)_dirs.getFirst();
+        DirectoryPrx dir = _dirs.getFirst();
 
-        java.util.Iterator i = names.iterator();
+        java.util.Iterator<String> i = names.iterator();
         while(i.hasNext())
         {
-            String name = (String)i.next();
+            String name = i.next();
             if(name.equals(".."))
             {
                 System.out.println("Cannot create a file named `..'");
@@ -105,14 +105,14 @@ class Parser
     }
 
     void
-    createDir(java.util.List names)
+    createDir(java.util.List<String> names)
     {
-        DirectoryPrx dir = (DirectoryPrx)_dirs.getFirst();
+        DirectoryPrx dir = _dirs.getFirst();
 
-        java.util.Iterator i = names.iterator();
+        java.util.Iterator<String> i = names.iterator();
         while(i.hasNext())
         {
-            String name = (String)i.next();
+            String name = i.next();
             if(name.equals(".."))
             {
                 System.out.println("Cannot create a directory named `..'");
@@ -139,11 +139,11 @@ class Parser
         }
         else
         {
-            java.util.ListIterator i = _dirs.listIterator(_dirs.size());
+            java.util.ListIterator<DirectoryPrx> i = _dirs.listIterator(_dirs.size());
             i.previous();
             while(i.hasPrevious())
             {
-                System.out.print("/" + (String)(((DirectoryPrx)i.previous()).name()));
+                System.out.print("/" + i.previous().name());
             }
         }
         System.out.println();
@@ -170,7 +170,7 @@ class Parser
             return;
         }
 
-        DirectoryPrx dir = (DirectoryPrx)_dirs.getFirst();
+        DirectoryPrx dir = _dirs.getFirst();
         NodeDesc d;
         try
         {
@@ -192,7 +192,7 @@ class Parser
     void
     cat(String name)
     {
-        DirectoryPrx dir = (DirectoryPrx)_dirs.getFirst();
+        DirectoryPrx dir = _dirs.getFirst();
         NodeDesc d;
         try
         {
@@ -217,10 +217,10 @@ class Parser
     }
 
     void
-    write(java.util.LinkedList args)
+    write(java.util.LinkedList<String> args)
     {
-        DirectoryPrx dir = (DirectoryPrx)_dirs.getFirst();
-        String name = (String)args.getFirst();
+        DirectoryPrx dir = _dirs.getFirst();
+        String name = args.getFirst();
         args.removeFirst();
         NodeDesc d;
         try
@@ -240,10 +240,10 @@ class Parser
         FilePrx f = FilePrxHelper.uncheckedCast(d.proxy);
 
         String[] l = new String[args.size()];
-        java.util.Iterator i = args.iterator();
+        java.util.Iterator<String> i = args.iterator();
         for(int j = 0; j < args.size(); ++j)
         {
-            l[j] = (String)i.next();
+            l[j] = i.next();
         }
         try
         {
@@ -256,14 +256,14 @@ class Parser
     }
 
     void
-    destroy(java.util.List names)
+    destroy(java.util.List<String> names)
     {
-        DirectoryPrx dir = (DirectoryPrx)_dirs.getFirst();
+        DirectoryPrx dir = _dirs.getFirst();
 
-        java.util.Iterator i = names.iterator();
+        java.util.Iterator<String> i = names.iterator();
         while(i.hasNext())
         {
-            String name = (String)i.next();
+            String name = i.next();
             if(name.equals("*"))
             {
                 NodeDesc[] nodes = dir.list();
@@ -355,7 +355,7 @@ class Parser
         return 0;
     }
 
-    private java.util.LinkedList _dirs;
+    private java.util.LinkedList<DirectoryPrx> _dirs;
 
     private java.io.BufferedReader _in;
 }
diff --git a/java/demo/book/lifecycle/build.xml b/java/demo/book/lifecycle/build.xml
index b5bddaaebd5..8a6f3b863e3 100644
--- a/java/demo/book/lifecycle/build.xml
+++ b/java/demo/book/lifecycle/build.xml
@@ -32,14 +32,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/book/printer/build.xml b/java/demo/book/printer/build.xml
index dd68451208b..bae3f66e824 100755
--- a/java/demo/book/printer/build.xml
+++ b/java/demo/book/printer/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>
 
diff --git a/java/demo/book/simple_filesystem/Filesystem/DirectoryI.java b/java/demo/book/simple_filesystem/Filesystem/DirectoryI.java
index e8db9d699de..b66c72f1d93 100755
--- a/java/demo/book/simple_filesystem/Filesystem/DirectoryI.java
+++ b/java/demo/book/simple_filesystem/Filesystem/DirectoryI.java
@@ -65,5 +65,5 @@ public final class DirectoryI extends _DirectoryDisp
     public static Ice.ObjectAdapter _adapter;
     private String _name;
     private DirectoryI _parent;
-    private java.util.ArrayList _contents = new java.util.ArrayList();
+    private java.util.List<NodePrx> _contents = new java.util.ArrayList<NodePrx>();
 }
diff --git a/java/demo/book/simple_filesystem/build.xml b/java/demo/book/simple_filesystem/build.xml
index 7005388e4ea..0aeab2be8ea 100755
--- a/java/demo/book/simple_filesystem/build.xml
+++ b/java/demo/book/simple_filesystem/build.xml
@@ -29,14 +29,14 @@
     <target name="compile" depends="generate">
         <mkdir dir="${class.dir}"/>
         <javac srcdir="${generated.dir}" destdir="${class.dir}"
-	    source="${jdk.version}" debug="${debug}">
+	    debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
-	<javac srcdir="." destdir="${class.dir}" source="${jdk.version}"
+	<javac srcdir="." destdir="${class.dir}"
             excludes="generated/**" debug="${debug}">
             <classpath refid="ice.classpath"/>
-	    <compilerarg value="${javac.lint}" compiler="${javac.lint.compiler}"/>
+	    <compilerarg value="${javac.lint}"/>
         </javac>
     </target>