Author: ekoneil
Date: Fri Aug 12 09:32:40 2005
New Revision: 232328
URL: http://svn.apache.org/viewcvs?rev=232328&view=rev
Log:
Cleaning up formatting in the Ant build files shipped in the Beehive
distribution.
BB: self
DRT: build.dist pass
Modified:
beehive/trunk/samples/controls-webservices-blank/build.xml
beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml
beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml
beehive/trunk/samples/wsm-blank/WEB-INF/src/build.properties
beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml
beehive/trunk/samples/wsm-employee/WEB-INF/src/build-client.xml
beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml
beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml
Modified: beehive/trunk/samples/controls-webservices-blank/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/samples/controls-webservices-blank/build.xml?rev=232328&r1=232327&r2=232328&view=diff
==============================================================================
--- beehive/trunk/samples/controls-webservices-blank/build.xml (original)
+++ beehive/trunk/samples/controls-webservices-blank/build.xml Fri Aug 12
09:32:40 2005
@@ -19,95 +19,92 @@
-->
<project name="controls-webservices-blank" basedir="." default="usage">
- <property environment="os" />
- <property file="build.properties" />
+ <property environment="os"/>
+ <property file="build.properties"/>
- <import file="${beehive.home}/beehive-imports.xml" />
- <import file="${beehive.home}/ant/beehive-tools.xml" />
+ <import file="${beehive.home}/beehive-imports.xml"/>
+ <import file="${beehive.home}/ant/beehive-tools.xml"/>
- <property name="junit.source.dir" location="junit" />
- <property name="build.dir" location="build" />
- <property name="build.classes" location="${build.dir}/classes" />
- <property name="build.beansrc" location="${build.dir}/beansrc" />
- <property name="lib.dir" location="./lib" />
-
- <!-- Service control specific properties -->
- <property name="gen.source.dir" location="${build.dir}/jcxsrc" />
- <property name="my.service.control.package" value="mypackage" />
- <property name="schema.dir" location="schemas" />
- <property name="xmlbean.type.gen.dir"
location="${build.dir}/xmlbeantypes" />
- <property name="build.jar" value="myservicecontrols.jar" />
- <property name="test.logs" location="logs" />
- <property name="junit.build.dir" location="${build.dir}/junitclasses" />
- <property name="junit.build.beansrc"
location="${build.dir}/junitbeansrc" />
-
- <path id="lib.path">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar" />
- </fileset>
- </path>
-
- <path id="build.classpath">
- <path refid="lib.path" />
- <pathelement location="${build.classes}" />
- </path>
-
- <path id="run.classpath">
- <path refid="lib.path" />
- <pathelement location="${servlet-api.jar}" />
- <pathelement location="${jsp-api.jar}" />
- <pathelement path="${build.dir}/${build.jar}" />
- <pathelement path="${junit.build.dir}" />
- </path>
-
- <target name="clean" description="Delete all generated files">
- <delete dir="${build.dir}" />
- <delete file="velocity.log" />
- <delete dir="${test.logs}" />
- <delete dir="${lib.dir}" />
- </target>
-
- <target name="dirs">
- <mkdir dir="${build.classes}" />
- <mkdir dir="${lib.dir}" />
- <mkdir dir="${build.beansrc}" />
- <mkdir dir="${xmlbean.type.gen.dir}" />
- <mkdir dir="${test.logs}" />
- <mkdir dir="${junit.build.dir}" />
- <mkdir dir="${junit.build.beansrc}" />
- <mkdir dir="${gen.source.dir}" />
- </target>
-
-
-
- <!-- copy all dependencies -->
- <target name="deploy-beehive" depends="dirs">
- <deploy-controls destDir="${lib.dir}" />
- <copy todir="${lib.dir}">
- <fileset file="${beehive.home}/lib/wsm/*.jar" />
- <fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset
file="${beehive.home}/lib/controls/beehive-webservice-control.jar" />
- </copy>
- </target>
-
- <target name="build" depends="gen-svc-ctrl" description="Build control
sources">
- <build-controls srcdir="${gen.source.dir}"
destdir="${build.classes}" tempdir="${build.beansrc}"
classpathref="build.classpath" />
- <!-- have the wsdls, in the same dir as the jcx files -->
- <copy todir="${build.classes}">
- <fileset dir="${gen.source.dir}/">
- <include name="**/*.wsdl" />
- </fileset>
- </copy>
- <control-jar destfile="${build.dir}/${build.jar}"
basedir="${build.classes}" />
- </target>
+ <property name="junit.source.dir" location="junit"/>
+ <property name="build.dir" location="build"/>
+ <property name="build.classes" location="${build.dir}/classes"/>
+ <property name="build.beansrc" location="${build.dir}/beansrc"/>
+ <property name="lib.dir" location="./lib"/>
+
+ <!-- Service control specific properties -->
+ <property name="gen.source.dir" location="${build.dir}/jcxsrc"/>
+ <property name="my.service.control.package" value="mypackage"/>
+ <property name="schema.dir" location="schemas"/>
+ <property name="xmlbean.type.gen.dir"
location="${build.dir}/xmlbeantypes"/>
+ <property name="build.jar" value="myservicecontrols.jar"/>
+ <property name="test.logs" location="logs"/>
+ <property name="junit.build.dir" location="${build.dir}/junitclasses"/>
+ <property name="junit.build.beansrc" location="${build.dir}/junitbeansrc"/>
+
+ <path id="lib.path">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="build.classpath">
+ <path refid="lib.path"/>
+ <pathelement location="${build.classes}"/>
+ </path>
+
+ <path id="run.classpath">
+ <path refid="lib.path"/>
+ <pathelement location="${servlet-api.jar}"/>
+ <pathelement location="${jsp-api.jar}"/>
+ <pathelement path="${build.dir}/${build.jar}"/>
+ <pathelement path="${junit.build.dir}"/>
+ </path>
+
+ <target name="clean" description="Delete all generated files">
+ <delete dir="${build.dir}"/>
+ <delete file="velocity.log"/>
+ <delete dir="${test.logs}"/>
+ <delete dir="${lib.dir}"/>
+ </target>
+
+ <target name="dirs">
+ <mkdir dir="${build.classes}"/>
+ <mkdir dir="${lib.dir}"/>
+ <mkdir dir="${build.beansrc}"/>
+ <mkdir dir="${xmlbean.type.gen.dir}"/>
+ <mkdir dir="${test.logs}"/>
+ <mkdir dir="${junit.build.dir}"/>
+ <mkdir dir="${junit.build.beansrc}"/>
+ <mkdir dir="${gen.source.dir}"/>
+ </target>
+
+ <!-- copy all dependencies -->
+ <target name="deploy-beehive" depends="dirs">
+ <deploy-controls destDir="${lib.dir}"/>
+ <copy todir="${lib.dir}">
+ <fileset file="${beehive.home}/lib/wsm/*.jar"/>
+ <fileset file="${beehive.home}/lib/common/*.jar"/>
+ <fileset
file="${beehive.home}/lib/controls/beehive-webservice-control.jar"/>
+ </copy>
+ </target>
+ <target name="build" depends="gen-svc-ctrl" description="Build control
sources">
+ <build-controls srcdir="${gen.source.dir}" destdir="${build.classes}"
tempdir="${build.beansrc}" classpathref="build.classpath"/>
+ <!-- have the wsdls, in the same dir as the jcx files -->
+ <copy todir="${build.classes}">
+ <fileset dir="${gen.source.dir}/">
+ <include name="**/*.wsdl"/>
+ </fileset>
+ </copy>
+ <control-jar destfile="${build.dir}/${build.jar}"
basedir="${build.classes}"/>
+ </target>
- <!-- Generate the service control, should run after types have been
generated. -->
- <target name="gen-svc-ctrl" depends="gen-types">
+ <!-- Generate the service control, should run after types have been
generated. -->
+ <target name="gen-svc-ctrl" depends="gen-types">
<path id="scgen.dependencies">
- <path refid="build.classpath" />
- <pathelement location="${build.classes}" />
+ <path refid="build.classpath"/>
+ <pathelement location="${build.classes}"/>
</path>
<taskdef name="scgen"
@@ -117,122 +114,113 @@
<scgen srcdir="${schema.dir}" destdir="${gen.source.dir}"
destPackageName="${my.service.control.package}"/>
<!-- have the wsdls, in the same dir as the jcx files -->
- <copy todir="${gen.source.dir}/${my.service.control.package}">
- <fileset dir="${schema.dir}">
- <include name="**/*.wsdl" />
- </fileset>
- </copy>
- </target>
-
-
-
- <!-- Generate types for the WSDL and Scheams -->
- <!--
-
***********************************************************************************
- NOTE: The type generation uses Apache XMLBeans compiler. The
Compiler doesn't support RPC/Encoded style.
- To generate types for RPC/Encoded web service you need to use
Axis's tools.
-
- <property name="encoded.schema.dir" value="rpc-schemas" />
- <property name="encoded.type.gen.dir"
value="${build.dir}/encodedtypes" />
-
-
- <target name="gen-axis-types" depends="check-axis-types, dirs"
unless="gen-axis-types-are-uptodate">
- <taskdef name="encodedtypegen"
classname="org.apache.beehive.wsm.axis.ant.AxisTypeGeneratorTask">
- <classpath>
- <path refid="build.classpath" />
- </classpath>
- </taskdef>
-
- <encodedtypegen wsdldir="${encoded.schema.dir}"
outputdir="${encoded.type.gen.dir}" />
- <javac srcdir="${encoded.type.gen.dir}"
destdir="${build.classes}" classpathref="build.classpath" debug="true" />
- </target>
-
-
-
- <target name="check-axis-types">
- <uptodate property="gen-axis-types-are-uptodate"
targetfile="${encoded.type.gen.dir}">
- <srcfiles dir="${encoded.schema.dir}"
includes="*.wsdl" />
- </uptodate>
-
- </target>
-
***********************************************************************************
+ <copy todir="${gen.source.dir}/${my.service.control.package}">
+ <fileset dir="${schema.dir}">
+ <include name="**/*.wsdl"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- Generate types for the WSDL and Scheams -->
+ <!--
+
***********************************************************************************
+ NOTE: The type generation uses Apache XMLBeans compiler. The Compiler
doesn't support RPC/Encoded style.
+ To generate types for RPC/Encoded web service you need to use Axis's
tools.
+
+ <property name="encoded.schema.dir" value="rpc-schemas"/>
+ <property name="encoded.type.gen.dir"
value="${build.dir}/encodedtypes"/>
+
+
+ <target name="gen-axis-types" depends="check-axis-types, dirs"
unless="gen-axis-types-are-uptodate">
+ <taskdef name="encodedtypegen"
classname="org.apache.beehive.wsm.axis.ant.AxisTypeGeneratorTask">
+ <classpath>
+ <path refid="build.classpath"/>
+ </classpath>
+ </taskdef>
+
+ <encodedtypegen wsdldir="${encoded.schema.dir}"
outputdir="${encoded.type.gen.dir}"/>
+ <javac srcdir="${encoded.type.gen.dir}" destdir="${build.classes}"
classpathref="build.classpath" debug="true"/>
+ </target>
+
+
+
+ <target name="check-axis-types">
+ <uptodate property="gen-axis-types-are-uptodate"
targetfile="${encoded.type.gen.dir}">
+ <srcfiles dir="${encoded.schema.dir}" includes="*.wsdl"/>
+ </uptodate>
+
+ </target>
+
***********************************************************************************
-->
- <target name="gen-types" depends="checktypes, deploy-beehive, dirs"
unless="gen-types-are-uptodate">
- <!-- XMLBean build -->
- <taskdef name="xmlbeanbuild"
classname="org.apache.xmlbeans.impl.tool.XMLBean">
- <classpath>
- <path refid="xbean.dependency.path" />
- </classpath>
- </taskdef>
-
- <xmlbeanbuild schema="${schema.dir}"
srcgendir="${xmlbean.type.gen.dir}" classgendir="${build.classes}"
failonerror="true">
- <classpath>
- <path refid="build.classpath" />
- </classpath>
- </xmlbeanbuild>
- </target>
-
- <target name="checktypes">
- <uptodate property="gen-types-are-uptodate"
targetfile="${xmlbean.type.gen.dir}">
- <srcfiles dir="${schema.dir}" includes="*.wsdl,*.xsd" />
- </uptodate>
- </target>
-
-
-
-
- <!-- Build the junit tests -->
- <target name="build.junit" depends="build">
- <build-controls srcdir="${junit.source.dir}"
destdir="${junit.build.dir}" tempdir="${junit.build.beansrc}"
classpathref="run.classpath" />
-
- <!-- have the wsdls, in the same dir as the jcx files -->
- <copy todir="${junit.build.dir}">
- <fileset dir="${junit.source.dir}">
- <include name="**/*.properties" />
- <include name="**/*.xml" />
- <include name="**/*.properties" />
- </fileset>
- </copy>
- </target>
-
-
- <target name="run.junit" depends="build.junit">
-
- <echo message="** junit logfiles written to ${test.logs} **" />
- <junit failureproperty="testfailed" printsummary="on"
tempdir="${junit.build.dir}" fork="yes">
- <classpath>
- <path refid="run.classpath" />
- </classpath>
- <formatter type="plain" />
- <batchtest filtertrace="off" todir="${test.logs}">
- <fileset dir="${junit.source.dir}">
- <include name="**/*Test.java" />
- </fileset>
- </batchtest>
- </junit>
- <fail if="testfailed" message="One or more tests failed. The
unit test requires
- the wsm-addressbook-enhanced web serivce to be running.
Please verify
- that http://localhost:8080/EnhancedAddressBook/ is available before
trying the unit testing.
- See the
http://incubator.apache.org/beehive/wsm/sample_AddressBookEnhanced.html for
instruction
- on running the sample." />
- </target>
-
-
- <target name="usage" description="Print the usage for this build.xml">
- <echo message="" />
- <echo message="" />
- <echo message="Service Controls Project Template Build file" />
- <echo message="" />
- <echo message="" />
- <echo
message="----------------------------------------------------------------" />
- <echo message="| Standard Targets
|" />
- <echo
message="----------------------------------------------------------------" />
- <echo message="clean - Delete all generated
files" />
- <echo message="build - Build control sources" />
- <echo message="gen-types - Just generate the types
from schemas" />
- <echo message="run.junit - Run Junit tests for the
service control" />
- <echo
message="----------------------------------------------------------------" />
- </target>
+ <target name="gen-types" depends="checktypes, deploy-beehive, dirs"
unless="gen-types-are-uptodate">
+ <!-- XMLBean build -->
+ <taskdef name="xmlbeanbuild"
classname="org.apache.xmlbeans.impl.tool.XMLBean">
+ <classpath>
+ <path refid="xbean.dependency.path"/>
+ </classpath>
+ </taskdef>
+
+ <xmlbeanbuild schema="${schema.dir}"
srcgendir="${xmlbean.type.gen.dir}" classgendir="${build.classes}"
failonerror="true">
+ <classpath>
+ <path refid="build.classpath"/>
+ </classpath>
+ </xmlbeanbuild>
+ </target>
+
+ <target name="checktypes">
+ <uptodate property="gen-types-are-uptodate"
targetfile="${xmlbean.type.gen.dir}">
+ <srcfiles dir="${schema.dir}" includes="*.wsdl,*.xsd"/>
+ </uptodate>
+ </target>
+
+ <!-- Build the junit tests -->
+ <target name="build.junit" depends="build">
+ <build-controls srcdir="${junit.source.dir}"
destdir="${junit.build.dir}" tempdir="${junit.build.beansrc}"
classpathref="run.classpath"/>
+
+ <!-- have the wsdls, in the same dir as the jcx files -->
+ <copy todir="${junit.build.dir}">
+ <fileset dir="${junit.source.dir}">
+ <include name="**/*.properties"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.properties"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="run.junit" depends="build.junit">
+ <echo message="** junit logfiles written to ${test.logs} **"/>
+ <junit failureproperty="testfailed" printsummary="on"
tempdir="${junit.build.dir}" fork="yes">
+ <classpath>
+ <path refid="run.classpath"/>
+ </classpath>
+ <formatter type="plain"/>
+ <batchtest filtertrace="off" todir="${test.logs}">
+ <fileset dir="${junit.source.dir}">
+ <include name="**/*Test.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <fail if="testfailed" message="One or more tests failed. The unit
test requires
+ the wsm-addressbook-enhanced web serivce to be running. Please
verify
+ that http://localhost:8080/EnhancedAddressBook/ is available
before trying the unit testing.
+ See the documentation at http://beehive.apache.org/ for
instructions on running the sample"/>
+ </target>
+
+ <target name="usage" description="Print the usage for this build.xml">
+ <echo message=""/>
+ <echo message=""/>
+ <echo message="Service Controls Project Template Build file"/>
+ <echo message=""/>
+ <echo message=""/>
+ <echo
message="----------------------------------------------------------------"/>
+ <echo message="| Standard Targets
|"/>
+ <echo
message="----------------------------------------------------------------"/>
+ <echo message="clean - Delete all generated files"/>
+ <echo message="build - Build control sources"/>
+ <echo message="gen-types - Just generate the types from
schemas"/>
+ <echo message="run.junit - Run Junit tests for the service
control"/>
+ <echo
message="----------------------------------------------------------------"/>
+ </target>
</project>
Modified: beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml?rev=232328&r1=232327&r2=232328&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml
(original)
+++ beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml Fri
Aug 12 09:32:40 2005
@@ -58,11 +58,9 @@
</jar>
</target>
-
<!-- ========================================= -->
<!-- build - build all binaries -->
<!-- ========================================= -->
-
<target name="build" depends="dirs">
<deploy-wsm webappDir="${webapp.dir}"/>
Modified: beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml?rev=232328&r1=232327&r2=232328&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml
(original)
+++ beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml Fri
Aug 12 09:32:40 2005
@@ -22,32 +22,32 @@
<property file="build.properties"/>
- <import file="${beehive.home}/beehive-imports.xml" />
- <import file="${beehive.home}/ant/beehive-tools.xml" />
+ <import file="${beehive.home}/beehive-imports.xml"/>
+ <import file="${beehive.home}/ant/beehive-tools.xml"/>
- <property name="service.name" value="fromWSDL" />
+ <property name="service.name" value="fromWSDL"/>
- <property name="webapp.dir" location="../.." />
- <property name="web.inf.dir" location="${webapp.dir}/WEB-INF" />
- <property name="attachments.dir" location="${web.inf.dir}/attachments" />
- <property name="classes.dir" location="${web.inf.dir}/classes" />
- <property name="gen.dir" location="${web.inf.dir}/gen" />
- <property name="temp.dir" location="${gen.dir}/tmp" />
- <property name="sourcegen.dir" location="${web.inf.dir}/src-ws" />
- <property name="types.gen.dir" location="${gen.dir}/types" />
-
-
- <property name="lib.dir" location="${web.inf.dir}/lib" />
- <property name="src.dir" location="${web.inf.dir}/src" />
- <property name="schema.dir" location="${web.inf.dir}/wsdl" />
- <property name="wsdl.location"
location="${schema.dir}/${service.name}.wsdl" />
+ <property name="webapp.dir" location="../.."/>
+ <property name="web.inf.dir" location="${webapp.dir}/WEB-INF"/>
+ <property name="attachments.dir" location="${web.inf.dir}/attachments"/>
+ <property name="classes.dir" location="${web.inf.dir}/classes"/>
+ <property name="gen.dir" location="${web.inf.dir}/gen"/>
+ <property name="temp.dir" location="${gen.dir}/tmp"/>
+ <property name="sourcegen.dir" location="${web.inf.dir}/src-ws"/>
+ <property name="types.gen.dir" location="${gen.dir}/types"/>
+
+
+ <property name="lib.dir" location="${web.inf.dir}/lib"/>
+ <property name="src.dir" location="${web.inf.dir}/src"/>
+ <property name="schema.dir" location="${web.inf.dir}/wsdl"/>
+ <property name="wsdl.location"
location="${schema.dir}/${service.name}.wsdl"/>
<property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
- <property name="webservice.jar"
location="${lib.dir}/${service.name}WS.jar" />
- <property name="webservice.war" location="${service.name}WS.war" />
+ <property name="webservice.jar"
location="${lib.dir}/${service.name}WS.jar"/>
+ <property name="webservice.war" location="${service.name}WS.war"/>
<path id="build.classpath">
<fileset dir="${lib.dir}">
- <include name="**/*.jar" />
+ <include name="**/*.jar"/>
</fileset>
<pathelement location="${classes.dir}"/>
</path>
@@ -58,18 +58,17 @@
<target name="war">
<jar jarfile="../../../${webservice.war}">
<fileset dir="${webapp.dir}">
- <exclude name="WEB-INF/src/**" />
- <exclude name="WEB-INF/src-ws/**" />
- <exclude name="WEB-INF/gen/**" />
+ <exclude name="WEB-INF/src/**"/>
+ <exclude name="WEB-INF/src-ws/**"/>
+ <exclude name="WEB-INF/gen/**"/>
</fileset>
</jar>
</target>
<!-- ========================================= -->
- <!-- all - source-gen and build -->
+ <!-- all - source-gen and build -->
<!-- ========================================= -->
- <target name="all" depends="source-gen, build" />
-
+ <target name="all" depends="source-gen, build"/>
<!-- ========================================= -->
<!-- build - build all binaries -->
@@ -78,37 +77,32 @@
<javac srcdir="${src.dir}" destdir="${classes.dir}"
classpathref="build.classpath"/>
<build-webservices srcdir="${sourcegen.dir}"
- destdir="${classes.dir}"
- tempdir="${temp.dir}"
- classpathref="build.classpath"/>
+ destdir="${classes.dir}"
+ tempdir="${temp.dir}"
+ classpathref="build.classpath"/>
<jar jarfile="${webservice.jar}">
- <fileset dir="${classes.dir}" />
+ <fileset dir="${classes.dir}"/>
</jar>
</target>
-
<!-- ========================================= -->
<!-- source-gen - generate source from wsdl -->
<!-- ========================================= -->
-
<target name="source-gen" depends="generate-xmlbean-datatypes">
<taskdef name="wsdl2AJava"
classname="org.apache.beehive.wsm.axis.ant.WSDL2AJavaTask">
<classpath>
- <path refid="build.classpath" />
+ <path refid="build.classpath"/>
</classpath>
</taskdef>
-
<wsdl2AJava outputdir="${sourcegen.dir}" wsdlfile="${wsdl.location}">
<classpath>
- <path refid="build.classpath" />
- <path location="${classes.dir}" />
+ <path refid="build.classpath"/>
+ <path location="${classes.dir}"/>
</classpath>
</wsdl2AJava>
-
-
</target>
<!-- ========================================= -->
@@ -118,74 +112,68 @@
<target name="generate-xmlbean-datatypes" depends="dirs,
deploy-wsm-controls">
<taskdef name="xmlbeanbuild"
classname="org.apache.xmlbeans.impl.tool.XMLBean">
<classpath>
- <path refid="build.classpath" />
+ <path refid="build.classpath"/>
</classpath>
</taskdef>
- <mkdir dir="${classes.dir}" />
- <mkdir dir="${sourcegen.dir}" />
+ <mkdir dir="${classes.dir}"/>
+ <mkdir dir="${sourcegen.dir}"/>
<xmlbeanbuild schema="${schema.dir}" srcgendir="${types.gen.dir}"
classgendir="${classes.dir}" failonerror="true">
<classpath>
- <path refid="build.classpath" />
+ <path refid="build.classpath"/>
</classpath>
</xmlbeanbuild>
</target>
-
-
-
-
<!-- ========================================= -->
<!-- clean - remove binary files -->
<!-- ========================================= -->
<target name="clean">
- <delete dir="${attachments.dir}" />
- <delete dir="${classes.dir}" />
- <delete dir="${gen.dir}" />
- <delete dir="${temp.dir}" />
- <delete dir="${sourcegen.dir}" />
- <delete dir="${lib.dir}" />
+ <delete dir="${attachments.dir}"/>
+ <delete dir="${classes.dir}"/>
+ <delete dir="${gen.dir}"/>
+ <delete dir="${temp.dir}"/>
+ <delete dir="${sourcegen.dir}"/>
+ <delete dir="${lib.dir}"/>
<delete dir="${web.inf.dir}/.tmpbeansrc"/>
<delete dir="${web.inf.dir}/build-server"/>
- <delete file="velocity.log" />
- <delete dir="${types.gen.dir}" />
+ <delete file="velocity.log"/>
+ <delete dir="${types.gen.dir}"/>
</target>
<!-- ========================================= -->
<!-- dirs - create dirs required for compile -->
<!-- ========================================= -->
<target name="dirs">
- <mkdir dir="${attachments.dir}" />
- <mkdir dir="${classes.dir}" />
- <mkdir dir="${gen.dir}" />
- <mkdir dir="${sourcegen.dir}" />
- <mkdir dir="${temp.dir}" />
- <mkdir dir="${lib.dir}" />
- <mkdir dir="${types.gen.dir}" />
+ <mkdir dir="${attachments.dir}"/>
+ <mkdir dir="${classes.dir}"/>
+ <mkdir dir="${gen.dir}"/>
+ <mkdir dir="${sourcegen.dir}"/>
+ <mkdir dir="${temp.dir}"/>
+ <mkdir dir="${lib.dir}"/>
+ <mkdir dir="${types.gen.dir}"/>
</target>
<target name="deploy-wsm-controls" depends="dirs" >
- <deploy-wsm webappDir="${webapp.dir}" />
+ <deploy-wsm webappDir="${webapp.dir}"/>
<!-- control jars are included for webservices that would use controls
-->
- <deploy-controls destDir="${webapp.dir}/WEB-INF/lib" />
+ <deploy-controls destDir="${webapp.dir}/WEB-INF/lib"/>
</target>
-
-
<target name="usage" description="Print the usage for this build.xml">
- <echo message="" />
- <echo message="" />
- <echo message="Generate a web-service from WSDL" />
- <echo message="" />
- <echo message="" />
- <echo
message="----------------------------------------------------------------" />
- <echo message="| Standard Targets
|" />
- <echo
message="----------------------------------------------------------------" />
- <echo message="clean - Delete all generated files" />
- <echo message="build - Build control sources" />
- <echo message="source-gen - Generate the JWS files. NOTE:
this will" />
- <echo message="overwrite any existing JWS files." />
- <echo
message="----------------------------------------------------------------" />
+ <echo message=""/>
+ <echo message=""/>
+ <echo message="Generate a web-service from WSDL"/>
+ <echo message=""/>
+ <echo message=""/>
+ <echo
message="----------------------------------------------------------------"/>
+ <echo message="| Standard Targets
|"/>
+ <echo
message="----------------------------------------------------------------"/>
+ <echo message="clean - Delete all generated files"/>
+ <echo message="build - Build control sources"/>
+ <echo message="source-gen - Generate the JWS files. NOTE:
this will"/>
+ <echo message="overwrite any existing JWS files."/>
+ <echo
message="----------------------------------------------------------------"/>
</target>
</project>
Modified: beehive/trunk/samples/wsm-blank/WEB-INF/src/build.properties
URL:
http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.properties?rev=232328&r1=232327&r2=232328&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-blank/WEB-INF/src/build.properties (original)
+++ beehive/trunk/samples/wsm-blank/WEB-INF/src/build.properties Fri Aug 12
09:32:40 2005
@@ -3,5 +3,8 @@
#
beehive.home=../../../..
+#
+# The name of the .war file that will be created from this webapp
+#
service.name=wsm-blank
Modified: beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml?rev=232328&r1=232327&r2=232328&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml (original)
+++ beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml Fri Aug 12 09:32:40
2005
@@ -18,86 +18,83 @@
$Header:$
-->
-<project name="Blank Sample" default="build" basedir=".">
+<project name="Beehive/Samples/WSM/Blank" default="build" basedir=".">
- <property file="build.properties"/>
+ <property file="build.properties"/>
- <import file="${beehive.home}/beehive-imports.xml" />
- <import file="${beehive.home}/ant/beehive-tools.xml" />
+ <import file="${beehive.home}/beehive-imports.xml"/>
+ <import file="${beehive.home}/ant/beehive-tools.xml"/>
- <property name="service.name" value="blank" />
+ <property name="service.name" value="blank"/>
- <property name="webapp.dir" location="../.." />
- <property name="web.inf.dir" location="${webapp.dir}/WEB-INF" />
- <property name="attachments.dir" location="${web.inf.dir}/attachments" />
- <property name="classes.dir" location="${web.inf.dir}/classes" />
- <property name="gen.dir" location="${web.inf.dir}/gen" />
- <property name="lib.dir" location="${web.inf.dir}/lib" />
- <property name="src.dir" location="${web.inf.dir}/src" />
- <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
- <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
- <property name="webservice.war" value="${service.name}WS.war" />
-
- <path id="build.classpath">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar" />
- </fileset>
- <pathelement location="${classes.dir}"/>
- </path>
+ <property name="webapp.dir" location="../.."/>
+ <property name="web.inf.dir" location="${webapp.dir}/WEB-INF"/>
+ <property name="attachments.dir" location="${web.inf.dir}/attachments"/>
+ <property name="classes.dir" location="${web.inf.dir}/classes"/>
+ <property name="gen.dir" location="${web.inf.dir}/gen"/>
+ <property name="lib.dir" location="${web.inf.dir}/lib"/>
+ <property name="src.dir" location="${web.inf.dir}/src"/>
+ <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
+ <property name="webservice.jar"
location="${lib.dir}/${service.name}WS.jar"/>
+ <property name="webservice.war" location="${service.name}WS.war"/>
+
+ <path id="build.classpath">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement location="${classes.dir}"/>
+ </path>
- <!-- ========================================= -->
- <!-- deploy.war - build deployable artifact -->
- <!-- ========================================= -->
- <target name="war">
- <jar jarfile="../../../${webservice.war}">
- <fileset dir="${webapp.dir}">
- <exclude name="WEB-INF/src/**" />
- <exclude name="WEB-INF/src-ws/**" />
- <exclude name="WEB-INF/gen/**" />
- </fileset>
- </jar>
- </target>
+ <!-- ========================================= -->
+ <!-- deploy.war - build deployable artifact -->
+ <!-- ========================================= -->
+ <target name="war">
+ <jar jarfile="../../../${webservice.war}">
+ <fileset dir="${webapp.dir}">
+ <exclude name="WEB-INF/src/**"/>
+ <exclude name="WEB-INF/src-ws/**"/>
+ <exclude name="WEB-INF/gen/**"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <!-- ========================================= -->
+ <!-- build - build all binaries -->
+ <!-- ========================================= -->
+ <target name="build" depends="dirs">
+ <deploy-wsm webappDir="${webapp.dir}"/>
+
+ <javac srcdir="${src.dir}" destdir="${classes.dir}"
classpathref="build.classpath"/>
+
+ <build-webservices srcdir="${ws-src.dir}"
+ destdir="${classes.dir}"
+ tempdir="${gen.dir}"
+ classpathref="build.classpath"/>
+ <jar jarfile="${webservice.jar}">
+ <fileset dir="${classes.dir}"/>
+ </jar>
+ </target>
-
- <!-- ========================================= -->
- <!-- build - build all binaries -->
- <!-- ========================================= -->
- <target name="build" depends="dirs">
- <deploy-wsm webappDir="${webapp.dir}"/>
-
- <javac srcdir="${src.dir}" destdir="${classes.dir}"
classpathref="build.classpath"/>
-
- <build-webservices srcdir="${ws-src.dir}"
- destdir="${classes.dir}"
- tempdir="${gen.dir}"
- classpathref="build.classpath"/>
- <jar jarfile="${webservice.jar}">
- <fileset dir="${classes.dir}" />
- </jar>
- </target>
-
+ <!-- ========================================= -->
+ <!-- clean - remove binary files -->
+ <!-- ========================================= -->
+ <target name="clean">
+ <delete dir="${attachments.dir}"/>
+ <delete dir="${classes.dir}"/>
+ <delete dir="${gen.dir}"/>
+ <delete dir="${lib.dir}"/>
+ <delete dir="${web.inf.dir}/.tmpbeansrc"/>
+ <delete dir="${web.inf.dir}/build-server"/>
+ <delete file="velocity.log"/>
+ </target>
- <!-- ========================================= -->
- <!-- clean - remove binary files -->
- <!-- ========================================= -->
- <target name="clean">
- <delete dir="${attachments.dir}" />
- <delete dir="${classes.dir}" />
- <delete dir="${gen.dir}" />
- <delete dir="${lib.dir}" />
- <delete dir="${web.inf.dir}/.tmpbeansrc"/>
- <delete dir="${web.inf.dir}/build-server"/>
- <delete file="velocity.log" />
- </target>
-
- <!-- ========================================= -->
- <!-- dirs - create dirs required for compile -->
- <!-- ========================================= -->
- <target name="dirs">
- <mkdir dir="${attachments.dir}" />
- <mkdir dir="${classes.dir}" />
- <mkdir dir="${gen.dir}" />
- <mkdir dir="${lib.dir}" />
- </target>
-
+ <!-- ========================================= -->
+ <!-- dirs - create dirs required for compile -->
+ <!-- ========================================= -->
+ <target name="dirs">
+ <mkdir dir="${attachments.dir}"/>
+ <mkdir dir="${classes.dir}"/>
+ <mkdir dir="${gen.dir}"/>
+ <mkdir dir="${lib.dir}"/>
+ </target>
</project>
Modified: beehive/trunk/samples/wsm-employee/WEB-INF/src/build-client.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-employee/WEB-INF/src/build-client.xml?rev=232328&r1=232327&r2=232328&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-employee/WEB-INF/src/build-client.xml (original)
+++ beehive/trunk/samples/wsm-employee/WEB-INF/src/build-client.xml Fri Aug 12
09:32:40 2005
@@ -17,93 +17,82 @@
$Header:$
-->
-
<project name="Employee Database Sample Client" default="test" basedir=".">
- <property file="build.properties"/>
-
- <import file="${beehive.home}/beehive-imports.xml" />
+ <property file="build.properties"/>
+
+ <import file="${beehive.home}/beehive-imports.xml"/>
- <property
- name="wsdl.url"
- value="http://localhost:8080/EmployeeWS/web/Service.jws?wsdl"; />
- <property name="webapp.dir" value="../.." />
- <property name="web.inf.dir" value="${webapp.dir}/WEB-INF" />
- <property name="build.dir" value="${web.inf.dir}/build-client" />
- <property name="lib.dir" value="${web.inf.dir}/lib" />
- <property name="gen.dir" value="${build.dir}/gen" />
- <property name="classes.dir" value="${build.dir}/classes" />
- <property name="log.dir" value="${web.inf.dir}/logs" />
+ <property name="wsdl.url"
value="http://localhost:8080/EmployeeWS/web/Service.jws?wsdl"/>
+ <property name="webapp.dir" location="../.."/>
+ <property name="web.inf.dir" location="${webapp.dir}/WEB-INF"/>
+ <property name="build.dir" location="${web.inf.dir}/build-client"/>
+ <property name="lib.dir" location="${web.inf.dir}/lib"/>
+ <property name="gen.dir" location="${build.dir}/gen"/>
+ <property name="classes.dir" location="${build.dir}/classes"/>
+ <property name="log.dir" location="${web.inf.dir}/logs"/>
- <path id="jars">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <target name="test" depends="dirs,compile">
- <junit
- printsummary="yes"
- haltonfailure="yes"
- showoutput="yes">
- <classpath>
- <pathelement location= "${classes.dir}"/>
- <path refid="jars"/>
- </classpath>
- <formatter type="plain"/>
- <batchtest fork="yes" todir="${log.dir}">
- <fileset dir="${classes.dir}">
- <include name="**/*Test*.class"/>
+ <path id="jars">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
</fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="compile" depends="generate.client">
- <javac
- srcdir="${gen.dir}"
- destdir="${classes.dir}"
- classpathref="jars"
- failonerror="true"
- source="1.4" />
- </target>
-
- <target name="generate.client" depends="dirs">
- <antcall target="deploy.beehive.webservice.runtime" />
- <taskdef
- name="wsdl2java"
- classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask"
- loaderref="axis">
- <classpath refid="jars"/>
- </taskdef>
- <wsdl2java
- url="${wsdl.url}"
- output="${gen.dir}"
- testcase="yes">
- </wsdl2java>
- </target>
-
- <target name="clean">
- <delete dir="${build.dir}" />
- <delete dir="${log.dir}" />
- <delete dir="${lib.dir}" />
- </target>
-
- <target name="dirs">
- <mkdir dir="${build.dir}" />
- <mkdir dir="${gen.dir}" />
- <mkdir dir="${classes.dir}" />
- <mkdir dir="${log.dir}" />
- </target>
+ </path>
+
+ <target name="test" depends="dirs,compile">
+ <junit
+ printsummary="yes"
+ haltonfailure="yes"
+ showoutput="yes">
+ <classpath>
+ <pathelement location= "${classes.dir}"/>
+ <path refid="jars"/>
+ </classpath>
+ <formatter type="plain"/>
+ <batchtest fork="yes" todir="${log.dir}">
+ <fileset dir="${classes.dir}">
+ <include name="**/*Test*.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="compile" depends="generate.client">
+ <javac srcdir="${gen.dir}"
+ destdir="${classes.dir}"
+ classpathref="jars"
+ failonerror="true"
+ source="1.4"/>
+ </target>
+
+ <target name="generate.client" depends="dirs">
+ <antcall target="deploy.beehive.webservice.runtime"/>
+ <taskdef name="wsdl2java"
+ classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask"
+ loaderref="axis">
+ <classpath refid="jars"/>
+ </taskdef>
+ <wsdl2java url="${wsdl.url}"
+ output="${gen.dir}"
+ testcase="yes">
+ </wsdl2java>
+ </target>
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${log.dir}"/>
+ <delete dir="${lib.dir}"/>
+ </target>
+
+ <target name="dirs">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${gen.dir}"/>
+ <mkdir dir="${classes.dir}"/>
+ <mkdir dir="${log.dir}"/>
+ </target>
-
- <!-- copy all dependencies -->
- <target name="deploy.beehive.webservice.runtime" depends="dirs">
- <copy todir="${lib.dir}">
- <fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset file="${beehive.home}/lib/controls/beehive-controls.jar" />
- <fileset file="${beehive.home}/lib/wsm/*.jar" />
- </copy>
- </target>
+ <!-- copy all dependencies -->
+ <target name="deploy.beehive.webservice.runtime" depends="dirs">
+ <deploy-wsm webappDir="${webapp.dir}"/>
+ </target>
</project>
Modified: beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml?rev=232328&r1=232327&r2=232328&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml (original)
+++ beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml Fri Aug 12
09:32:40 2005
@@ -22,86 +22,86 @@
<property file="build.properties"/>
- <import file="${beehive.home}/beehive-imports.xml" />
- <import file="${beehive.home}/ant/beehive-tools.xml" />
+ <import file="${beehive.home}/beehive-imports.xml"/>
+ <import file="${beehive.home}/ant/beehive-tools.xml"/>
- <property name="service.name" value="Employee" />
+ <property name="service.name" value="Employee"/>
- <property name="webapp.dir" location="../.." />
- <property name="web.inf.dir" location="${webapp.dir}/WEB-INF" />
- <property name="attachments.dir" location="${web.inf.dir}/attachments" />
- <property name="classes.dir" location="${web.inf.dir}/classes" />
- <property name="gen.dir" location="${web.inf.dir}/gen" />
- <property name="lib.dir" location="${web.inf.dir}/lib" />
- <property name="src.dir" location="${web.inf.dir}/src" />
- <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
- <property name="webservice.jar" location="${lib.dir}/EmployeeWS.jar" />
- <property name="webservice.war" location="EmployeeWS.war" />
-
- <path id="build.classpath">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar" />
- </fileset>
- <pathelement location="${classes.dir}"/>
- </path>
+ <property name="webapp.dir" location="../.."/>
+ <property name="web.inf.dir" location="${webapp.dir}/WEB-INF"/>
+ <property name="attachments.dir" location="${web.inf.dir}/attachments"/>
+ <property name="classes.dir" location="${web.inf.dir}/classes"/>
+ <property name="gen.dir" location="${web.inf.dir}/gen"/>
+ <property name="lib.dir" location="${web.inf.dir}/lib"/>
+ <property name="src.dir" location="${web.inf.dir}/src"/>
+ <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
+ <property name="webservice.jar" location="${lib.dir}/EmployeeWS.jar"/>
+ <property name="webservice.war" location="EmployeeWS.war"/>
+
+ <path id="build.classpath">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement location="${classes.dir}"/>
+ </path>
- <!-- ========================================= -->
- <!-- deploy.war - build deployable artifact -->
- <!-- ========================================= -->
- <target name="deploy.war">
- <jar jarfile="../../../${webservice.war}">
- <fileset dir="${webapp.dir}">
- <exclude name="${src.dir}/**" />
- <exclude name="${ws-src.dir}/**" />
- <exclude name="${gen.dir}/**" />
- </fileset>
- </jar>
- </target>
+ <!-- ========================================= -->
+ <!-- deploy.war - build deployable artifact -->
+ <!-- ========================================= -->
+ <target name="deploy.war">
+ <jar jarfile="../../../${webservice.war}">
+ <fileset dir="${webapp.dir}">
+ <exclude name="${src.dir}/**"/>
+ <exclude name="${ws-src.dir}/**"/>
+ <exclude name="${gen.dir}/**"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <!-- ========================================= -->
+ <!-- build - build jar-file -->
+ <!-- ========================================= -->
+ <target name="build" depends="dirs">
+ <deploy-wsm webappDir="${webapp.dir}"/>
+
+ <copy todir="${lib.dir}">
+ <fileset dir="../../controls-db/build" includes="dbControl.jar"/>
+ <fileset dir="${beehive.home}/external/derby"
includes="derby_46005.jar"/>
+ </copy>
+
+ <javac srcdir="${src.dir}" destdir="${classes.dir}"
classpathref="build.classpath"/>
+
+ <build-webservices srcdir="${ws-src.dir}"
+ destdir="${classes.dir}"
+ tempdir="${gen.dir}"
+ classpathref="build.classpath"/>
+
+ <jar jarfile="${webservice.jar}">
+ <fileset dir="${classes.dir}">
+ <exclude name="**/Test.class"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <!-- ========================================= -->
+ <!-- clean - remove binary files -->
+ <!-- ========================================= -->
+ <target name="clean">
+ <delete dir="${attachments.dir}"/>
+ <delete dir="${classes.dir}"/>
+ <delete dir="${gen.dir}"/>
+ <delete dir="${lib.dir}"/>
+ <delete file="velocity.log"/>
+ </target>
- <!-- ========================================= -->
- <!-- build - build jar-file -->
- <!-- ========================================= -->
- <target name="build" depends="dirs">
- <deploy-wsm webappDir="${webapp.dir}"/>
-
- <copy todir="${lib.dir}">
- <fileset dir="../../controls-db/build" includes="dbControl.jar" />
- <fileset dir="${beehive.home}/external/derby"
includes="derby_46005.jar" />
- </copy>
-
- <javac srcdir="${src.dir}" destdir="${classes.dir}"
classpathref="build.classpath"/>
-
- <build-webservices srcdir="${ws-src.dir}"
- destdir="${classes.dir}"
- tempdir="${gen.dir}"
- classpathref="build.classpath"/>
-
- <jar jarfile="${webservice.jar}">
- <fileset dir="${classes.dir}">
- <exclude name="**/Test.class" />
- </fileset>
- </jar>
- </target>
-
- <!-- ========================================= -->
- <!-- clean - remove binary files -->
- <!-- ========================================= -->
- <target name="clean">
- <delete dir="${attachments.dir}" />
- <delete dir="${classes.dir}" />
- <delete dir="${gen.dir}" />
- <delete dir="${lib.dir}" />
- <delete file="velocity.log" />
- </target>
-
- <!-- ========================================= -->
- <!-- dirs - create dirs required for compile -->
- <!-- ========================================= -->
- <target name="dirs">
- <mkdir dir="${attachments.dir}" />
- <mkdir dir="${classes.dir}" />
- <mkdir dir="${gen.dir}" />
- <mkdir dir="${lib.dir}" />
- </target>
+ <!-- ========================================= -->
+ <!-- dirs - create dirs required for compile -->
+ <!-- ========================================= -->
+ <target name="dirs">
+ <mkdir dir="${attachments.dir}"/>
+ <mkdir dir="${classes.dir}"/>
+ <mkdir dir="${gen.dir}"/>
+ <mkdir dir="${lib.dir}"/>
+ </target>
</project>
Modified: beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml
URL:
http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml?rev=232328&r1=232327&r2=232328&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml (original)
+++ beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml Fri Aug 12 09:32:40
2005
@@ -17,95 +17,95 @@
$Header:$
-->
-
-<project name="Beehive/WSM Sample Web Services" default="build" basedir=".">
+<project name="Beehive/Samples/WSM" default="build" basedir=".">
- <property file="build.properties"/>
+ <property file="build.properties"/>
- <import file="${beehive.home}/beehive-imports.xml" />
- <import file="${beehive.home}/ant/beehive-tools.xml" />
+ <import file="${beehive.home}/beehive-imports.xml"/>
+ <import file="${beehive.home}/ant/beehive-tools.xml"/>
- <property name="service.name" value="wsm-samples" />
+ <property name="service.name" value="wsm-samples"/>
- <property name="webapp.dir" location="../.." />
- <property name="web.inf.dir" location="${webapp.dir}/WEB-INF" />
- <property name="attachments.dir" location="${web.inf.dir}/attachments" />
- <property name="classes.dir" location="${web.inf.dir}/classes" />
- <property name="gen.dir" location="${web.inf.dir}/gen" />
- <property name="lib.dir" location="${web.inf.dir}/lib" />
- <property name="src.dir" location="${web.inf.dir}/src" />
- <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
- <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
- <property name="webservice.war" value="${service.name}WS.war" />
-
- <path id="lib.path">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar" />
- </fileset>
- </path>
-
- <path id="build.classpath">
- <path refid="lib.path"/>
- <pathelement location="${classes.dir}"/>
- </path>
-
- <!-- ========================================= -->
- <!-- deploy - build deployable artifact -->
- <!-- ========================================= -->
- <target name="deploy" depends="build">
- <antcall target="deploy.war" />
- </target>
-
- <!-- ========================================= -->
- <!-- deploy.war - build deployable artifact -->
- <!-- ========================================= -->
- <target name="deploy.war">
- <jar jarfile="../../../${webservice.war}">
- <fileset dir="../..">
- <exclude name="WEB-INF/src/**" />
- <exclude name="WEB-INF/src-ws/**" />
- <exclude name="WEB-INF/gen/**" />
- </fileset>
- </jar>
- </target>
-
- <!-- ========================================= -->
- <!-- build - build all binaries -->
- <!-- ========================================= -->
- <target name="build" depends="dirs">
- <deploy-wsm webappDir="${webapp.dir}"/>
-
- <javac srcdir="${src.dir}" destdir="${classes.dir}"
classpathref="build.classpath"/>
-
- <build-webservices srcdir="${ws-src.dir}"
- destdir="${classes.dir}"
- tempdir="${gen.dir}"
- classpathref="build.classpath"/>
- <jar jarfile="${webservice.jar}">
- <fileset dir="${classes.dir}" />
- </jar>
- </target>
-
- <!-- ========================================= -->
- <!-- clean - remove binary files -->
- <!-- ========================================= -->
- <target name="clean">
- <delete dir="${attachments.dir}" />
- <delete dir="${classes.dir}" />
- <delete dir="${gen.dir}" />
- <delete dir="${lib.dir}" />
- <delete dir="${web.inf.dir}/.tmpbeansrc"/>
- <delete file="velocity.log" />
- </target>
-
- <!-- ========================================= -->
- <!-- dirs - create dirs required for compile -->
- <!-- ========================================= -->
- <target name="dirs">
- <mkdir dir="${attachments.dir}" />
- <mkdir dir="${classes.dir}" />
- <mkdir dir="${gen.dir}" />
- <mkdir dir="${lib.dir}" />
- </target>
+ <property name="webapp.dir" location="../.."/>
+ <property name="web.inf.dir" location="${webapp.dir}/WEB-INF"/>
+ <property name="attachments.dir" location="${web.inf.dir}/attachments"/>
+ <property name="classes.dir" location="${web.inf.dir}/classes"/>
+ <property name="gen.dir" location="${web.inf.dir}/gen"/>
+ <property name="lib.dir" location="${web.inf.dir}/lib"/>
+ <property name="src.dir" location="${web.inf.dir}/src"/>
+ <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
+ <property name="webservice.jar"
location="${lib.dir}/${service.name}WS.jar"/>
+ <property name="webservice.war" location="${service.name}WS.war"/>
+
+ <path id="lib.path">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="build.classpath">
+ <path refid="lib.path"/>
+ <pathelement location="${classes.dir}"/>
+ </path>
+
+ <!-- ========================================= -->
+ <!-- deploy - build deployable artifact -->
+ <!-- ========================================= -->
+ <target name="deploy" depends="build">
+ <antcall target="deploy.war"/>
+ </target>
+
+ <!-- ========================================= -->
+ <!-- deploy.war - build deployable artifact -->
+ <!-- ========================================= -->
+ <target name="deploy.war">
+ <jar jarfile="../../../${webservice.war}">
+ <fileset dir="../..">
+ <exclude name="WEB-INF/src/**"/>
+ <exclude name="WEB-INF/src-ws/**"/>
+ <exclude name="WEB-INF/gen/**"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <!-- ========================================= -->
+ <!-- build - build all binaries -->
+ <!-- ========================================= -->
+ <target name="build" depends="dirs">
+ <deploy-wsm webappDir="${webapp.dir}"/>
+
+ <javac srcdir="${src.dir}" destdir="${classes.dir}"
classpathref="build.classpath"/>
+
+ <build-webservices srcdir="${ws-src.dir}"
+ destdir="${classes.dir}"
+ tempdir="${gen.dir}"
+ classpathref="build.classpath"/>
+
+ <jar jarfile="${webservice.jar}">
+ <fileset dir="${classes.dir}"/>
+ </jar>
+ </target>
+
+ <!-- ========================================= -->
+ <!-- clean - remove binary files -->
+ <!-- ========================================= -->
+ <target name="clean">
+ <delete dir="${attachments.dir}"/>
+ <delete dir="${classes.dir}"/>
+ <delete dir="${gen.dir}"/>
+ <delete dir="${lib.dir}"/>
+ <delete dir="${web.inf.dir}/.tmpbeansrc"/>
+ <delete file="velocity.log"/>
+ </target>
+
+ <!-- ========================================= -->
+ <!-- dirs - create dirs required for compile -->
+ <!-- ========================================= -->
+ <target name="dirs">
+ <mkdir dir="${attachments.dir}"/>
+ <mkdir dir="${classes.dir}"/>
+ <mkdir dir="${gen.dir}"/>
+ <mkdir dir="${lib.dir}"/>
+ </target>
</project>
