Author: steveh
Date: Tue Oct 12 10:23:50 2004
New Revision: 54680

Modified:
   incubator/beehive/trunk/controls/build.xml
   incubator/beehive/trunk/wsm/build.xml
Log:
My last checkin changed the line starts from spaces to tabs.  Switching back to 
spaces.

Modified: incubator/beehive/trunk/controls/build.xml
==============================================================================
--- incubator/beehive/trunk/controls/build.xml  (original)
+++ incubator/beehive/trunk/controls/build.xml  Tue Oct 12 10:23:50 2004
@@ -16,197 +16,197 @@
    $Header:$
  -->
 <project name="controls" default="usage" basedir=".">
-       <property environment="os"/>
-       <property file="../beehive.properties"/>
-       <!-- THE CONTROL BUILD REQUIRES JDK5 AND LATER.  ATTEMPTS TO BUILD ON 
JDK EALRIER THAN 5.0 WILL BE A NOOP -->
-       <condition property="isJDKOver5">
-               <equals arg1="${ant.java.version}" arg2="1.5"/>
-       </condition>
-       <property name="build.dir" value="build"/>
-       <property name="classes.dir" value="${build.dir}/classes"/>
-       <property name="jars.dir" value="${build.dir}/jars"/>
-       <property name="docs.dir" value="${build.dir}/docs"/>
-       <property name="api.dir" value="src/api"/>
-       <property name="api.classes" value="${classes.dir}/api"/>
-       <property name="runtime.dir" value="src/runtime"/>
-       <property name="runtime.classes" value="${classes.dir}/runtime"/>
-       <property name="controls.jar" value="${jars.dir}/controls.jar"/>
-       <path id="api.classpath">
+    <property environment="os"/>
+    <property file="../beehive.properties"/>
+    <!-- THE CONTROL BUILD REQUIRES JDK5 AND LATER.  ATTEMPTS TO BUILD ON JDK 
EALRIER THAN 5.0 WILL BE A NOOP -->
+    <condition property="isJDKOver5">
+        <equals arg1="${ant.java.version}" arg2="1.5"/>
+    </condition>
+    <property name="build.dir" value="build"/>
+    <property name="classes.dir" value="${build.dir}/classes"/>
+    <property name="jars.dir" value="${build.dir}/jars"/>
+    <property name="docs.dir" value="${build.dir}/docs"/>
+    <property name="api.dir" value="src/api"/>
+    <property name="api.classes" value="${classes.dir}/api"/>
+    <property name="runtime.dir" value="src/runtime"/>
+    <property name="runtime.classes" value="${classes.dir}/runtime"/>
+    <property name="controls.jar" value="${jars.dir}/controls.jar"/>
+    <path id="api.classpath">
   </path>
-       <path id="runtime.classpath">
-               <pathelement location="${ant.jar}"/>
-               <pathelement location="${servlet24.jar}"/>
-               <pathelement location="${tools.jar}"/>
-               <pathelement location="${velocity14.jar}"/>
-               <pathelement location="${velocitydep14.jar}"/>
-               <pathelement location="${api.classes}"/>
-               <path id="${api.classpath}"/>
-       </path>
-       <condition property="controls.os" value="windows">
-               <os family="windows"/>
-       </condition>
-       <condition property="controls.os" value="unix">
-               <os family="unix"/>
-       </condition>
-       <!-- 
==================================================================== -->
-       <!-- usage - output usage   -->
-       <!-- 
==================================================================== -->
-       <target name="usage">
-               <echo message=""/>
-               <echo message=""/>
-               <echo message="Controls Build file"/>
-               <echo 
message="================================================================"/>
-               <echo message="|                          Usage                 
              |"/>
-               <echo 
message="================================================================"/>
-               <echo message=""/>
-               <echo 
message="----------------------------------------------------------------"/>
-               <echo message="|                      Standard Targets          
              |"/>
-               <echo 
message="----------------------------------------------------------------"/>
-               <echo message="build       - build java classes and jar files"/>
-               <echo message="clean       - remove build files"/>
-               <echo message="deploy      - does nothing for this project"/>
-               <echo message="redeploy    - do an &quot;clean&quot;, &quot;, 
&quot;build&quot; and &quot;deploy&quot;."/>
-               <echo message="docs        - build the java docs"/>
-               <echo message="drt         - runs the DRT (developer regression 
test)"/>
-               <echo message=""/>
-               <echo 
message="----------------------------------------------------------------"/>
-               <echo message="|                  Project-Specific Targets      
              |"/>
