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/05/20 01:31:27 UTC

svn commit: r171011 - in /incubator/beehive/trunk/samples: build.xml wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml wsm-addressbook-fromWSDL/WEB-INF/src/build.xml

Author: mmerz
Date: Thu May 19 16:31:24 2005
New Revision: 171011

URL: http://svn.apache.org/viewcvs?rev=171011&view=rev
Log:
Minor changes to the build files to make them consitent with other samples.

Contributor: Daryoush Mehrtash

Modified:
    incubator/beehive/trunk/samples/build.xml
    incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml
    incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml

Modified: incubator/beehive/trunk/samples/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/build.xml?rev=171011&r1=171010&r2=171011&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/build.xml (original)
+++ incubator/beehive/trunk/samples/build.xml Thu May 19 16:31:24 2005
@@ -65,7 +65,8 @@
                     "clean build clean" target on this ant file.  The problem is that for the "build" target would need axis-ant.jar
                      from the lib directory of the project, then when clean is called, it fails since the jar (in the WEB-INF/lib) is
                      in use by ant.  It can be re-enabled if distribution.xml exectues the builds on different VM, or if the WSM is cleaned
-                     up so that the ant targets are not included in the run-time distribution.  
+                     up so that the ant targets are not included in the run-time distribution.  See 
+                         http://issues.apache.org/jira/browse/BEEHIVE-751
                      
 	<ant antfile="wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml" target="all" inheritAll="false"/>
 

Modified: incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml?rev=171011&r1=171010&r2=171011&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml Thu May 19 16:31:24 2005
@@ -20,180 +20,174 @@
 
 <project name="Address Book from WSDL Sample" default="usage" basedir=".">
 
