You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by mm...@apache.org on 2005/01/25 00:45:09 UTC
svn commit: r126327 - /incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/attachments /incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/build.xml
Author: mmerz
Date: Mon Jan 24 15:45:06 2005
New Revision: 126327
URL: http://svn.apache.org/viewcvs?view=rev&rev=126327
Log:
Fixed build file for AddressBookWS sample -- now uses new macros.
Removed:
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/attachments/
Modified:
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/build.xml
Modified: incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/build.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/build.xml?view=diff&rev=126327&p1=incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/build.xml&r1=126326&p2=incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/build.xml&r2=126327
==============================================================================
--- incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/build.xml Mon Jan 24 15:45:06 2005
@@ -20,106 +20,75 @@
<project name="AddressBookWS" default="build" basedir=".">
- <property environment="env" />
+ <import file="../../../beehive-imports.xml" />
- <property name="build.dir" location="build" />
- <property name="gen.dir" location="${build.dir}/gen" />
- <property name="classes.dir" location="${build.dir}/classes" />
-
- <condition property="isJDK15">
- <equals arg1="${ant.java.version}" arg2="1.5" />
- </condition>
-
- <path id="jars">
- <fileset dir="./lib" >
- <include name="**/*.jar" />
- </fileset>
- </path>
-
-
- <!-- ========================================= -->
- <!-- build - build jar-file -->
- <!-- ========================================= -->
-
- <target name="build" depends="compile">
- <jar jarfile="./lib/AddressBookWS.jar">
- <fileset dir="${classes.dir}" />
- </jar>
- </target>
-
-
- <!-- ========================================= -->
- <!-- compile - compile sources -->
- <!-- ========================================= -->
-
-
- <target name="compile" depends="update_jars, dirs" if="isJDK15" >
- <taskdef name="apt" classname="org.apache.beehive.controls.runtime.generator.AptTask" classpath="lib/controls.jar" onerror="report" />
-
- <apt srcdir="./src" destdir="${classes.dir}" gendir="${gen.dir}" compileByExtension="true"
- classpathref="jars" srcExtensions="*.java,*.jcx,*.jcs,*.jws" >
-
- </apt>
-
- </target>
-
- <target name="update_jars" >
- <property name="log4j.jar" location="${env.BEEHIVE_HOME}/external/log4j/log4j-1.2.8.jar" />
- <property name="junit.jar" location="${env.BEEHIVE_HOME}/external/junit/junit.jar" />
- <property name="velocity14.jar" location="${env.BEEHIVE_HOME}/external/velocity/velocity-1.4.jar" />
- <property name="velocitydep14.jar" location="${env.BEEHIVE_HOME}/external/velocity/velocity-dep-1.4.jar" />
- <property name="derby.jar" location="${env.BEEHIVE_HOME}/external/derby/derby_46005.jar" />
- <property name="xbean.jar" location="${env.BEEHIVE_HOME}/external/xmlbeans/apache-xbean.jar" />
-
- <copy todir="lib" >
- <fileset file="${log4j.jar}"/>
- <fileset file="${xbean.jar}"/>
-
- <!-- these are required by Controls and WSM -->
- <fileset file="${velocity14.jar}" />
- <fileset file="${velocitydep14.jar}"/>
- <fileset dir="${env.BEEHIVE_HOME}/wsm/lib">
- <include name="wsdltypes.jar"/>
- </fileset>
-
- <fileset dir="${env.BEEHIVE_HOME}/wsm/external">
- <include name="axis.jar"/>
- <include name="axis-ant.jar"/>
- <include name="jaxrpc.jar"/>
- <include name="saaj.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="commons-discovery.jar"/>
- </fileset>
-
- <fileset dir="${env.BEEHIVE_HOME}/wsm/build/jars">
- <include name="wsm.jar"/>
- <include name="wsm-axis.jar"/>
- </fileset>
- <fileset dir="${env.BEEHIVE_HOME}/controls/build/jars">
- <include name="controls.jar"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ========================================= -->
- <!-- dirs - create dirs required for compile -->
- <!-- ========================================= -->
-
- <target name="dirs">
- <mkdir dir="${classes.dir}" />
- <mkdir dir="${gen.dir}" />
- </target>
-
-
- <!-- ========================================= -->
- <!-- clean - remove build files -->
- <!-- ========================================= -->
-
- <target name="clean" >
- <delete file="velocity.log" />
- <delete file="./lib/AddressBookWS.jar" />
- <delete dir="${build.dir}" />
- <delete dir="${gen.dir}" />
- </target>
+ <property name="attachments.dir" location="attachments" />
+ <property name="classes.dir" location="classes" />
+ <property name="gen.dir" location="gen" />
+ <property name="lib.dir" location="lib" />
+
+ <condition property="isJDK15">
+ <equals arg1="${ant.java.version}" arg2="1.5" />
+ </condition>
+
+ <path id="jars">
+ <fileset dir="${lib.dir}" >
+ <include name="**/*.jar" />
+ </fileset>
+ </path>
+
+
+ <!-- ========================================= -->
+ <!-- build - build jar-file -->
+ <!-- ========================================= -->
+
+ <target name="build" depends="dirs">
+ <copy-controls todir="${lib.dir}" />
+ <deploy-wsm webappDir=".." />
+ <build-webapp webappDir=".." />
+ <jar jarfile="${lib.dir}/AddressBookWS.jar">
+ <fileset dir="${classes.dir}" />
+ </jar>
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- clean - remove build files -->
+ <!-- ========================================= -->
+
+ <target name="clean" >
+ <delete dir="${attachments.dir}" />
+ <delete file="${lib.dir}/AddressBookWS.jar" />
+ <delete file="velocity.log" />
+ <clean-webapp webappDir=".." />
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- deploy - add webservice to container -->
+ <!-- ========================================= -->
+
+ <target name="deploy" >
+ <deploy-webapp webappDir=".." contextPath="AddressBookWS" />
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- undeploy - remove webservice from container -->
+ <!-- ========================================= -->
+
+ <target name="undeploy" >
+ <undeploy-webapp contextPath="AddressBookWS" />
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- dirs - create dirs required for compile -->
+ <!-- ========================================= -->
+
+ <target name="dirs">
+ <mkdir dir="${attachments.dir}" />
+ <mkdir dir="${classes.dir}" />
+ </target>
</project>