Index: build.xml
===================================================================
RCS file: /home/cvspublic/xml-axis/java/build.xml,v
retrieving revision 1.132
diff -u -r1.132 build.xml
--- build.xml	2 May 2002 21:03:13 -0000	1.132
+++ build.xml	10 May 2002 23:28:57 -0000
@@ -1,7 +1,10 @@
 <?xml version="1.0"?>
 
-<!-- ===================================================================
 
+
+<project default="compile" basedir=".">
+<!-- =================================================================== -->
+<description>
    Build file for Axis
 
 Notes:
@@ -22,17 +25,17 @@
 Build Instructions:
    To build, run
 
-     java org.apache.tools.ant.Main <target>
+     ant "target"
 
    on the directory where this file is located with the target you want.
 
 Most useful targets:
 
- - compile  -> creates the "axis.jar" package in "./build/lib"
- - javadocs -> creates the javadocs in "./build/javadocs"
- - dist     -> creates the complete binary distribution
- - srcdist  -> creates the complete src distribution
- - functional-tests -> attempts to build Ant task and then run client-server functional test
+ - compile  : creates the "axis.jar" package in "./build/lib"
+ - javadocs : creates the javadocs in "./build/javadocs"
+ - dist     : creates the complete binary distribution
+ - srcdist  : creates the complete src distribution
+ - functional-tests : attempts to build Ant task and then run client-server functional test
 
 Custom post-compilation work:
 
@@ -43,16 +46,14 @@
    updating the jar file in a running server, for instance.
 
 Authors:
-  Sam Ruby <rubys@us.ibm.com>
-  Matthew J. Duftler <duftler@us.ibm.com>
-  Glen Daniels <gdaniels@macromedia.com>
+  Sam Ruby  rubys@us.ibm.com
+  Matthew J. Duftler duftler@us.ibm.com
+  Glen Daniels gdaniels@macromedia.com
 
 Copyright:
-  Copyright (c) 2001 Apache Software Foundation.
-
-==================================================================== -->
-
-<project default="compile" basedir=".">
+  Copyright (c) 2001-2002 Apache Software Foundation.
+</description>
+<!-- ==================================================================== -->
 
   <!-- Give user a chance to override without editing this file
        (and without typing -D each time it compiles it) -->
@@ -63,7 +64,7 @@
 
   <property name="name" value="axis"/>
   <property name="Name" value="Axis"/>
-  <property name="year" value="2001"/>
+  <property name="year" value="2002"/>
 
   <property name="jaxrpc" value="jaxrpc"/>
 
@@ -72,38 +73,41 @@
 
   <property name="deprecation" value="true"/>
 
-  <property name="src.dir" value="./src"/>
-  <property name="docs.dir" value="./docs"/>
-  <property name="samples.dir" value="./samples"/>
-  <property name="test.dir" value="./test"/>
-  <property name="lib.dir" value="./lib"/>
-
-  <property name="wsdl4j.jar" value="lib/wsdl4j.jar"/>
-  <property name="commons-logging.jar" value="lib/commons-logging.jar"/>
-  <property name="log4j-core.jar" value="lib/log4j-core.jar"/>
-  <property name="tt-bytecode.jar" value="lib/tt-bytecode.jar"/>
+  <property name="src.dir" location="./src"/>
+  <property name="docs.dir" location="./docs"/>
+  <property name="samples.dir" location="./samples"/>
+  <property name="test.dir" location="./test"/>
+  <property name="lib.dir" location="./lib"/>
+
+  <property name="wsdl4j.jar" location="lib/wsdl4j.jar"/>
+  <property name="commons-logging.jar" location="lib/commons-logging.jar"/>
+  <property name="log4j-core.jar" location="lib/log4j-core.jar"/>
+  <property name="tt-bytecode.jar" location="lib/tt-bytecode.jar"/>
 
-  <property name="regexp.jar" value="test/lib/jakarta-oro-2.0.5.jar"/>
+  <property name="regexp.jar" location="test/lib/jakarta-oro-2.0.5.jar"/>
 
-  <property name="junit.jar" value="lib/junit.jar"/>
+  <property name="junit.jar" location="lib/junit.jar"/>
 
   <property name="packages" value="org.*,javax.*"/>
 
   <property name="build.file" value="build.xml"/>
 