-               <echo 
message="----------------------------------------------------------------"/>
-               <echo message="dirs        - Creates the output directories of 
the build."/>
-               <echo message="classes     - Compiles the source code of the 
project."/>
-               <echo 
message="================================================================"/>
-               <echo message="|      NOTE: THE WSM PROJECT ONLY BUILDS ON JDK5 
AND LATER     |"/>
-               <echo 
message="================================================================"/>
-               <echo message=""/>
-               <echo message=""/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- Creates the output directories of the build. -->
-       <!-- 
==================================================================== -->
-       <target name="dirs">
-               <mkdir dir="${api.classes}"/>
-               <mkdir dir="${runtime.classes}"/>
-               <mkdir dir="${jars.dir}"/>
-               <mkdir dir="${docs.dir}"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- Compiles the source code of the project. -->
-       <!-- 
==================================================================== -->
-       <target name="classes" depends="dirs" if="isJDKOver5">
-               <!-- Build the API classes -->
-               <javac destdir="${api.classes}" classpathref="api.classpath" 
debug="on">
-                       <src path="${api.dir}"/>
-               </javac>
-               <!-- Build the runtime classes -->
-               <javac destdir="${runtime.classes}" 
classpathref="runtime.classpath" debug="on">
-                       <src path="${runtime.dir}"/>
-               </javac>
-               <!-- Copy template files into the build -->
-               <copy todir="${runtime.classes}" overwrite="true">
-                       <fileset dir="${runtime.dir}" 
includes="**/*.template,**/*.vm,META-INF/**"/>
-               </copy>
-               <!-- Copy property files into the build -->
-               <copy todir="${runtime.classes}" overwrite="true">
-                       <fileset dir="${runtime.dir}" 
includes="**/*.properties"/>
-               </copy>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- Jars up the classes, libraries, and resources. -->
-       <!-- 
==================================================================== -->
-       <target name="build" depends="classes" if="isJDKOver5">
-               <echo 
message="--------------------------------------------------"/>
-               <echo message="|      controls build starting                   
 |"/>
-               <echo 
message="--------------------------------------------------"/>
-               <jar jarfile="${controls.jar}">
-                       <fileset dir="${api.classes}"/>
-                       <fileset dir="${runtime.classes}"/>
-               </jar>
-               <echo 
message="--------------------------------------------------"/>
-               <echo message="|      controls build ending                     
 |"/>
-               <echo 
message="--------------------------------------------------"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- build_all.  build this project and all inter-project dependencies  
  -->
-       <!-- 
==================================================================== -->
-       <target name="build_all">
-               <antcall target="build"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- clean  -->
-       <!-- 
==================================================================== -->
-       <target name="clean">
-               <delete dir="${build.dir}"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- clean_all  -->
-       <!-- 
==================================================================== -->
-       <target name="clean_all">
-               <antcall target="clean"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- redeploy  -->
-       <!-- 
==================================================================== -->
-       <target name="redeploy">
-               <antcall target="clean"/>
-               <antcall target="build"/>
-               <antcall target="deploy"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- redeploy_all  -->
-       <!-- 
==================================================================== -->
-       <target name="redeploy_all">
-               <antcall target="clean_all"/>
-               <antcall target="build_all"/>
-               <antcall target="deploy_all"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- deploy -->
-       <!-- 
==================================================================== -->
-       <target name="deploy" depends="build" if="isJDKOver5">
-               <echo 
message="--------------------------------------------------"/>
-               <echo message="|       controls deploy starting                 
|"/>
-               <echo 
message="--------------------------------------------------"/>
-               <!-- Copy build output to client locations (lib dir of servers 
etc) -->
-               <echo 
message="--------------------------------------------------"/>
-               <echo message="|       controls deploy ending                   
|"/>
-               <echo 
message="--------------------------------------------------"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- deploy_all -->
-       <!-- 
==================================================================== -->
-       <target name="deploy_all">
-               <antcall target="deploy"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- minprod -->
-       <!-- 
==================================================================== -->
-       <target name="minprod">
-               <echo 
message="--------------------------------------------------"/>
-               <echo message="|       controls minprod starting                
 |"/>
-               <echo 
message="--------------------------------------------------"/>
-               <antcall target="deploy"/>
-               <echo 
message="--------------------------------------------------"/>
-               <echo message="|       controls minprod completed               
 |"/>
-               <echo 
message="--------------------------------------------------"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- docs -->
-       <!-- 
==================================================================== -->
-       <target name="docs" if="isJDKOver5">
-               <javadoc destdir="${docs.dir}/reference/classref_controls" 
maxmemory="256M" windowtitle="Controls Documentation" doctitle="Java Controls" 
version="true" author="false" use="true" additionalparam="-breakiterator 
-noqualifier all -notimestamp" useexternalfile="true" 
classpathref="runtime.classpath">
-                       <packageset dir="${api.dir}" defaultexcludes="yes">
-                               <include 
name="org/apache/beehive/controls/**/*"/>
-                       </packageset>
-                       <packageset dir="${runtime.dir}" defaultexcludes="yes">
-                               <include 
name="org/apache/beehive/controls/**/*"/>
-                       </packageset>
-               </javadoc>
-               <fixcrlf srcdir="${docs.dir}"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- drt -->
-       <!-- 
==================================================================== -->
-       <target name="drt" depends="deploy">
-               <ant dir="./test" target="checkin.tests" inheritAll="false"/>
-       </target>
+    <path id="runtime.classpath">
+        <pathelement location="${ant.jar}"/>
+        <pathelement location="${servlet24.jar}"/>
+        <pathelement location="${tools.jar}"/>
+        <pathelement location="${velocity14.jar}"/>
+        <pathelement location="${velocitydep14.jar}"/>
+        <pathelement location="${api.classes}"/>
+        <path id="${api.classpath}"/>
+    </path>
+    <condition property="controls.os" value="windows">
+        <os family="windows"/>
+    </condition>
+    <condition property="controls.os" value="unix">
+        <os family="unix"/>
+    </condition>
+    <!-- ==================================================================== 
-->
+    <!-- usage - output usage   -->
+    <!-- ==================================================================== 
-->
+    <target name="usage">
+        <echo message=""/>
+        <echo message=""/>
+        <echo message="Controls Build file"/>
+        <echo 
message="================================================================"/>
+        <echo message="|                          Usage                        
       |"/>
