eliminating need for .antrc

15 files changed, 53 insertions, 56 deletions

diff --git a/java/README.ANT b/java/README.ANT
index 5cd28dabd8e..a005b96d6fc 100644
--- a/java/README.ANT
+++ b/java/README.ANT
@@ -3,22 +3,6 @@ downloaded here:
 
 http://jakarta.apache.org/ant/index.html
 
-After installing ant, you'll need to install an Ice-specific
-extension, which is located in the ant/ subdirectory. One
-way to do this is to add the ant/ subdirectory to your CLASSPATH.
-Another way is to create a .antrc file (Unix) or antrc_pre.bat file
-(Windows) in your home directory, which sets the CLASSPATH only for
-the duration of the ant run.
-
-For example, if the full path of the ant/ subdirectory is
-/home/smith/cvs/icej/ant, then the .antrc file would contain
-
-CLASSPATH=/home/smith/cvs/icej/ant:$CLASSPATH
-
-On Windows, the antrc_pre.bat file would contain
-
-set CLASSPATH=C:/smith/cvs/icej/ant;%CLASSPATH%
-
 To build Ice for Java, run 'ant' without any arguments. To run
 the equivalent of 'make clean', run 'ant clean'. The build system
 expects the slice2java executable to be in your PATH.
diff --git a/java/build.xml b/java/build.xml
index 403140324b8..de6e058024f 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -1,7 +1,7 @@
 <project name="main" default="all" basedir=".">
 
     <!-- install slice2java task -->
-    <taskdef name="slice2java" classname="Slice2JavaTask" />
+    <taskdef name="slice2java" classpath="ant" classname="Slice2JavaTask" />
 
     <!-- set global properties for this build -->
     <property name="slice.dir" value="../ice/slice"/>
diff --git a/java/demo/Ice/callback/build.xml b/java/demo/Ice/callback/build.xml
index 0bc232a114f..51693d93d42 100644
--- a/java/demo/Ice/callback/build.xml
+++ b/java/demo/Ice/callback/build.xml
@@ -1,8 +1,5 @@
 <project name="demo_Ice_callback" default="all" basedir=".">
 
-    <!-- install slice2java task -->
-    <taskdef name="slice2java" classname="Slice2JavaTask" />
-
     <!-- set global properties for this build -->
     <property name="top.dir" value="../../.."/>
     <property name="lib.dir" value="${top.dir}/lib"/>
@@ -10,6 +7,10 @@
     <property name="generated.dir" value="generated"/>
     <property name="tags.dir" value="${generated.dir}/.tags"/>
 
+    <!-- install slice2java task -->
+    <taskdef name="slice2java" classpath="${top.dir}/ant"
+        classname="Slice2JavaTask" />
+
     <target name="init">
         <!-- Create the time stamp -->
         <tstamp/>
diff --git a/java/demo/Ice/hello/build.xml b/java/demo/Ice/hello/build.xml
index 72f4b2fbcda..1625b64986e 100644
--- a/java/demo/Ice/hello/build.xml
+++ b/java/demo/Ice/hello/build.xml
@@ -1,8 +1,5 @@
 <project name="demo_Ice_hello" default="all" basedir=".">
 
-    <!-- install slice2java task -->
-    <taskdef name="slice2java" classname="Slice2JavaTask" />
-
     <!-- set global properties for this build -->
     <property name="top.dir" value="../../.."/>
     <property name="lib.dir" value="${top.dir}/lib"/>
@@ -10,6 +7,10 @@
     <property name="generated.dir" value="generated"/>
     <property name="tags.dir" value="${generated.dir}/.tags"/>
 
+    <!-- install slice2java task -->
+    <taskdef name="slice2java" classpath="${top.dir}/ant"
+        classname="Slice2JavaTask" />
+
     <target name="init">
         <!-- Create the time stamp -->
         <tstamp/>
diff --git a/java/demo/Ice/latency/build.xml b/java/demo/Ice/latency/build.xml
index dd47ea94fce..8d1cfd92b7e 100644
--- a/java/demo/Ice/latency/build.xml
+++ b/java/demo/Ice/latency/build.xml
@@ -1,8 +1,5 @@
 <project name="demo_Ice_latency" default="all" basedir=".">
 
-    <!-- install slice2java task -->
-    <taskdef name="slice2java" classname="Slice2JavaTask" />
-
     <!-- set global properties for this build -->
     <property name="top.dir" value="../../.."/>
     <property name="lib.dir" value="${top.dir}/lib"/>
@@ -10,6 +7,10 @@
     <property name="generated.dir" value="generated"/>
     <property name="tags.dir" value="${generated.dir}/.tags"/>
 
+    <!-- install slice2java task -->
+    <taskdef name="slice2java" classpath="${top.dir}/ant"
+        classname="Slice2JavaTask" />
+
     <target name="init">
         <!-- Create the time stamp -->
         <tstamp/>
diff --git a/java/demo/Ice/nested/build.xml b/java/demo/Ice/nested/build.xml
index 43e87d3ed63..2eae05b507f 100644
--- a/java/demo/Ice/nested/build.xml
+++ b/java/demo/Ice/nested/build.xml
@@ -1,8 +1,5 @@
 <project name="demo_Ice_value" default="all" basedir=".">
 