-	<import file="../../../../beehive-imports.xml" />
-	<import file="../../../../ant/beehive-tools.xml" />
-	<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="lib.dir" value="${web.inf.dir}/lib" />
-	<property name="src.dir" value="${web.inf.dir}/src" />
-	<property name="build.dir" location="${web.inf.dir}/build" />
-	<property name="gen.dir" location="${build.dir}/gen" />
-	<property name="aptgen.dir" location="${build.dir}/apt-gen" />
-	<property name="classes.dir" location="${build.dir}/classes" />
-	<property name="sourcegen.dir" value="${web.inf.dir}/src-ws" />
-	<property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
-	<property name="types.gen.dir" value="${build.dir}/types" />
-
-	<property name="webservice.war" value="${service.name}WS.war" />
-	<property name="schema.dir" value="../wsdl" />
-	<property name="wsdl.location" location="${schema.dir}/${service.name}.wsdl" />
-
-	<condition property="isJDK15">
-		<equals arg1="${ant.java.version}" arg2="1.5" />
-	</condition>
-
-	<path id="jars">
-		<fileset dir="${lib.dir}">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-
-	<!-- ========================================= -->
-	<!-- all - source-gen and build        -->
-	<!-- ========================================= -->
-	<target name="all" depends="source-gen, build" />
-
-	<!-- ========================================= -->
-	<!-- deploy - build deployable artifact        -->
-	<!-- ========================================= -->
-
-	<target name="deploy">
-		<antcall target="deploy.war" />
-	</target>
-
-
-	<!-- ========================================= -->
-	<!-- deploy.war - build deployable artifact    -->
-	<!-- ========================================= -->
-
-	<target name="deploy.war">
-		<jar jarfile="../../../${service.name}WS.war">
-			<fileset dir="${webapp.dir}">
-				<exclude name="${build.dir}/**" />
-			</fileset>
-		</jar>
-	</target>
-
-
-
-
-	<!-- ========================================= -->
-	<!-- clean - remove binary files               -->
-	<!-- ========================================= -->
-
-	<target name="clean">
-
-		<delete dir="${attachments.dir}" />
-		<delete dir="${build.dir}" />
-		<delete file="velocity.log" />
-		<delete dir="gen.dir" />
-		<delete dir="${sourcegen.dir}" />
-	  	<delete dir="${types.gen.dir}" />
-		<delete dir="${lib.dir}" />  
-		 <clean-webapp webappDir="${webapp.dir}" /> 
-	</target>
-
-
-
-	<!-- ========================================= -->
-	<!-- build - create jar in ${lib.dir}          -->
-	<!-- ========================================= -->
-	<target name="build" depends="dirs, deploy-wsm-controls">
-		<deploy-wsm webappDir="${webapp.dir}" />
-
-		<javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="jars" />
-		<build-webservices srcdir="${sourcegen.dir}" destdir="${classes.dir}" tempdir="${aptgen.dir}" classpathref="jars" />
-
-
-		<jar jarfile="${webservice.jar}">
-			<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="jars" />
-			</classpath>
-		</taskdef>
-
-
-		<wsdl2AJava outputdir="${sourcegen.dir}" wsdlfile="${wsdl.location}">
-			<classpath>
-				<path refid="jars" />
-				<path location="${classes.dir}" />
-			</classpath>
-		</wsdl2AJava>
-
-
-
-	</target>
-
-	<!-- ========================================= -->
-	<!-- generate-xmlbean-datatypes -              -->
-	<!-- ========================================= -->
-
-	<target name="generate-xmlbean-datatypes"  depends="dirs, deploy-wsm-controls">
-		<taskdef name="xmlbeanbuild" classname="org.apache.xmlbeans.impl.tool.XMLBean">
-			<classpath>
-				<path refid="jars" />
-			</classpath>
-		</taskdef>
-		<mkdir dir="${classes.dir}" />
-		<mkdir dir="${sourcegen.dir}" />
-		<xmlbeanbuild schema="${schema.dir}" srcgendir="${types.gen.dir}" classgendir="${classes.dir}" failonerror="true">
-			<classpath>
-				<path refid="jars" />
-			</classpath>
-		</xmlbeanbuild>
-	</target>
-
-
-	<!-- ========================================= -->
-	<!-- dirs - create dirs required for compile   -->
-	<!-- ========================================= -->
-
-	<target name="dirs">
-		<mkdir dir="${sourcegen.dir}" />
-		<mkdir dir="${aptgen.dir}" />
-		<mkdir dir="${attachments.dir}" />
-		<mkdir dir="${classes.dir}" />
-		<mkdir dir="${gen.dir}" />
-		<mkdir dir="${lib.dir}" />
-	  	<mkdir dir="${types.gen.dir}" />
-	</target>
-
-	
-	<target name="deploy-wsm-controls" depends="dirs" >
-		<deploy-wsm webappDir="${webapp.dir}" />
-		<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="----------------------------------------------------------------" />
-	</target>
+    <import file="../../../../beehive-imports.xml" />
+    <import file="../../../../ant/beehive-tools.xml" />
+    <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="lib.dir" location="${web.inf.dir}/lib" />
+    <property name="src.dir" location="${web.inf.dir}/src" />
+    <property name="build.dir" location="${web.inf.dir}/build" />
+    <property name="gen.dir" location="${build.dir}/gen" />
+    <property name="aptgen.dir" location="${build.dir}/apt-gen" />
+    <property name="classes.dir" location="${build.dir}/classes" />
+    <property name="sourcegen.dir" location="${web.inf.dir}/src-ws" />
+    <property name="webservice.jar" location="${lib.dir}/${service.name}WS.jar" />
+    <property name="types.gen.dir" location="${build.dir}/types" />
+
+    <property name="webservice.war" location="${service.name}WS.war" />
+    <property name="schema.dir" location="../wsdl" />
+    <property name="wsdl.location" location="${schema.dir}/${service.name}.wsdl" />
+
+    <condition property="isJDK15">
+        <equals arg1="${ant.java.version}" arg2="1.5" />
+    </condition>
+
+    <path id="jars">
+        <fileset dir="${lib.dir}">
+            <include name="**/*.jar" />
+        </fileset>
+    </path>
+
+    <!-- ========================================= -->
+    <!-- all - source-gen and build        -->
+    <!-- ========================================= -->
+    <target name="all" depends="source-gen, build" />
+
+
+
+
+    <!-- ========================================= -->
+    <!-- deploy.war - build deployable artifact    -->
+    <!-- ========================================= -->
+
+    <target name="war">
+        <jar jarfile="../../../${service.name}WS.war">
+            <fileset dir="${webapp.dir}">
+                <exclude name="${build.dir}/**" />
+            </fileset>
+        </jar>
+    </target>
+
+
+
+
+    <!-- ========================================= -->
+    <!-- clean - remove binary files               -->
+    <!-- ========================================= -->
+
+    <target name="clean">
+
+        <delete dir="${attachments.dir}" />
+        <delete dir="${build.dir}" />
+        <delete file="velocity.log" />
+        <delete dir="gen.dir" />
+        <delete dir="${sourcegen.dir}" />
+        <delete dir="${types.gen.dir}" />
+        <delete dir="${lib.dir}" />
+        <clean-webapp webappDir="${webapp.dir}" />
+    </target>
+
+
+
+    <!-- ========================================= -->
+    <!-- build - create jar in ${lib.dir}          -->
+    <!-- ========================================= -->
+    <target name="build" depends="dirs, deploy-wsm-controls">
+        <deploy-wsm webappDir="${webapp.dir}" />
+
+        <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="jars" />
+        <build-webservices srcdir="${sourcegen.dir}" destdir="${classes.dir}" tempdir="${aptgen.dir}" classpathref="jars" />
+
+
+        <jar jarfile="${webservice.jar}">
+            <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="jars" />
+            </classpath>
+        </taskdef>
+
+
+        <wsdl2AJava outputdir="${sourcegen.dir}" wsdlfile="${wsdl.location}">
+            <classpath>
+                <path refid="jars" />
+                <path location="${classes.dir}" />
+            </classpath>
+        </wsdl2AJava>
+
+
+
+    </target>
+
+    <!-- ========================================= -->
+    <!-- generate-xmlbean-datatypes -              -->
+    <!-- ========================================= -->
+
+    <target name="generate-xmlbean-datatypes" depends="dirs, deploy-wsm-controls">
+        <taskdef name="xmlbeanbuild" classname="org.apache.xmlbeans.impl.tool.XMLBean">
+            <classpath>
+                <path refid="jars" />
+            </classpath>
+        </taskdef>
+        <mkdir dir="${classes.dir}" />
+        <mkdir dir="${sourcegen.dir}" />
+        <xmlbeanbuild schema="${schema.dir}" srcgendir="${types.gen.dir}" classgendir="${classes.dir}" failonerror="true">
+            <classpath>
+                <path refid="jars" />
+            </classpath>
+        </xmlbeanbuild>
+    </target>
+
+
+    <!-- ========================================= -->
+    <!-- dirs - create dirs required for compile   -->
+    <!-- ========================================= -->
+
+    <target name="dirs">
+        <mkdir dir="${sourcegen.dir}" />
+        <mkdir dir="${aptgen.dir}" />
+        <mkdir dir="${attachments.dir}" />
+        <mkdir dir="${classes.dir}" />
+        <mkdir dir="${gen.dir}" />
+        <mkdir dir="${lib.dir}" />
+        <mkdir dir="${types.gen.dir}" />
+    </target>
+
+
+    <target name="deploy-wsm-controls" depends="dirs">
+        <deploy-wsm webappDir="${webapp.dir}" />
+        <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="----------------------------------------------------------------" />
+    </target>
 </project>