+        <echo 
message="================================================================"/>
+        <echo message=""/>
+        <echo 
message="----------------------------------------------------------------"/>
+        <echo message="|                      Standard Targets                 
       |"/>
+        <echo 
message="----------------------------------------------------------------"/>
+        <echo message="build       - build java classes and jar files"/>
+        <echo message="clean       - remove build files"/>
+        <echo message="deploy      - does nothing for this project"/>
+        <echo message="redeploy    - do an &quot;clean&quot;, &quot;, 
&quot;build&quot; and &quot;deploy&quot;."/>
+        <echo message="docs        - build the java docs"/>
+        <echo message="drt         - runs the DRT (developer regression 
test)"/>
+        <echo message=""/>
+        <echo 
message="----------------------------------------------------------------"/>
+        <echo message="|                  Project-Specific Targets             
       |"/>
+        <echo 
message="----------------------------------------------------------------"/>
+        <echo message="dirs        - Creates the output directories of the 
build."/>
+        <echo message="classes     - Compiles the source code of the 
project."/>
+        <echo 
message="================================================================"/>
+        <echo message="|      NOTE: THE WSM PROJECT ONLY BUILDS ON JDK5 AND 
LATER     |"/>
+        <echo 
message="================================================================"/>
+        <echo message=""/>
+        <echo message=""/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- Creates the output directories of the build. -->
+    <!-- ==================================================================== 
-->
+    <target name="dirs">
+        <mkdir dir="${api.classes}"/>
+        <mkdir dir="${runtime.classes}"/>
+        <mkdir dir="${jars.dir}"/>
+        <mkdir dir="${docs.dir}"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- Compiles the source code of the project. -->
+    <!-- ==================================================================== 
-->
+    <target name="classes" depends="dirs" if="isJDKOver5">
+        <!-- Build the API classes -->
+        <javac destdir="${api.classes}" classpathref="api.classpath" 
debug="on">
+            <src path="${api.dir}"/>
+        </javac>
+        <!-- Build the runtime classes -->
+        <javac destdir="${runtime.classes}" classpathref="runtime.classpath" 
debug="on">
+            <src path="${runtime.dir}"/>
+        </javac>
+        <!-- Copy template files into the build -->
+        <copy todir="${runtime.classes}" overwrite="true">
+            <fileset dir="${runtime.dir}" 
includes="**/*.template,**/*.vm,META-INF/**"/>
+        </copy>
+        <!-- Copy property files into the build -->
+        <copy todir="${runtime.classes}" overwrite="true">
+            <fileset dir="${runtime.dir}" includes="**/*.properties"/>
+        </copy>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- Jars up the classes, libraries, and resources. -->
+    <!-- ==================================================================== 
-->
+    <target name="build" depends="classes" if="isJDKOver5">
+        <echo message="--------------------------------------------------"/>
+        <echo message="|      controls build starting                    |"/>
+        <echo message="--------------------------------------------------"/>
+        <jar jarfile="${controls.jar}">
+            <fileset dir="${api.classes}"/>
+            <fileset dir="${runtime.classes}"/>
+        </jar>
+        <echo message="--------------------------------------------------"/>
+        <echo message="|      controls build ending                      |"/>
+        <echo message="--------------------------------------------------"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- build_all.  build this project and all inter-project dependencies    
-->
+    <!-- ==================================================================== 
-->
+    <target name="build_all">
+        <antcall target="build"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- clean  -->
+    <!-- ==================================================================== 
-->
+    <target name="clean">
+        <delete dir="${build.dir}"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- clean_all  -->
+    <!-- ==================================================================== 
-->
+    <target name="clean_all">
+        <antcall target="clean"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- redeploy  -->
+    <!-- ==================================================================== 
-->
+    <target name="redeploy">
+        <antcall target="clean"/>
+        <antcall target="build"/>
+        <antcall target="deploy"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- redeploy_all  -->
+    <!-- ==================================================================== 
-->
+    <target name="redeploy_all">
+        <antcall target="clean_all"/>
+        <antcall target="build_all"/>
+        <antcall target="deploy_all"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- deploy -->
+    <!-- ==================================================================== 
-->
+    <target name="deploy" depends="build" if="isJDKOver5">
+        <echo message="--------------------------------------------------"/>
+        <echo message="|       controls deploy starting                 |"/>
+        <echo message="--------------------------------------------------"/>
+        <!-- Copy build output to client locations (lib dir of servers etc) -->
+        <echo message="--------------------------------------------------"/>
+        <echo message="|       controls deploy ending                   |"/>
+        <echo message="--------------------------------------------------"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- deploy_all -->
+    <!-- ==================================================================== 
-->
+    <target name="deploy_all">
+        <antcall target="deploy"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- minprod -->
+    <!-- ==================================================================== 
-->
+    <target name="minprod">
+        <echo message="--------------------------------------------------"/>
+        <echo message="|       controls minprod starting                 |"/>
+        <echo message="--------------------------------------------------"/>
+        <antcall target="deploy"/>
+        <echo message="--------------------------------------------------"/>
+        <echo message="|       controls minprod completed                |"/>
+        <echo message="--------------------------------------------------"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- docs -->
+    <!-- ==================================================================== 
-->
+    <target name="docs" if="isJDKOver5">
+        <javadoc destdir="${docs.dir}/reference/classref_controls" 
maxmemory="256M" windowtitle="Controls Documentation" doctitle="Java Controls" 
version="true" author="false" use="true" additionalparam="-breakiterator 
-noqualifier all -notimestamp" useexternalfile="true" 
classpathref="runtime.classpath">
+            <packageset dir="${api.dir}" defaultexcludes="yes">
+                <include name="org/apache/beehive/controls/**/*"/>
+            </packageset>
+            <packageset dir="${runtime.dir}" defaultexcludes="yes">
+                <include name="org/apache/beehive/controls/**/*"/>
+            </packageset>
+        </javadoc>
+        <fixcrlf srcdir="${docs.dir}"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- drt -->
+    <!-- ==================================================================== 
-->
+    <target name="drt" depends="deploy">
+        <ant dir="./test" target="checkin.tests" inheritAll="false"/>
+    </target>
 </project>

