Author: mmerz
Date: Tue Sep 21 15:46:13 2004
New Revision: 47006
Modified:
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/build.xml
Log:
More improvements for build.xml
Modified:
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/build.xml
==============================================================================
---
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/build.xml
(original)
+++
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/build.xml
Tue Sep 21 15:46:13 2004
@@ -1,70 +1,137 @@
<?xml version="1.0" ?>
-<project name="AddressBookWS" default="all">
+<project name="AddressBookWS" default="usage">
- <property environment="env"/>
- <property name="webapp.dir" value="${env.TOMCAT_HOME}/webapps"/>
- <property name="AnnotatedAxis.base.dir"
value="${webapp.dir}/AnnotatedAxis"/>
+ <property environment="env"/>
+
+ <property name="build.dir" location="build"/>
+ <property name="webapp.dir" value="${env.CATALINA_HOME}/webapps"/>
+ <property name="classes.dir" location="${build.dir}/classes"/>
+ <property name="logs.dir" location="logs"/>
+ <property name="test.dir" location="tests"/>
<condition property="isJDK15">
<equals arg1="${ant.java.version}" arg2="1.5"/>
</condition>
+ <property name="AnnotatedAxis.base.dir"
value="${webapp.dir}/AnnotatedAxis"/>
<path id="jars">
<fileset dir="${AnnotatedAxis.base.dir}/WEB-INF/lib/">
<include name="**/*.jar"/>
</fileset>
</path>
-
- <target name="all" depends="verify, compile, test, build"/>
- <target name="deploy" depends="all" if="AnnotatedAxis.base.dir">
+
+ <!-- ========================================= -->
+ <!-- deploy - deploy into Servlet container -->
+ <!-- ========================================= -->
+
+ <!-- Can be done automatically or manually -->
+ <target name="deploy" depends="build" if="AnnotatedAxis.base.dir">
+ <echo message="** Deploying Web service to ${webapp.dir} **" />
<copy file="AddressBookWS.jar"
todir="${AnnotatedAxis.base.dir}/WEB-INF/lib/" overwrite="true" />
<copy file="web/AddressBookWebService.jws"
todir="${AnnotatedAxis.base.dir}/" overwrite="true" />
</target>
-
- <target name="build" depends="verify, compile, test">
+
+
+ <!-- ========================================= -->
+ <!-- build - build jar-file -->
+ <!-- ========================================= -->
+
+ <target name="build" depends="test">
<jar jarfile="AddressBookWS.jar" >
- <fileset dir="build/classes" >
+ <fileset dir="${classes.dir}" >
<exclude name="**/Test.class"/>
</fileset>
</jar>
</target>
- <target name="compile" depends="dirs" if="isJDK15">
- <javac srcdir="src"
- destdir="build/classes"
- classpathref="jars"
- failonerror="true" />
- </target>
-
+
+ <!-- ========================================= -->
+ <!-- test - run junit tests -->
+ <!-- ========================================= -->
+
<target name="test" depends="verify, compile">
- <javac srcdir="tests"
- destdir="build/classes"
+ <javac srcdir="${test.dir}"
+ destdir="${classes.dir}"
classpathref="jars"
failonerror="true" />
- <junit printsummary="yes" haltonfailure="yes">
+ <echo message="** writing junit log-files to ${logs.dir} **" />
+ <junit haltonfailure="yes" printsummary="yes" tempdir="${build.dir}"
fork="yes">
<classpath>
- <pathelement location= "build/classes"/>
+ <pathelement location= "${classes.dir}"/>
<path refid="jars"/>
</classpath>
<formatter type="plain"/>
- <batchtest fork="yes" todir=".">
- <fileset dir="tests">
+ <batchtest todir="${logs.dir}" fork="yes">
+ <fileset dir="${test.dir}">
<include name="**/*Test*.java"/>
</fileset>
</batchtest>
</junit>
</target>
+
- <target name="clean">
- <delete dir="build"/>
+ <!-- ========================================= -->
+ <!-- compile - compile sources -->
+ <!-- ========================================= -->
+
+ <target name="compile" depends="dirs" if="isJDK15">
+ <javac srcdir="src"
+ destdir="${classes.dir}"
+ classpathref="jars"
+ failonerror="true" />
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- usage - output usage -->
+ <!-- ========================================= -->
+ <target name="usage">
+ <echo message="" />
+ <echo message="AddressBookWS build file" />
+ <echo message="" />
+ <echo
message="+==============================================================+" />
+ <echo message="| Usage
|" />
+ <echo
message="+==============================================================+" />
+ <echo message="" />
+ <echo message="deploy - deploy into servlet container" />
+ <echo message="build - build jar-file" />
+ <echo message="compile - compile source files" />
+ <echo message="clean - remove build files" />
+ <echo message="test - run unit tests" />
+ <echo message="" />
+ <echo
message="+==============================================================+" />
+ <echo message="| NOTE: THE WSM PROJECT ONLY BUILDS ON JDK1.5
|" />
+ <echo
message="+==============================================================+" />
+ <echo message="" />
</target>
+
+ <!-- ========================================= -->
+ <!-- dirs - create dirs required for compile -->
+ <!-- ========================================= -->
+
<target name="dirs">
- <mkdir dir="build/classes"/>
+ <mkdir dir="${classes.dir}" />
+ <mkdir dir="${logs.dir}" />
</target>
-
+
+
+ <!-- ========================================= -->
+ <!-- clean - remove build files -->
+ <!-- ========================================= -->
+
+ <target name="clean">
+ <delete dir="${classes.dir}"/>
+ <delete dir="${logs.dir}"/>
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- verify - check environment -->
+ <!-- ========================================= -->
+
<target name="verify">
<fail message="Failed to find the webapps directory. Set webapp.dir
in the build.xml to your servlet container's webapp directory.">
<condition>
@@ -80,15 +147,6 @@
</not>
</condition>
</fail>
- <fail message="Failed to find required jar files in the Annototated
Axis">
- <condition>
- <not>
- <and>
- <available
file="${AnnotatedAxis.base.dir}/WEB-INF/lib/wsm.jar"
property="annotated.axis.present"/>
- <available
file="${AnnotatedAxis.base.dir}/WEB-INF/lib/wsm-axis.jar"
property="annotated.axis.present"/>
- </and>
- </not>
- </condition>
- </fail>
</target>
+
</project>
