Author: ekoneil
Date: Sun May 15 21:12:35 2005
New Revision: 170297
URL: http://svn.apache.org/viewcvs?rev=170297&view=rev
Log:
Rework the WSM build file. The build target was being called every time the
WSM runtime was deployed to a webapp or the tests were run. This is
unnecessary as WSM should be built with a "ant clean deploy" before running
tests.
If you were relying on "ant drt" to build WSM, please change this to "ant clean
deploy drt".
The number of schema compilations seemed to be particularly problematic.
BB: self
DRT: Beehive pass / build.dist pass
Modified:
incubator/beehive/trunk/wsm/build.xml
Modified: incubator/beehive/trunk/wsm/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/build.xml?rev=170297&r1=170296&r2=170297&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/build.xml (original)
+++ incubator/beehive/trunk/wsm/build.xml Sun May 15 21:12:35 2005
@@ -80,13 +80,12 @@
<echo
message="----------------------------------------------------------------"/>
<echo message="| Standard Targets
|"/>
<echo
message="----------------------------------------------------------------"/>
- <echo message="build - build core WSM classes and jar files"/>
+ <echo message="build_core - build core WSM classes and jar files"/>
<echo message="build_axis - build AXIS dependent classes and jar
files"/>
- <echo message="build_all - build all classes and jar files"/>
+ <echo message="build - build all classes and jar files"/>
<echo message="clean - remove build files"/>
<echo message="deploy - prepares an axis webapp suitable for
deployment"/>
<echo message=" to a servlet container"/>
- <echo message="redeploy - do an "clean", ",
"build" and "deploy"."/>
<echo message="docs - build the java docs"/>
<echo message="drt - runs the DRT (developer regression test)
on the"/>
<echo message=" core WSM components"/>
@@ -107,7 +106,10 @@
<!-- ====================================================================
-->
<!-- build_all. build this project and all inter-project dependencies
-->
<!-- ====================================================================
-->
- <target name="build_all" depends="build, build_axis"/>
+ <target name="build">
+ <antcall target="build_core"/>
+ <antcall target="build_axis"/>
+ </target>
<!-- ====================================================================
-->
<!-- Creates the output directories of the build. -->
@@ -123,7 +125,7 @@
<!-- ====================================================================
-->
<!-- Compiles the source code of the project. -->
<!-- ====================================================================
-->
- <target name="classes" depends=" runtime">
+ <target name="classes" depends="runtime">
<!-- Copy template files into the build -->
<copy todir="${runtime.classes}" overwrite="true">
<fileset dir="${runtime.dir}"
includes="**/*.template,**/*.vm,META-INF/**"/>
@@ -199,7 +201,7 @@
<!-- ====================================================================
-->
<!-- Jars up the classes, libraries, and resources. -->
<!-- ====================================================================
-->
- <target name="build" depends="wsdltypes,classes">
+ <target name="build_core" depends="wsdltypes,classes">
<echo message="--------------------------------------------------"/>
<echo message="| WSM build starting |"/>
<echo message="--------------------------------------------------"/>
@@ -263,38 +265,12 @@
<delete dir="${temp.wsdl.classes.dir}"/>
<ant dir="drt" target="clean" inheritAll="false"/>
</target>
-
- <!-- ====================================================================
-->
- <!-- clean_all -->
- <!-- ====================================================================
-->
- <target name="clean_all">
- <antcall target="clean"/>
- </target>
-
- <!-- ====================================================================
-->
- <!-- redeploy -->
- <!-- ====================================================================
-->
- <target name="redeploy">
- <antcall target="clean"/>
- <antcall target="build"/>
- <antcall target="deploy"/>
- </target>
-
- <!-- ====================================================================
-->
- <!-- redeploy_all -->
- <!-- ====================================================================
-->
- <target name="redeploy_all">
- <antcall target="clean_all"/>
- <antcall target="build_all"/>
- <antcall target="deploy_all"/>
- </target>
-
+
<!-- ====================================================================
-->
<!-- deploy.webservice.runtime -->
<!-- ====================================================================
-->
<target
name="deploy.webservice.runtime"
- depends="build_all"
description="Deploy the web services runtime to a fully-quaflified
webapp directory specified with the property 'webapp.dir'">
<available property="webapp.dir.available" file="${webapp.dir}"
type="dir"/>
<fail unless="webapp.dir.available" message="Can't find the webapp
directory ${webapp.dir}"/>
@@ -315,36 +291,18 @@
<!-- ====================================================================
-->
<!-- deploy -->
<!-- ====================================================================
-->
- <target name="deploy" depends="build_all">
+ <target name="deploy">
<echo message="--------------------------------------------------"/>
<echo message="| WSM deploy starting |"/>
<echo message="--------------------------------------------------"/>
+ <antcall target="build"/>
+
<echo message="--------------------------------------------------"/>
<echo message="| WSM deploy ending |"/>
<echo message="--------------------------------------------------"/>
</target>
-
- <!-- ====================================================================
-->
- <!-- deploy_all -->
- <!-- ====================================================================
-->
- <target name="deploy_all">
- <antcall target="deploy"/>
- </target>
-
- <!-- ====================================================================
-->
- <!-- minprod -->
- <!-- ====================================================================
-->
- <target name="minprod">
- <echo message="--------------------------------------------------"/>
- <echo message="| WSM minprod starting |"/>
- <echo message="--------------------------------------------------"/>
- <antcall target="deploy"/>
- <echo message="--------------------------------------------------"/>
- <echo message="| WSM minprod completed |"/>
- <echo message="--------------------------------------------------"/>
- </target>
-
+
<!-- ====================================================================
-->
<!-- docs -->
<!-- ====================================================================
-->
@@ -358,7 +316,7 @@
<!-- ====================================================================
-->
<!-- drt -->
<!-- ====================================================================
-->
- <target name="drt" depends="build_all">
+ <target name="drt">
<ant dir="drt" target="drt" inheritAll="false"/>
</target>