-  <property name="build.dir" value="build"/>
-  <property name="build.dest" value="build/classes"/>
-  <property name="build.lib" value="build/lib"/>
-  <property name="build.samples" value="build/classes/samples"/>
-  <property name="build.javadocs" value="build/javadocs"/>
+  <property name="build.dir" location="build"/>
+  <property name="build.dest" location="build/classes"/>
+  <property name="build.lib" location="build/lib"/>
+  <property name="build.samples" location="build/classes/samples"/>
+  <property name="build.javadocs" location="build/javadocs"/>
   <property name="build.webapp" value="build/webapps/axis"/>
 
-  <property name="webapp" value="webapps/axis"/>
+  <property name="webapp" location="webapps/axis"/>
 
-  <property name="dist.dir" value="axis-1_0"/>
+  <property name="dist.dir" location="axis-1_0"/>
 
   <property name="test.functional.usefile" value="true"/>
-
+  
+  <property name="tools.jar" location="${java.home}/../lib/tools.jar"/>
+  <property name="axis.lib.dir" location="lib"/>
+  
   <!-- =================================================================== -->
   <!-- Determine what dependencies are present                             -->
   <!-- =================================================================== -->
@@ -112,8 +116,8 @@
     <pathelement location="${regexp.jar}"/>
     <pathelement location="${junit.jar}"/>
     <pathelement location="${excalibur.jar}"/>
-    <pathelement location="${java.home}/../lib/tools.jar"/>
-    <fileset dir="lib">
+    <pathelement location="${tools.jar}"/>
+    <fileset dir="${axis.lib.dir}">
      <include name="*.jar"/>
     </fileset>
     <pathelement path="${java.class.path}"/>
@@ -304,7 +308,8 @@
   <!-- =================================================================== -->
   <!-- Compiles the samples                                                -->
   <!-- =================================================================== -->
-  <target name="samples" depends="compile">
+  <target name="samples" depends="compile" 
+    description="build the samples">
 
   <!-- The interop echo sample depends on the wsdl2java task -->    
     <javac srcdir="." destdir="${build.dest}"
@@ -417,7 +422,9 @@
   <!-- =================================================================== -->
   <!-- Functional tests, no dependencies (for no-build testing)            -->
   <!-- =================================================================== -->
-  <target name="functional-tests-only" depends="setenv">
+  <target name="functional-tests-only" depends="setenv"
+    description="functional tests without a rebuild; the Axis Ant task must be in ANT_HOME/lib"
+    >
 
     <!-- The Axis Ant task must be built (into ANT_HOME/lib)... -->
     <ant antfile="test/build_ant.xml" />
@@ -433,7 +440,8 @@
   <!-- =================================================================== -->
   <!-- Functional tests, no server (for testing under debugger)            -->
   <!-- =================================================================== -->
-  <target name="functional-tests-noserver" depends="buildTest, samples">
+  <target name="functional-tests-noserver" depends="buildTest, samples"
+    description="functional tests, no server">
     <ant antfile="test/build_functional_tests.xml" target="junit-functional-noserver">
       <property name="test.functional.usefile" value="${test.functional.usefile}"/>
     </ant>
@@ -443,7 +451,8 @@
   <!-- =================================================================== -->
   <!-- Functional tests, with server                                       -->
   <!-- =================================================================== -->
-  <target name="functional-tests" depends="buildTest, samples">
+  <target name="functional-tests" depends="buildTest, samples"
+    description="functional tests">
     <ant antfile="test/build_functional_tests.xml">
       <property name="test.functional.usefile" value="${test.functional.usefile}"/>
     </ant>
@@ -456,7 +465,9 @@
   <!-- =================================================================== -->
   <!-- Creates the API documentation                                       -->
   <!-- =================================================================== -->
-  <target name="javadocs" depends="setenv" unless="javadoc.notrequired">
+  <target name="javadocs" depends="setenv" unless="javadoc.notrequired"
+      description="create javadocs">
+
     <mkdir dir="${build.javadocs}"/>
     <javadoc packagenames="${packages}"
              sourcepath="${src.dir}"
@@ -474,7 +485,9 @@
   <!-- =================================================================== -->
   <!-- Build/Test EVERYTHING from scratch!                                 -->
   <!-- =================================================================== -->
