Author: mmerz
Date: Tue Sep 21 14:20:50 2004
New Revision: 46999
Modified:
incubator/beehive/trunk/wsm/samples/dropInDeployment/AddressBook/server/build.xml
Log:
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 14:20:50 2004
@@ -1,111 +1,94 @@
<?xml version="1.0" ?>
<project name="AddressBookWS" default="all">
- <property environment="env"/>
- <property name="webapp.dir" value="${env.TOMCAT_HOME}\webapps\"/>
- <property name="AnnotatedAxis.base.dir"
value="${webapp.dir}\AnnotatedAxis\"/>
-
- <condition property="isJDK15">
- <equals arg1="${ant.java.version}" arg2="1.5"/>
- </condition>
-
- <path id="jars">
- <fileset dir="${AnnotatedAxis.base.dir}/WEB-INF/lib/">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <target name="all" depends="verify,compile, test, build_deploy"/>
+ <property environment="env"/>
+ <property name="webapp.dir" value="${env.TOMCAT_HOME}/webapps"/>
+ <property name="AnnotatedAxis.base.dir"
value="${webapp.dir}/AnnotatedAxis"/>
+
+ <condition property="isJDK15">
+ <equals arg1="${ant.java.version}" arg2="1.5"/>
+ </condition>
+
+ <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">
+ <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="clean">
- <delete dir="build"/>
- </target>
-
- <target name="dirs">
- <mkdir dir="build/classes"/>
- </target>
-
- <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 >
- <not>
- <available
file="${webapp.dir}" />
- </not>
- </condition>
- </fail>
- <fail message="Failed to find the AnnotatedAxis webapp. Make
sure the AnnotatedAxis is deployed to your webapps directory.">
- <condition >
- <not>
- <isset property="AnnotatedAxis.base.dir"/>
- </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>
-
-
- <target name="compile" depends="dirs" if="isJDK15">
- <javac srcdir="src"
- destdir="build/classes"
- classpathref="jars"
- failonerror="true"
- />
-
-
- </target>
-
-
-
- <target name="test" depends="compile, verify">
- <javac srcdir="tests"
- destdir="build/classes"
- classpathref="jars"
- failonerror="true"
- />
-
+ <target name="build" depends="verify, compile, test">
+ <jar jarfile="AddressBookWS.jar" >
+ <fileset dir="build/classes" >
+ <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>
+
+ <target name="test" depends="verify, compile">
+ <javac srcdir="tests"
+ destdir="build/classes"
+ classpathref="jars"
+ failonerror="true" />
<junit printsummary="yes" haltonfailure="yes">
- <classpath>
- <pathelement location= "build/classes"/>
- <path refid="jars"/>
- </classpath>
-
- <formatter type="plain"/>
-
- <batchtest fork="yes" todir=".">
- <fileset dir="tests">
- <include name="**/*Test*.java"/>
- </fileset>
- </batchtest>
+ <classpath>
+ <pathelement location= "build/classes"/>
+ <path refid="jars"/>
+ </classpath>
+ <formatter type="plain"/>
+ <batchtest fork="yes" todir=".">
+ <fileset dir="tests">
+ <include name="**/*Test*.java"/>
+ </fileset>
+ </batchtest>
</junit>
-
-
- </target>
-
-
- <target name="build_deploy" depends="verify,compile, test">
- <jar jarfile="AddressBookWS.jar" >
- <fileset dir="build/classes" >
- <exclude name="**/Test.class"/>
- </fileset>
- </jar>
-
- </target>
- <target name="deploy" depends="verify,compile, test, build_deploy"
if="AnnotatedAxis.base.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>
+
+ <target name="clean">
+ <delete dir="build"/>
+ </target>
+
+ <target name="dirs">
+ <mkdir dir="build/classes"/>
+ </target>
+
+ <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>
+ <not>
+ <available file="${webapp.dir}" />
+ </not>
+ </condition>
+ </fail>
+ <fail message="Failed to find the AnnotatedAxis webapp. Make sure the
AnnotatedAxis is deployed to your webapps directory.">
+ <condition>
+ <not>
+ <isset property="AnnotatedAxis.base.dir"/>
+ </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>