-    <!-- install slice2java task -->
-    <taskdef name="slice2java" classname="Slice2JavaTask" />
-
     <!-- set global properties for this build -->
     <property name="top.dir" value="../../.."/>
     <property name="lib.dir" value="${top.dir}/lib"/>
@@ -10,6 +7,10 @@
     <property name="generated.dir" value="generated"/>
     <property name="tags.dir" value="${generated.dir}/.tags"/>
 
+    <!-- install slice2java task -->
+    <taskdef name="slice2java" classpath="${top.dir}/ant"
+        classname="Slice2JavaTask" />
+
     <target name="init">
         <!-- Create the time stamp -->
         <tstamp/>
diff --git a/java/demo/Ice/value/build.xml b/java/demo/Ice/value/build.xml
index 0126990d335..42ff134e903 100644
--- a/java/demo/Ice/value/build.xml
+++ b/java/demo/Ice/value/build.xml
@@ -1,8 +1,5 @@
 <project name="demo_Ice_value" default="all" basedir=".">
 
-    <!-- install slice2java task -->
-    <taskdef name="slice2java" classname="Slice2JavaTask" />
-
     <!-- set global properties for this build -->
     <property name="top.dir" value="../../.."/>
     <property name="lib.dir" value="${top.dir}/lib"/>
@@ -10,6 +7,10 @@
     <property name="generated.dir" value="generated"/>
     <property name="tags.dir" value="${generated.dir}/.tags"/>
 
+    <!-- install slice2java task -->
+    <taskdef name="slice2java" classpath="${top.dir}/ant"
+        classname="Slice2JavaTask" />
+
     <target name="init">
         <!-- Create the time stamp -->
         <tstamp/>
diff --git a/java/test/Ice/exceptions/build.xml b/java/test/Ice/exceptions/build.xml
index d2fb661c8ec..73bda575486 100644
--- a/java/test/Ice/exceptions/build.xml
+++ b/java/test/Ice/exceptions/build.xml
@@ -1,8 +1,5 @@
 <project name="test_Ice_exceptions" default="all" basedir=".">
 
-    <!-- install slice2java task -->
-    <taskdef name="slice2java" classname="Slice2JavaTask" />
-
     <!-- set global properties for this build -->
     <property name="top.dir" value="../../.."/>
     <property name="lib.dir" value="${top.dir}/lib"/>
@@ -10,6 +7,10 @@
     <property name="generated.dir" value="generated"/>
     <property name="tags.dir" value="${generated.dir}/.tags"/>
 
+    <!-- install slice2java task -->
+    <taskdef name="slice2java" classpath="${top.dir}/ant"
+        classname="Slice2JavaTask" />
+
     <target name="init">
         <!-- Create the time stamp -->
         <tstamp/>
diff --git a/java/test/Ice/facets/build.xml b/java/test/Ice/facets/build.xml
index 50c7b53d846..e31de041970 100644
--- a/java/test/Ice/facets/build.xml
+++ b/java/test/Ice/facets/build.xml
@@ -1,8 +1,5 @@
 <project name="test_Ice_facets" default="all" basedir=".">
 
-    <!-- install slice2java task -->
-    <taskdef name="slice2java" classname="Slice2JavaTask" />
-
     <!-- set global properties for this build -->
     <property name="top.dir" value="../../.."/>
     <property name="lib.dir" value="${top.dir}/lib"/>
@@ -10,6 +7,10 @@
     <property name="generated.dir" value="generated"/>
     <property name="tags.dir" value="${generated.dir}/.tags"/>
 
+    <!-- install slice2java task -->
+    <taskdef name="slice2java" classpath="${top.dir}/ant"
+        classname="Slice2JavaTask" />
+
     <target name="init">
         <!-- Create the time stamp -->
         <tstamp/>
diff --git a/java/test/Ice/faultTolerance/build.xml b/java/test/Ice/faultTolerance/build.xml
index 37e97a3760f..38c72058ae0 100644
--- a/java/test/Ice/faultTolerance/build.xml
+++ b/java/test/Ice/faultTolerance/build.xml
@@ -1,8 +1,5 @@
 <project name="test_Ice_faultTolerance" default="all" basedir=".">
 
-    <!-- install slice2java task -->
-    <taskdef name="slice2java" classname="Slice2JavaTask" />
-
     <!-- set global properties for this build -->
     <property name="top.dir" value="../../.."/>
     <property name="lib.dir" value="${top.dir}/lib"/>
@@ -10,6 +7,10 @@
     <property name="generated.dir" value="generated"/>
     <property name="tags.dir" value="${generated.dir}/.tags"/>
 
+    <!-- install slice2java task -->
+    <taskdef name="slice2java" classpath="${top.dir}/ant"
+        classname="Slice2JavaTask" />
+
     <target name="init">
         <!-- Create the time stamp -->
         <tstamp/>
