--- build.xml.orig	2004-12-25 15:05:17.518651328 +0100
+++ build.xml	2004-12-25 15:10:40.325577216 +0100
@@ -83,6 +83,14 @@
   &taskdefs;
   &targets;
 
+  
+  <path id="axis-classpath">
+        <pathelement path="${classpath}" />
+        <fileset dir="lib">
+                <include name="**/*.jar" />
+        </fileset>
+  </path>  
+  
   <!-- =================================================================== -->
   <!-- Compiles the source directory                                       -->
   <!-- =================================================================== -->
@@ -91,10 +99,7 @@
     <depend srcdir="${src.dir}" destdir="${build.dest}"
             cache="${build.dir}/dependencycache" closure="no">
     </depend>  
-    <javac srcdir="${src.dir}" destdir="${build.dest}"  nowarn="${nowarn}" debug="${debug}"
-      deprecation="${deprecation}" 
-      source="${source}"
-      classpathref="classpath">
+    <javac srcdir="${src.dir}" destdir="${build.dest}"  nowarn="${nowarn}" debug="${debug}" deprecation="${deprecation}" source="${source}" classpathref="axis-classpath">
       <exclude name="**/old/**/*" />
       <exclude name="**/bak/**"/>
       <exclude name="**/org/apache/axis/components/net/JDK14*.java" unless="jdk14.jsse.present"/>
@@ -223,12 +228,6 @@
         </section>
       </manifest>
     </jar>
-    <copy file="${wsdl4j.jar}" toDir="${build.lib}"/>
-    <copy file="${commons-logging.jar}" toDir="${build.lib}"/>
-    <copy file="${commons-discovery.jar}" toDir="${build.lib}"/>
-    <copy file="${log4j-core.jar}" toDir="${build.lib}"/>
-    <copy file="${src.dir}/log4j.properties"
-          toDir="${build.lib}"/>
 
      <!--  Build the new org.apache.axis.tools.ant stuff -->
      <mkdir dir="${axis.home}/tools/lib" />
@@ -272,7 +271,7 @@
 
   <path id="test-classpath">
     <pathelement location="${build.dest}" />
-    <path refid="classpath"/>
+    <path refid="axis-classpath"/>
   </path>
 
   <target name="buildTest" depends="compile" if="junit.present" unless="tests.built">
@@ -312,7 +311,7 @@
       debug="${debug}"
       source="${source}"
       deprecation="${deprecation}"
-      classpathref="classpath">
+      classpathref="axis-classpath">
       <include name="*.java"/>
     </javac>
   </target>
@@ -362,11 +361,12 @@
     <mkdir dir="${build.javadocs}"/>
     <javadoc packagenames="${packages}"
              sourcepath="${src.dir}"
-             classpathref="classpath"
+             classpathref="axis-classpath"
              destdir="${build.javadocs}"
              author="true"
              version="true"
-             use="true"
+	     use="true"
+	     source="${source}"
              windowtitle="${Name} API"
              doctitle="${Name}"
              bottom="Copyright &#169; ${year} Apache Web Services Project. All Rights Reserved."