-  <target name="all" depends="dist, functional-tests"/>
+  <target name="all" depends="dist, functional-tests"
+      description="do everything: distribution build and functional tests"
+    />
 
   <!-- =================================================================== -->
   <!-- Creates a war file for testing                                      -->
@@ -514,7 +527,9 @@
       <fileset dir="${build.javadocs}"/>
     </copy>
   </target>
-  <target name="dist" depends="compile, javadocsdist, samples, junit" >
+  
+  <target name="dist" depends="compile, javadocsdist, samples, junit" 
+    description="create the full binary distribution">
     <mkdir dir="${dist.dir}"/>
     <mkdir dir="${dist.dir}/lib"/>
     <mkdir dir="${dist.dir}/samples"/>
@@ -555,7 +570,8 @@
   <!-- =================================================================== -->
   <!-- Creates the source distribution                                     -->
   <!-- =================================================================== -->
-  <target name="srcdist" depends="javadocs" >
+  <target name="srcdist" depends="javadocs" 
+      description="Create the source distribution">
     <copy todir="${dist.dir}">
       <fileset dir=".">
         <include name="build.xml"/>
@@ -579,7 +595,8 @@
   <!-- =================================================================== -->
   <!-- Interop 3                                                           -->
   <!-- =================================================================== -->
-  <target name="interop3" depends="buildTest">
+  <target name="interop3" depends="buildTest"
+      description="run the round3 interop tests">
     <ant dir="test/wsdl/interop3/import1"/>
     <ant dir="test/wsdl/interop3/import2"/>
     <ant dir="test/wsdl/interop3/import3"/>
@@ -593,7 +610,8 @@
   <!-- =================================================================== -->
   <!-- Cleans everything                                                   -->
   <!-- =================================================================== -->
-  <target name="clean">
+  <target name="clean"
+      description="clean up, build, dist and much of the axis servlet">
     <delete dir="${build.dir}"/>
     <delete dir="${dist.dir}"/>
     <delete file="client-config.wsdd"/>
Index: test/build_functional_tests.xml
===================================================================
RCS file: /home/cvspublic/xml-axis/java/test/build_functional_tests.xml,v
retrieving revision 1.40
diff -u -r1.40 build_functional_tests.xml
--- test/build_functional_tests.xml	8 May 2002 19:20:08 -0000	1.40
+++ test/build_functional_tests.xml	10 May 2002 23:29:19 -0000
@@ -29,9 +29,9 @@
   <path id="test-classpath">
     <pathelement location="${build.dest}" />
     <pathelement path="${java.class.path}" />
-    <pathelement location="${java.home}/../lib/tools.jar"/>
-    <fileset dir="../java/lib">
-     <include name="*.jar"/>
+    <pathelement location="${tools.jar}"/>    
+    <fileset dir="${axis.lib.dir}">
+      <include name="*.jar"/>
     </fileset>
   </path>
 
Index: test/wsdl/Wsdl2javaTestSuite.xml
===================================================================
RCS file: /home/cvspublic/xml-axis/java/test/wsdl/Wsdl2javaTestSuite.xml,v
retrieving revision 1.96
diff -u -r1.96 Wsdl2javaTestSuite.xml
--- test/wsdl/Wsdl2javaTestSuite.xml	7 May 2002 16:08:51 -0000	1.96
+++ test/wsdl/Wsdl2javaTestSuite.xml	10 May 2002 23:29:46 -0000
@@ -5,8 +5,8 @@
   <path id="test-classpath">
     <pathelement location="${build.dest}" />
     <pathelement path="${java.class.path}" />
-    <pathelement location="${java.home}/../lib/tools.jar"/>
-    <fileset dir="../java/lib">
+    <pathelement location="${tools.jar}"/>    
+    <fileset dir="${axis.lib.dir}">
      <include name="*.jar"/>
     </fileset>
   </path>
@@ -22,6 +22,8 @@
   </taskdef>
 
   <target name="main">
+    <!-- this line is steve's only; not for external consumption -->
+    <setproxy proxyHost="web-proxy" proxyport="8088" />
     <!-- Use this to check the classpath if the ANT Task fails... -->
     <!--
     <property name="test-classpath.property" refid="test-classpath"/>