Modified: incubator/beehive/trunk/wsm/build.xml
==============================================================================
--- incubator/beehive/trunk/wsm/build.xml       (original)
+++ incubator/beehive/trunk/wsm/build.xml       Tue Oct 12 10:23:50 2004
@@ -16,268 +16,268 @@
    $Header:$
  -->
 <project name="wsm" default="usage" basedir=".">
-       <property environment="os"/>
-       <property file="../beehive.properties"/>
-       <!-- THE WSM BUILD REQUIRES JDK5 AND LATER.  ATTEMPTS TO BUILD ON JDK 
EALRIER THAN 5.0 WILL BE A NOOP -->
-       <condition property="isJDKOver5">
-               <equals arg1="${ant.java.version}" arg2="1.5"/>
-       </condition>
-       <property name="build.dir" value="build"/>
-       <property name="classes.dir" value="${build.dir}/classes"/>
-       <property name="jars.dir" value="${build.dir}/jars"/>
-       <property name="docs.dir" value="${build.dir}/docs"/>
-       <property name="test.dir" value="test"/>
-       <property name="webapps.dir" value="${test.dir}/webapps"/>
-       <property name="dist.dir" value="${build.dir}/dist"/>
-       <property name="webapps.dist.dir" value="${dist.dir}/webapps"/>
-       <property name="axis.dir" value="AnnotatedAxis"/>
-       <property name="api.dir" value="src/api"/>
-       <property name="api.classes" value="${classes.dir}/api"/>
-       <property name="runtime.dir" value="src/runtime"/>
-       <property name="runtime.classes" value="${classes.dir}/runtime"/>
-       <property name="lib.dir" value="lib"/>
-       <property name="ext.lib.dir" value="external"/>
-       <property name="wsm.jar" value="${jars.dir}/wsm.jar"/>
-       <property name="wsm-axis.jar" value="${jars.dir}/wsm-axis.jar"/>
-       <path id="api.classpath">
+    <property environment="os"/>
+    <property file="../beehive.properties"/>
+    <!-- THE WSM BUILD REQUIRES JDK5 AND LATER.  ATTEMPTS TO BUILD ON JDK 
EALRIER THAN 5.0 WILL BE A NOOP -->
+    <condition property="isJDKOver5">
+        <equals arg1="${ant.java.version}" arg2="1.5"/>
+    </condition>
+    <property name="build.dir" value="build"/>
+    <property name="classes.dir" value="${build.dir}/classes"/>
+    <property name="jars.dir" value="${build.dir}/jars"/>
+    <property name="docs.dir" value="${build.dir}/docs"/>
+    <property name="test.dir" value="test"/>
+    <property name="webapps.dir" value="${test.dir}/webapps"/>
+    <property name="dist.dir" value="${build.dir}/dist"/>
+    <property name="webapps.dist.dir" value="${dist.dir}/webapps"/>
+    <property name="axis.dir" value="AnnotatedAxis"/>
+    <property name="api.dir" value="src/api"/>
+    <property name="api.classes" value="${classes.dir}/api"/>
+    <property name="runtime.dir" value="src/runtime"/>
+    <property name="runtime.classes" value="${classes.dir}/runtime"/>
+    <property name="lib.dir" value="lib"/>
+    <property name="ext.lib.dir" value="external"/>
+    <property name="wsm.jar" value="${jars.dir}/wsm.jar"/>
+    <property name="wsm-axis.jar" value="${jars.dir}/wsm-axis.jar"/>
+    <path id="api.classpath">
   </path>