Modified: incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml?rev=171011&r1=171010&r2=171011&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml Thu May 19 16:31:24 2005
@@ -19,173 +19,173 @@
  -->
 
 <project name="Address Book from WSDL Sample" default="usage" basedir=".">
-  
-	  <property file="build.properties"/>
 
-	  <import file="${beehive.home}/beehive-imports.xml" />
-	  <import file="${beehive.home}/ant/beehive-tools.xml" />
+    <property file="build.properties"/>
 
-	<property name="service.name" value="fromWSDL" />
+    <import file="${beehive.home}/beehive-imports.xml" />
+    <import file="${beehive.home}/ant/beehive-tools.xml" />
 
-	  <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" value="${web.inf.dir}/src-ws" />
-	  <property name="types.gen.dir" value="${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" value="${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" 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>
-	  
-	  <!-- ========================================= -->
-	  <!-- 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>
-	  
-	<!-- ========================================= -->
-	<!-- all - source-gen and build        -->
-	<!-- ========================================= -->
-	<target name="all" depends="source-gen, build" />
-
-	
-	  <!-- ========================================= -->
-	  <!-- build - build all binaries                -->
-	  <!-- ========================================= -->
-	  <target name="build" depends="dirs">
-	     <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+    <property name="service.name" value="fromWSDL" />
 
