Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/build.xml,v
retrieving revision 1.118
diff -u -r1.118 build.xml
--- build.xml	28 Feb 2002 15:26:51 -0000	1.118
+++ build.xml	6 Mar 2002 14:30:51 -0000
@@ -103,6 +103,25 @@
 
   <property name="test.functional.usefile" value="true"/>
 
+  <taskdef name="ajc"
+      classname="org.aspectj.tools.ant.taskdefs.Ajc">
+      <classpath> 
+          <pathelement path="${aspectjtools.jar}"/> 
+          <pathelement path="${aspectj-ant.jar}"/> 
+          <!-- tools.jar only required if -usejavac -->
+          <pathelement path="${jdktools.jar}"/> 
+      </classpath>
+  </taskdef>
+
+  <taskdef name="ajdoc"
+      classname="org.aspectj.tools.ant.taskdefs.Ajdoc">
+      <classpath> 
+          <pathelement path="${aspectjtools.jar}"/> 
+          <pathelement path="${aspectj-ant.jar}"/> 
+          <pathelement path="${jdktools.jar}"/> 
+      </classpath>
+  </taskdef>
+
   <!-- =================================================================== -->
   <!-- Determine what dependencies are present                             -->
   <!-- =================================================================== -->
@@ -219,7 +238,7 @@
   <!-- Compiles the source directory                                       -->
   <!-- =================================================================== -->
   <target name="compile" depends="setenv">
-    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}"
+    <ajc srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}"
       deprecation="${deprecation}"
       classpathref="classpath">
       <exclude name="**/old/**/*" />
@@ -245,7 +264,7 @@
       <exclude name="**/javax/xml/soap/*.java" unless="attachments.present"/>
       <exclude name="**/javax/xml/rpc/handler/soap/*.java" unless="attachments.present"/>
       <exclude name="**/*TestSuite.java" unless="junit.present"/>
-    </javac>
+    </ajc>
     <copy file="${src.dir}/org/apache/axis/server/server-config.wsdd"
           toDir="${build.dest}/org/apache/axis/server"/>
     <copy file="${src.dir}/org/apache/axis/client/client-config.wsdd"
@@ -287,7 +306,7 @@
   <!-- Compiles the samples                                                -->
   <!-- =================================================================== -->
   <target name="samples" depends="compile">
-    <javac srcdir="." destdir="${build.dest}"
+    <ajc srcdir="." destdir="${build.dest}"
            debug="${debug}">
       <classpath>
         <pathelement location="${build.lib}/${name}.jar"/>
@@ -303,7 +322,7 @@
       <exclude name="samples/userguide/example6/*TestCase.java" />
       <exclude name="samples/attachments/**/*.java" unless="attachments.present"/>
       <exclude name="samples/security/**/*.java" unless="security.present"/>
-    </javac>
+    </ajc>
   </target>
 
   <!-- =================================================================== -->
@@ -318,7 +337,7 @@
   <target name="buildTest" if="junit.present" depends="compile,samples">
     <echo message="junit package found ..."/>
     <!-- Start by building the testcases -->
-    <javac srcdir="." destdir="${build.dest}"
+    <ajc srcdir="." destdir="${build.dest}"
            debug="${debug}">
       <classpath>
         <pathelement location="${build.lib}/${name}.jar"/>
@@ -331,7 +350,7 @@
       <exclude name="test/wsdl/interop3/**/*.java" />
       <exclude name="test/wsdl/Wsdl2javaTestSuite.java" unless="servlet.present"/>
       <exclude name="test/md5attach/*.java" unless="attachments.present"/>
-    </javac>
+    </ajc>
     <copy file="test/wsdd/testStructure1.wsdd" toDir="${build.dest}/test/wsdd"/>
   </target>