-       <path id="runtime.classpath">
-               <pathelement location="${ant.jar}"/>
-               <pathelement location="${tools.jar}"/>
-               <pathelement location="${api.classes}"/>
-               <pathelement location="${xbean.jar}"/>
-               <pathelement location="${jsr173.jar}"/>
-               <pathelement location="${junit.jar}"/>
-               <pathelement location="${log4j.jar}"/>
-               <pathelement location="${lib.dir}/xmltypes.jar"/>
-               <path refid="api.classpath"/>
-               <pathelement location="${api.classes}"/>
-       </path>
-       <fileset id="axis.jars" dir="${ext.lib.dir}">
-               <include name="wsdl4j.jar"/>
-               <include name="saaj.jar"/>
-               <include name="jaxrpc.jar"/>
-               <include name="commons-logging.jar"/>
-               <include name="commons-discovery.jar"/>
-               <include name="axis-ant.jar"/>
-               <include name="axis.jar"/>
-       </fileset>
-       <path id="axis.classpath">
-               <fileset refid="axis.jars"/>
-               <pathelement location="${os.JAVA_HOME}/lib/tools.jar"/>
-               <path refid="runtime.classpath"/>
-               <pathelement location="${runtime.classes}"/>
-       </path>
-       <!-- 
==================================================================== -->
-       <!-- usage - output usage   -->
-       <!-- 
==================================================================== -->
-       <target name="usage">
-               <echo message=""/>
-               <echo message=""/>
-               <echo message="WSM Build file"/>
-               <echo 
message="================================================================"/>
-               <echo message="|                          Usage                 
              |"/>
-               <echo 
message="================================================================"/>
-               <echo message=""/>
-               <echo 
message="----------------------------------------------------------------"/>
-               <echo message="|                      Standard Targets          
              |"/>
-               <echo 
message="----------------------------------------------------------------"/>
-               <echo message="build       - build core WSM classes and jar 
files"/>
-               <echo message="build_axis  - build AXIS dependent classes and 
jar files"/>
-               <echo message="build_all   - build all classes and jar files"/>
-               <echo message="clean       - remove build files"/>
-               <echo message="deploy      - prepares an axis webapp suitable 
for deployment"/>
-               <echo message="              to a servlet container"/>
-               <echo message="redeploy    - do an &quot;clean&quot;, &quot;, 
&quot;build&quot; and &quot;deploy&quot;."/>
-               <echo message="docs        - build the java docs"/>
-               <echo message="drt         - runs the DRT (developer regression 
test) on the"/>
-               <echo message="              core WSM components"/>
-               <echo message=""/>
-               <echo 
message="----------------------------------------------------------------"/>
-               <echo message="|                  Project-Specific Targets      
              |"/>
-               <echo 
message="----------------------------------------------------------------"/>
-               <echo message="dirs        - Creates the output directories of 
the build."/>
-               <echo message="classes     - Compiles the core source code of 
the project and"/>
-               <echo message="              copies properties and templates 
into the build."/>
-               <echo message="api         - Compiles the api source code of 
the project."/>
-               <echo message="runtime     - Compiles the runtime source code 
of the project."/>
-               <echo message="axis        - Compiles the axis dependent source 
code of the project."/>
-               <echo 
message="================================================================"/>
-               <echo message="|      NOTE: THE WSM PROJECT ONLY BUILDS ON JDK5 
AND LATER     |"/>
-               <echo 
message="================================================================"/>
-               <echo message=""/>
-               <echo message=""/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- Creates the output directories of the build. -->
-       <!-- 
==================================================================== -->
-       <target name="dirs">
-               <mkdir dir="${api.classes}"/>
-               <mkdir dir="${runtime.classes}"/>
-               <mkdir dir="${jars.dir}"/>
-               <mkdir dir="${docs.dir}"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- Compiles the source code of the project. -->
-       <!-- 
==================================================================== -->
-       <target name="classes" depends="api, runtime" if="isJDKOver5">
-               <!-- Copy template files into the build -->
-               <copy todir="${runtime.classes}" overwrite="true">
-                       <fileset dir="${runtime.dir}" 
includes="**/*.template,**/*.vm,META-INF/**"/>
-               </copy>
-               <!-- Copy property files into the build -->
-               <copy todir="${runtime.classes}" overwrite="true">
-                       <fileset dir="${runtime.dir}" 
includes="**/*.properties"/>
-               </copy>
-       </target>
-       <target name="api" depends="dirs" if="isJDKOver5">
-               <!-- Build the API classes -->
-               <javac destdir="${api.classes}" classpathref="api.classpath" 
debug="on">
-                       <src path="${api.dir}"/>
-               </javac>
-       </target>
-       <target name="runtime" depends="api" if="isJDKOver5">
-               <!-- Build the runtime classes -->
-               <javac destdir="${runtime.classes}" 
classpathref="runtime.classpath" debug="on">
-                       <src path="${runtime.dir}"/>
-                       <exclude name="**/axis/**"/>
-               </javac>
-       </target>
-       <target name="axis" depends="runtime" if="isJDKOver5">
-               <!-- Build the badtiger classes using source=1.4 compile flag 
-->
-               <echo message="BadTiger build"/>
-               <javac destdir="${runtime.classes}" 
classpathref="axis.classpath" source="1.4" debug="on">
-                       <src path="${runtime.dir}"/>
-                       <include name="**/axis/badtiger/**"/>
-               </javac>
-               <!-- Build the axis classes -->
-               <echo message="AXIS build"/>
-               <javac destdir="${runtime.classes}" 
classpathref="axis.classpath" debug="on">
-                       <src path="${runtime.dir}"/>
-                       <include name="**/axis/**"/>
-                       <exclude name="**/axis/badtiger/**"/>
-               </javac>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- Jars up the classes, libraries, and resources. -->
-       <!-- 
==================================================================== -->
-       <target name="build" depends="classes" if="isJDKOver5">
-               <echo 
message="--------------------------------------------------"/>
-               <echo message="|      WSM build starting                    |"/>
-               <echo 
message="--------------------------------------------------"/>
-               <jar jarfile="${wsm.jar}">
-                       <fileset dir="${api.classes}"/>
-                       <fileset dir="${runtime.classes}">
-                               <exclude name="**/axis/**"/>
-                       </fileset>
-               </jar>
-               <echo 
message="--------------------------------------------------"/>
-               <echo message="|      WSM build ending                      |"/>
-               <echo 
message="--------------------------------------------------"/>
-       </target>
-       <target name="build_axis" depends="axis" if="isJDKOver5">
-               <echo 
message="--------------------------------------------------"/>
-               <echo message="|      WSM-AXIS build starting                   
 |"/>