diff --git a/java/test/Ice/inheritance/build.xml b/java/test/Ice/inheritance/build.xml
index 8986b353e0d..ec479c0e7c7 100644
--- a/java/test/Ice/inheritance/build.xml
+++ b/java/test/Ice/inheritance/build.xml
@@ -1,8 +1,5 @@
 <project name="test_Ice_inheritance" default="all" basedir=".">
 
-    <!-- install slice2java task -->
-    <taskdef name="slice2java" classname="Slice2JavaTask" />
-
     <!-- set global properties for this build -->
     <property name="top.dir" value="../../.."/>
     <property name="lib.dir" value="${top.dir}/lib"/>
@@ -10,6 +7,10 @@
     <property name="generated.dir" value="generated"/>
     <property name="tags.dir" value="${generated.dir}/.tags"/>
 
+    <!-- install slice2java task -->
+    <taskdef name="slice2java" classpath="${top.dir}/ant"
+        classname="Slice2JavaTask" />
+
     <target name="init">
         <!-- Create the time stamp -->
         <tstamp/>
diff --git a/java/test/Ice/locationForward/build.xml b/java/test/Ice/locationForward/build.xml
index b3e1f883943..65774c8644a 100644
--- a/java/test/Ice/locationForward/build.xml
+++ b/java/test/Ice/locationForward/build.xml
@@ -1,8 +1,5 @@
 <project name="test_Ice_locationForward" default="all" basedir=".">
 
-    <!-- install slice2java task -->
-    <taskdef name="slice2java" classname="Slice2JavaTask" />
-
     <!-- set global properties for this build -->
     <property name="top.dir" value="../../.."/>
     <property name="lib.dir" value="${top.dir}/lib"/>
@@ -10,6 +7,10 @@
     <property name="generated.dir" value="generated"/>
     <property name="tags.dir" value="${generated.dir}/.tags"/>
 
+    <!-- install slice2java task -->
+    <taskdef name="slice2java" classpath="${top.dir}/ant"
+        classname="Slice2JavaTask" />
+
     <target name="init">
         <!-- Create the time stamp -->
         <tstamp/>
diff --git a/java/test/Ice/objects/build.xml b/java/test/Ice/objects/build.xml
index 8ac5e070dc3..5b0bc0816eb 100644
--- a/java/test/Ice/objects/build.xml
+++ b/java/test/Ice/objects/build.xml
@@ -1,8 +1,5 @@
 <project name="test_Ice_objects" default="all" basedir=".">
 
-    <!-- install slice2java task -->
-    <taskdef name="slice2java" classname="Slice2JavaTask" />
-
     <!-- set global properties for this build -->
     <property name="top.dir" value="../../.."/>
     <property name="lib.dir" value="${top.dir}/lib"/>
@@ -10,6 +7,10 @@
     <property name="generated.dir" value="generated"/>
     <property name="tags.dir" value="${generated.dir}/.tags"/>
 
+    <!-- install slice2java task -->
+    <taskdef name="slice2java" classpath="${top.dir}/ant"
+        classname="Slice2JavaTask" />
+
     <target name="init">
         <!-- Create the time stamp -->
         <tstamp/>
diff --git a/java/test/Ice/operations/build.xml b/java/test/Ice/operations/build.xml
index 0690eefe07f..8551a681dc7 100644
--- a/java/test/Ice/operations/build.xml
+++ b/java/test/Ice/operations/build.xml
@@ -1,8 +1,5 @@
 <project name="test_Ice_operations" default="all" basedir=".">
 
-    <!-- install slice2java task -->
-    <taskdef name="slice2java" classname="Slice2JavaTask" />
-
     <!-- set global properties for this build -->
     <property name="top.dir" value="../../.."/>
     <property name="lib.dir" value="${top.dir}/lib"/>
@@ -10,6 +7,10 @@
     <property name="generated.dir" value="generated"/>
     <property name="tags.dir" value="${generated.dir}/.tags"/>
 
+    <!-- install slice2java task -->
+    <taskdef name="slice2java" classpath="${top.dir}/ant"
+        classname="Slice2JavaTask" />
+
     <target name="init">
         <!-- Create the time stamp -->
         <tstamp/>
diff --git a/java/test/IceXML/encoding/build.xml b/java/test/IceXML/encoding/build.xml
index 8295fe3c1b5..d94ca7f409e 100644
--- a/java/test/IceXML/encoding/build.xml
+++ b/java/test/IceXML/encoding/build.xml
@@ -1,8 +1,5 @@
 <project name="test_IceXML_encoding" default="all" basedir=".">
 
-    <!-- install slice2java task -->
-    <taskdef name="slice2java" classname="Slice2JavaTask" />
-
     <!-- set global properties for this build -->
     <property name="top.dir" value="../../.."/>
     <property name="lib.dir" value="${top.dir}/lib"/>
@@ -10,6 +7,10 @@
     <property name="generated.dir" value="generated"/>
     <property name="tags.dir" value="${generated.dir}/.tags"/>
 
+    <!-- install slice2java task -->
+    <taskdef name="slice2java" classpath="${top.dir}/ant"
+        classname="Slice2JavaTask" />
+
     <target name="init">
         <!-- Create the time stamp -->
         <tstamp/>