-	     <build-webservices srcdir="${sourcegen.dir}"
+    <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" />
+
+    <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>
+
+    <!-- ========================================= -->
+    <!-- all - source-gen and build        -->
+    <!-- ========================================= -->
+    <target name="all" depends="source-gen, build" />
+
+
+    <!-- ========================================= -->
+    <!-- build - build all binaries                -->
+    <!-- ========================================= -->
+    <target name="build" depends="dirs">
+        <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+
+        <build-webservices srcdir="${sourcegen.dir}"
 	                        destdir="${classes.dir}"
 	                        tempdir="${temp.dir}"
 	                        classpathref="build.classpath"/>
-	    <jar jarfile="${webservice.jar}">
-	      <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" />
-			</classpath>
-		</taskdef>
-
-
-		<wsdl2AJava outputdir="${sourcegen.dir}" wsdlfile="${wsdl.location}">
-			<classpath>
-				<path refid="build.classpath" />
-				<path location="${classes.dir}" />
-			</classpath>
-		</wsdl2AJava>
-
-
-
-	</target>
-
-	<!-- ========================================= -->
-	<!-- generate-xmlbean-datatypes -              -->
-	<!-- ========================================= -->
-
-	<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" />
-			</classpath>
-		</taskdef>
-		<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" />
-			</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="${web.inf.dir}/.tmpbeansrc"/>
-	    <delete dir="${web.inf.dir}/build-server"/>
-	    <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}" />
-	  </target>
-	
-	<target name="deploy-wsm-controls" depends="dirs" >
-		<deploy-wsm webappDir="${webapp.dir}" />
-		
-		<!-- control jars are included for webservices that would use controls -->
-		<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="----------------------------------------------------------------" />
-	</target>	
+        <jar jarfile="${webservice.jar}">
+            <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" />
+            </classpath>
+        </taskdef>
+
+
+        <wsdl2AJava outputdir="${sourcegen.dir}" wsdlfile="${wsdl.location}">
+            <classpath>
+                <path refid="build.classpath" />
+                <path location="${classes.dir}" />
+            </classpath>
+        </wsdl2AJava>
+
+
+
+    </target>
+
+    <!-- ========================================= -->
+    <!-- generate-xmlbean-datatypes -              -->
+    <!-- ========================================= -->
+
+    <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" />
+            </classpath>
+        </taskdef>
+        <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" />
+            </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="${web.inf.dir}/.tmpbeansrc"/>
+        <delete dir="${web.inf.dir}/build-server"/>
+        <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}" />
+    </target>
+
+    <target name="deploy-wsm-controls" depends="dirs" >
+        <deploy-wsm webappDir="${webapp.dir}" />
+
+        <!-- control jars are included for webservices that would use controls -->
+        <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="----------------------------------------------------------------" />
+    </target>
 
 </project>