-               <echo 
message="--------------------------------------------------"/>
-               <jar jarfile="${wsm-axis.jar}">
-                       <fileset dir="${runtime.classes}">
-                               <include name="**/axis/**"/>
-                       </fileset>
-               </jar>
-               <echo 
message="--------------------------------------------------"/>
-               <echo message="|      WSM-AXIS build ending                     
 |"/>
-               <echo 
message="--------------------------------------------------"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- build_all.  build this project and all inter-project dependencies  
  -->
-       <!-- 
==================================================================== -->
-       <target name="build_all" depends="build, build_axis"/>
-       <!-- 
==================================================================== -->
-       <!-- clean  -->
-       <!-- 
==================================================================== -->
-       <target name="clean">
-               <delete dir="${build.dir}"/>
-               <ant dir="drt" target="clean" inheritAll="false"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- clean_all  -->
-       <!-- 
==================================================================== -->
-       <target name="clean_all">
-               <antcall target="clean"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- redeploy  -->
-       <!-- 
==================================================================== -->
-       <target name="redeploy">
-               <antcall target="clean"/>
-               <antcall target="build"/>
-               <antcall target="deploy"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- redeploy_all  -->
-       <!-- 
==================================================================== -->
-       <target name="redeploy_all">
-               <antcall target="clean_all"/>
-               <antcall target="build_all"/>
-               <antcall target="deploy_all"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- deploy -->
-       <!-- 
==================================================================== -->
-       <target name="deploy" depends="build_all" if="isJDKOver5">
-               <echo 
message="--------------------------------------------------"/>
-               <echo message="|      WSM deploy starting                 |"/>
-               <echo 
message="--------------------------------------------------"/>
-               <mkdir dir="${webapps.dist.dir}"/>
-               <copy todir="${webapps.dist.dir}/${axis.dir}">
-                       <fileset dir="${webapps.dir}/${axis.dir}"/>
-               </copy>
-               <copy todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib">
-                       <fileset refid="axis.jars"/>
-               </copy>
-               <copy todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib">
-                       <fileset dir="${jars.dir}" includes="**/*.jar"/>
-               </copy>
-               <copy file="${log4j.jar}" 
todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib"/>
-               <echo 
message="--------------------------------------------------"/>
-               <echo message="|       WSM deploy ending                   |"/>
-               <echo 
message="--------------------------------------------------"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- deploy_all -->
-       <!-- 
==================================================================== -->
-       <target name="deploy_all">
-               <antcall target="deploy"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- minprod -->
-       <!-- 
==================================================================== -->
-       <target name="minprod">
-               <echo 
message="--------------------------------------------------"/>
-               <echo message="|       WSM minprod starting                 |"/>
-               <echo 
message="--------------------------------------------------"/>
-               <antcall target="deploy"/>
-               <echo 
message="--------------------------------------------------"/>
-               <echo message="|       WSM minprod completed                |"/>
-               <echo 
message="--------------------------------------------------"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- docs -->
-       <!-- 
==================================================================== -->
-       <target name="docs" if="isJDKOver5">
-               <javadoc destdir="${docs.dir}/reference/classref_wsm" 
maxmemory="256M" windowtitle="WSM Documentation" doctitle="Web Services 
Metadata" version="true" author="false" use="true" 
additionalparam="-breakiterator -noqualifier all -notimestamp " 
useexternalfile="true" classpathref="axis.classpath">
-                       <packageset dir="${api.dir}" defaultexcludes="yes">
+    <path id="runtime.classpath">
+        <pathelement location="${ant.jar}"/>
+        <pathelement location="${tools.jar}"/>
+        <pathelement location="${api.classes}"/>
+        <pathelement location="${xbean.jar}"/>
+        <pathelement location="${jsr173.jar}"/>
+        <pathelement location="${junit.jar}"/>
+        <pathelement location="${log4j.jar}"/>
+        <pathelement location="${lib.dir}/xmltypes.jar"/>
+        <path refid="api.classpath"/>
+        <pathelement location="${api.classes}"/>
+    </path>
+    <fileset id="axis.jars" dir="${ext.lib.dir}">
+        <include name="wsdl4j.jar"/>
+        <include name="saaj.jar"/>
+        <include name="jaxrpc.jar"/>
+        <include name="commons-logging.jar"/>
+        <include name="commons-discovery.jar"/>
+        <include name="axis-ant.jar"/>
+        <include name="axis.jar"/>
+    </fileset>
+    <path id="axis.classpath">
+        <fileset refid="axis.jars"/>
+        <pathelement location="${os.JAVA_HOME}/lib/tools.jar"/>
+        <path refid="runtime.classpath"/>
+        <pathelement location="${runtime.classes}"/>
+    </path>
+    <!-- ==================================================================== 
-->
+    <!-- usage - output usage   -->
+    <!-- ==================================================================== 
-->
+    <target name="usage">
+        <echo message=""/>
+        <echo message=""/>
+        <echo message="WSM Build file"/>
+        <echo 
message="================================================================"/>
+        <echo message="|                          Usage                        
       |"/>
