Index: axis/build.xml
===================================================================
--- axis/build.xml	(revision 55de6a90f822407060a06d0a7a9fab9c845796f1)
+++ axis/build.xml	(revision 6a03b9f0d012a6c80c5529ab128771139c296a58)
@@ -19,5 +19,4 @@
   <property name="src.dir" value="${basedir}"/>
   <property name="lib.dir" value="${basedir}${file.separator}jar"/>
-  <property name="syslib.dir" value="/usr/local/share/java/classes"/>
   <property name="doc.dir" value="${basedir}${file.separator}doc"/>
   <property name="devdoc.dir" value="${basedir}${file.separator}dev-doc"/>
@@ -25,8 +24,7 @@
   <property name="classes.dir" value="${build.dir}/classes"/>
   <property name="jar.dir" value="${build.dir}${file.separator}jar"/>
-  <property name="axis.task.home"
-    value="/usr/local/tomcat5.5/webapps/axis/WEB-INF/lib"/>
   <property name="keystore.file" value="${basedir}${file.separator}keystore"/>
-  <property name="wsdl.dir" value="/zod/fedd-repo/wsdl/"/>
+  <property name="wsdl.dir" value="../wsdl"/>
+  <property name="cert.pem" value="./emulab.pem"/>
 
   <path id="compile.classpath">
@@ -46,10 +44,6 @@
   </target>
 
-  <target name="compile" depends="wsdl-parse" description="Compile the source">
-    <mkdir dir="${classes.dir}" />
-    <javac srcdir="${src.dir}" destdir="${classes.dir}" 
-      classpathref="compile.classpath" includeAntRuntime="no"/>
-  </target>
-
+  <!-- Check to see if the keystore file exists, if so the keystore.available
+       property is created. -->
   <target name="keystore.check">
     <available property="keystore.present" 
@@ -58,8 +52,13 @@
 
 
+  <!-- Convert ${cert.pem} to a java keystore.  Makes use of the ImportKey
+       program available from http://www.agentbob.info/agentbob/79-AB.html .
+       That web page describes this process in detail. -->
   <target name="keys" depends="keystore.check" unless="keystore.present" >
+    <!-- splitkey.pl splits a combo certificate file (both key and cert) into a
+	 key.pem and cert.pem file for ImportKey -->
     <exec executable="/usr/bin/perl">
       <arg value="./splitkey.pl"/>
-      <arg file="./emulab.pem"/>
+      <arg file="${cert.pem}"/>
     </exec>
     <exec executable="openssl">
@@ -92,12 +91,53 @@
       <arg value="fedd"/>
     </java>
+    <move file="${user.home}${file.separator}keystore.ImportKey"
+      tofile="${keystore.file}"/>
     <delete>
       <fileset dir="${basedir}" includes="**/cert.*"/>
       <fileset dir="${basedir}" includes="**/key.*"/>
     </delete>
-    <move file="${user.home}${file.separator}keystore.ImportKey"
-      tofile="${keystore.file}"/>
   </target>
 
+  <!-- Documentation targets -->
+  <target name="doc" description="Generate API documentation">
+    <mkdir dir="${doc.dir}"/>
+    <javadoc sourcepath="${src.dir}" destdir="${doc.dir}"
+      classpathref="compile.classpath" access="public"
+      noqualifier="java.lang:java.io:java.util:java.security:java.security.cert"/>
+  </target>
+
+  <target name="dev-doc" 
+    description="Generate detailed/developer API documentation">
+    <mkdir dir="${devdoc.dir}"/>
+    <javadoc sourcepath="${src.dir}" destdir="${devdoc.dir}"
+      classpathref="compile.classpath" access="private"
+      noqualifier="java.lang:java.io:java.util:java.security:java.security.cert"/>
+  </target>
+
+  <!-- Check to see if the wsdl-generated directories exist: if so 
+       the wsdl.available property is set -->
+  <target name="wsdl.check">
+    <available file="${basedir}${file.separator}edu" type="dir" 
+      property="wsdl.available"/>
+  </target>
+
+  <!-- Generate wsdl-generated source files if they do not exist.  The
+       axis-wsdl2java tasks are from axis.  -->
+  <target name="wsdl-parse" depends="wsdl.check" unless="wsdl.available" >
+    <axis-wsdl2java url="${wsdl.dir}${file.separator}fedd.wsdl"
+      output="${basedir}" />
+    <axis-wsdl2java url="${wsdl.dir}${file.separator}fedd_internal.wsdl"
+      output="${basedir}" />
+  </target>
+
+  <!-- compile the sources into the build directory.  Depends on the
+       wsdl-generated files being created. -->
+  <target name="compile" depends="wsdl-parse" description="Compile the source">
+    <mkdir dir="${classes.dir}" />
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" 
+      classpathref="compile.classpath" includeAntRuntime="no"/>
+  </target>
+
+  <!-- Test programs -->
   <target name="multistatus" depends="compile,keys"
     description="run visualizer">
@@ -108,5 +148,4 @@
       </classpath>
     </java>
-    <echo message="${user.name}"/>
   </target>
 
@@ -122,27 +161,15 @@
   </target>
 
-  <target name="doc" description="Generate API documentation">
-    <mkdir dir="${doc.dir}"/>
-    <javadoc sourcepath="${src.dir}" destdir="${doc.dir}"
-      classpathref="compile.classpath" access="public"
-      noqualifier="java.lang:java.io:java.util:java.security:java.security.cert"/>
+
+  <target name="terminate" depends="compile,keys"
+    description="run visualizer">
+    <java classname="Terminate" fork="true" >
+      <classpath>
+	<path refid="compile.classpath"/>
+	<pathelement path="${classes.dir}"/>
+      </classpath>
+      <arg value="${user.name}-test"/>
+    </java>
   </target>
 
-  <target name="dev-doc" description="Generate API documentation">
-    <mkdir dir="${devdoc.dir}"/>
-    <javadoc sourcepath="${src.dir}" destdir="${devdoc.dir}"
-      classpathref="compile.classpath" access="private"
-      noqualifier="java.lang:java.io:java.util:java.security:java.security.cert"/>
-  </target>
-
-  <target name="wsdl.check">
-    <available file="${basedir}${file.separator}edu" type="dir" 
-      property="wsdl.available"/>
-  </target>
-
-  <target name="wsdl-parse" depends="wsdl.check" unless="wsdl.available" >
-    <axis-wsdl2java url="${wsdl.dir}${file.separator}fedd.wsdl" output="${basedir}" />
-    <axis-wsdl2java url="${wsdl.dir}${file.separator}fedd_internal.wsdl"
-      output="${basedir}" />
-  </target>
 </project>
