11:24 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2006-11-06 12:24:14 -0500 (Mon, 06 Nov 2006)
New Revision: 1403
Modified:
branches/jbossws-1.0/build.xml
branches/jbossws-1.0/src/ant/build-samples.xml
branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml
Log:
Add check for available target container
Modified: branches/jbossws-1.0/build.xml
===================================================================
--- branches/jbossws-1.0/build.xml 2006-11-06 14:54:14 UTC (rev 1402)
+++ branches/jbossws-1.0/build.xml 2006-11-06 17:24:14 UTC (rev 1403)
@@ -70,6 +70,8 @@
<available property="jboss.source.dist.available"
file="${jboss.thirdparty}" type="dir"/>
<available property="jbossws.thirdparty.available"
file="${build.lib.dir}/jbossws-thirdparty.jar"/>
+ <available property="jboss.available"
file="${jboss.client}/jboss-client.jar"/>
+ <available property="tomcat.available"
file="${tomcat.home}/server/lib/catalina.jar"/>
<checksum file="version.properties" fileext=".md5"
verifyproperty="checksum.ok"/>
<checksum file="version.properties" fileext=".md5"/>
@@ -489,6 +491,7 @@
<!-- Deploy jbossws to the server -->
<target name="deploy-jbossws" depends="main"
description="Deploy jbossws">
+ <fail message="Not available: ${jboss.client}/jboss-client.jar"
unless="jboss.available"/>
<antcall target="deploy-to-server">
<param name="jboss.deploy.home"
value="${jboss.jdk15.home}"/>
<param name="jbossws" value="jbossws"/>
@@ -506,6 +509,7 @@
</target>
<target name="deploy-jbossws14" depends="main,module-jars14,
module-jars14-assert" description="Deploy jbossws14"
if="jboss.jdk14.home">
+ <fail message="Not available: ${jboss.client}/jboss-client.jar"
unless="jboss.available"/>
<antcall target="deploy-to-server">
<param name="jboss.deploy.home"
value="${jboss.jdk14.home}"/>
<param name="jbossws" value="jbossws14"/>
@@ -535,6 +539,7 @@
<!-- Deploy to Tomcat -->
<target name="deploy-tomcat"
depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to
Tomcat">
+ <fail message="Not available: ${tomcat.home}/server/lib/catalina.jar"
unless="tomcat.available"/>
<copy todir="${tomcat.common.dir}/endorsed"
file="${thirdparty.dir}/serializer.jar"/>
<copy todir="${tomcat.common.dir}/endorsed"
file="${thirdparty.dir}/xalan.jar"/>
<copy todir="${tomcat.common.dir}/endorsed"
file="${thirdparty.dir}/xercesImpl.jar"/>
@@ -619,24 +624,6 @@
<!-- Misc. -->
<!-- ================================================================== -->
- <!-- Clean up all build output -->
- <target name="clean" depends="prepare" description="Cleans
up most generated files.">
- <delete dir="${build.dir}"/>
- </target>
-
- <target name="main" description="Executes the default target
(most)." depends="most"/>
-
- <target name="most" description="Builds almost everything."
depends="jars"/>
-
- <target name="all" description="Create a distribution zip file"
- depends="build-bin-dist,build-src-dist">
- </target>
-
- <!-- Build the documentation -->
- <target name="build-docs" description="Build the
documentation">
- <ant antfile="${docs.userguide.dir}/build.xml"
dir="${docs.userguide.dir}" target="all.doc"/>
- </target>
-
<!-- Build the bin dist -->
<target name="build-bin-dist" description="Build the binary
distribution"
depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs">
@@ -727,5 +714,20 @@
<zip destfile="${build.dir}/jbossws-${version.id}-src.zip"
basedir="${build.src.dist}"
includes="jbossws-${version.id}/**"/>
</target>
+ <target name="clean" depends="prepare" description="Cleans
up most generated files.">
+ <delete dir="${build.dir}"/>
+ </target>
+ <target name="build-docs" description="Build the
documentation">
+ <ant antfile="${docs.userguide.dir}/build.xml"
dir="${docs.userguide.dir}" target="all.doc"/>
+ </target>
+
+ <target name="main" description="Executes the default target
(most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything."
depends="jars"/>
+
+ <target name="all" description="Create a distribution zip file"
+ depends="build-bin-dist,build-src-dist">
+ </target>
+
</project>
Modified: branches/jbossws-1.0/src/ant/build-samples.xml
===================================================================
--- branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-06 14:54:14 UTC (rev 1402)
+++ branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-06 17:24:14 UTC (rev 1403)
@@ -35,6 +35,9 @@
<include name="jbossws-jboss-integration.jar"/>
<include name="jbossws-tomcat-integration.jar"/>
</fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="servlet-api.jar"/>
+ </fileset>
</copy>
<!-- samples/common -->
Modified: branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-06
14:54:14 UTC (rev 1402)
+++ branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-06
17:24:14 UTC (rev 1403)
@@ -47,6 +47,9 @@
<property name="jboss.server.lib"
value="${jboss.server}/lib"/>
<property name="jboss.server.deploy"
value="${jboss.server}/deploy"/>
+ <available property="jboss.available"
file="${jboss.client}/jboss-client.jar"/>
+ <available property="tomcat.available"
file="${tomcat.home}/server/lib/catalina.jar"/>
+
<!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
otherwise and initialize the node0/node1 cluster hostnames to localhost
and ${hostname} by default. If you cannot route multicast traffic between
@@ -105,6 +108,7 @@
</fileset>
<pathelement
location="${basedir}/lib/jbossws-jboss-integration.jar"/>
<pathelement
location="${basedir}/lib/jbossws-tomcat-integration.jar"/>
+ <pathelement location="${basedir}/lib/servlet-api.jar"/>
</path>
<echo message="jboss.home = ${jboss.home}"/>
@@ -113,9 +117,6 @@
<echo message="node0 = ${node0}"/>
<echo/>
- <available property="jbossws.available"
file="${jboss.home}/client/jbossall-client.jar"/>
- <fail message="Not available: ${jboss.home}/client/jbossall-client.jar"
unless="jbossws.available"/>
-
<mkdir dir="${build.test.dir}/classes"/>
<mkdir dir="${build.test.dir}/resources"/>
<mkdir dir="${build.test.dir}/reports"/>