+        <echo 
message="================================================================"/>
+        <echo message=""/>
+        <echo 
message="----------------------------------------------------------------"/>
+        <echo message="|                      Standard Targets                 
       |"/>
+        <echo 
message="----------------------------------------------------------------"/>
+        <echo message="build       - build core WSM classes and jar files"/>
+        <echo message="build_axis  - build AXIS dependent classes and jar 
files"/>
+        <echo message="build_all   - build all classes and jar files"/>
+        <echo message="clean       - remove build files"/>
+        <echo message="deploy      - prepares an axis webapp suitable for 
deployment"/>
+        <echo message="              to a servlet container"/>
+        <echo message="redeploy    - do an &quot;clean&quot;, &quot;, 
&quot;build&quot; and &quot;deploy&quot;."/>
+        <echo message="docs        - build the java docs"/>
+        <echo message="drt         - runs the DRT (developer regression test) 
on the"/>
+        <echo message="              core WSM components"/>
+        <echo message=""/>
+        <echo 
message="----------------------------------------------------------------"/>
+        <echo message="|                  Project-Specific Targets             
       |"/>
+        <echo 
message="----------------------------------------------------------------"/>
+        <echo message="dirs        - Creates the output directories of the 
build."/>
+        <echo message="classes     - Compiles the core source code of the 
project and"/>
+        <echo message="              copies properties and templates into the 
build."/>
+        <echo message="api         - Compiles the api source code of the 
project."/>
+        <echo message="runtime     - Compiles the runtime source code of the 
project."/>
+        <echo message="axis        - Compiles the axis dependent source code 
of the project."/>
+        <echo 
message="================================================================"/>
+        <echo message="|      NOTE: THE WSM PROJECT ONLY BUILDS ON JDK5 AND 
LATER     |"/>
+        <echo 
message="================================================================"/>
+        <echo message=""/>
+        <echo message=""/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- Creates the output directories of the build. -->
+    <!-- ==================================================================== 
-->
+    <target name="dirs">
+        <mkdir dir="${api.classes}"/>
+        <mkdir dir="${runtime.classes}"/>
+        <mkdir dir="${jars.dir}"/>
+        <mkdir dir="${docs.dir}"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- Compiles the source code of the project. -->
+    <!-- ==================================================================== 
-->
+    <target name="classes" depends="api, runtime" if="isJDKOver5">
+        <!-- Copy template files into the build -->
+        <copy todir="${runtime.classes}" overwrite="true">
+            <fileset dir="${runtime.dir}" 
includes="**/*.template,**/*.vm,META-INF/**"/>
+        </copy>
+        <!-- Copy property files into the build -->
+        <copy todir="${runtime.classes}" overwrite="true">
+            <fileset dir="${runtime.dir}" includes="**/*.properties"/>
+        </copy>
+    </target>
+    <target name="api" depends="dirs" if="isJDKOver5">
+        <!-- Build the API classes -->
+        <javac destdir="${api.classes}" classpathref="api.classpath" 
debug="on">
+            <src path="${api.dir}"/>
+        </javac>
+    </target>
+    <target name="runtime" depends="api" if="isJDKOver5">
+        <!-- Build the runtime classes -->
+        <javac destdir="${runtime.classes}" classpathref="runtime.classpath" 
debug="on">
+            <src path="${runtime.dir}"/>
+            <exclude name="**/axis/**"/>
+        </javac>
+    </target>
+    <target name="axis" depends="runtime" if="isJDKOver5">
+        <!-- Build the badtiger classes using source=1.4 compile flag -->
+        <echo message="BadTiger build"/>
+        <javac destdir="${runtime.classes}" classpathref="axis.classpath" 
source="1.4" debug="on">
+            <src path="${runtime.dir}"/>
+            <include name="**/axis/badtiger/**"/>
+        </javac>
+        <!-- Build the axis classes -->
+        <echo message="AXIS build"/>
+        <javac destdir="${runtime.classes}" classpathref="axis.classpath" 
debug="on">
+            <src path="${runtime.dir}"/>
+            <include name="**/axis/**"/>
+            <exclude name="**/axis/badtiger/**"/>
+        </javac>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- Jars up the classes, libraries, and resources. -->
+    <!-- ==================================================================== 
-->
+    <target name="build" depends="classes" if="isJDKOver5">
+        <echo message="--------------------------------------------------"/>
+        <echo message="|      WSM build starting                    |"/>
+        <echo message="--------------------------------------------------"/>
+        <jar jarfile="${wsm.jar}">
+            <fileset dir="${api.classes}"/>
+            <fileset dir="${runtime.classes}">
+                <exclude name="**/axis/**"/>
+            </fileset>
+        </jar>
+        <echo message="--------------------------------------------------"/>
+        <echo message="|      WSM build ending                      |"/>
+        <echo message="--------------------------------------------------"/>
+    </target>
+    <target name="build_axis" depends="axis" if="isJDKOver5">
+        <echo message="--------------------------------------------------"/>
+        <echo message="|      WSM-AXIS build starting                    |"/>
+        <echo message="--------------------------------------------------"/>
+        <jar jarfile="${wsm-axis.jar}">
+            <fileset dir="${runtime.classes}">
+                <include name="**/axis/**"/>
+            </fileset>
+        </jar>
+        <echo message="--------------------------------------------------"/>
+        <echo message="|      WSM-AXIS build ending                      |"/>
+        <echo message="--------------------------------------------------"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- build_all.  build this project and all inter-project dependencies    
-->
+    <!-- ==================================================================== 
-->
+    <target name="build_all" depends="build, build_axis"/>
+    <!-- ==================================================================== 
-->
+    <!-- clean  -->
+    <!-- ==================================================================== 
-->
+    <target name="clean">
+        <delete dir="${build.dir}"/>
+        <ant dir="drt" target="clean" inheritAll="false"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- clean_all  -->
+    <!-- ==================================================================== 
-->
+    <target name="clean_all">
+        <antcall target="clean"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- redeploy  -->
+    <!-- ==================================================================== 
-->
+    <target name="redeploy">
+        <antcall target="clean"/>
+        <antcall target="build"/>
+        <antcall target="deploy"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- redeploy_all  -->
+    <!-- ==================================================================== 
-->
+    <target name="redeploy_all">
+        <antcall target="clean_all"/>
+        <antcall target="build_all"/>
+        <antcall target="deploy_all"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- deploy -->
+    <!-- ==================================================================== 
-->
+    <target name="deploy" depends="build_all" if="isJDKOver5">
+        <echo message="--------------------------------------------------"/>
+        <echo message="|      WSM deploy starting                 |"/>
+        <echo message="--------------------------------------------------"/>
+        <mkdir dir="${webapps.dist.dir}"/>
+        <copy todir="${webapps.dist.dir}/${axis.dir}">
+            <fileset dir="${webapps.dir}/${axis.dir}"/>
+        </copy>
+        <copy todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib">
+            <fileset refid="axis.jars"/>
+        </copy>
+        <copy todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib">
+            <fileset dir="${jars.dir}" includes="**/*.jar"/>
+        </copy>
+        <copy file="${log4j.jar}" 
todir="${webapps.dist.dir}/${axis.dir}/WEB-INF/lib"/>
+        <echo message="--------------------------------------------------"/>
+        <echo message="|       WSM deploy ending                   |"/>
+        <echo message="--------------------------------------------------"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- deploy_all -->
+    <!-- ==================================================================== 
-->
+    <target name="deploy_all">
+        <antcall target="deploy"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- minprod -->
+    <!-- ==================================================================== 
-->
+    <target name="minprod">
+        <echo message="--------------------------------------------------"/>
+        <echo message="|       WSM minprod starting                 |"/>
+        <echo message="--------------------------------------------------"/>
+        <antcall target="deploy"/>
+        <echo message="--------------------------------------------------"/>
+        <echo message="|       WSM minprod completed                |"/>
+        <echo message="--------------------------------------------------"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- docs -->
+    <!-- ==================================================================== 
-->
+    <target name="docs" if="isJDKOver5">
+        <javadoc destdir="${docs.dir}/reference/classref_wsm" maxmemory="256M" 
windowtitle="WSM Documentation" doctitle="Web Services Metadata" version="true" 
author="false" use="true" additionalparam="-breakiterator -noqualifier all 
-notimestamp " useexternalfile="true" classpathref="axis.classpath">
+            <packageset dir="${api.dir}" defaultexcludes="yes">
         </packageset>
-                       <packageset dir="${runtime.dir}" defaultexcludes="yes">
-                               <exclude name="**/axis/badtiger"/>
-                       </packageset>
-               </javadoc>
-               <fixcrlf srcdir="${docs.dir}"/>
-       </target>
-       <!-- 
==================================================================== -->
-       <!-- drt -->
-       <!-- 
==================================================================== -->
-       <target name="drt" depends="build_all">
-               <ant dir="drt" target="drt" inheritAll="false"/>
-       </target>
+            <packageset dir="${runtime.dir}" defaultexcludes="yes">
+                <exclude name="**/axis/badtiger"/>
+            </packageset>
+        </javadoc>
+        <fixcrlf srcdir="${docs.dir}"/>
+    </target>
+    <!-- ==================================================================== 
-->
+    <!-- drt -->
+    <!-- ==================================================================== 
-->
+    <target name="drt" depends="build_all">
+        <ant dir="drt" target="drt" inheritAll="false"/>
+    </target>
 </project>

Reply via email to