9:51 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2006-12-07 10:51:30 -0500 (Thu, 07 Dec 2006)
New Revision: 1610
Modified:
trunk/build.xml
Log:
format
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2006-12-07 14:36:56 UTC (rev 1609)
+++ trunk/build.xml 2006-12-07 15:51:30 UTC (rev 1610)
@@ -12,18 +12,18 @@
<!-- $Id$ -->
<project default="main" name="JBossWS">
-
+
<import file="${basedir}/src/ant/build-thirdparty.xml"/>
<import file="${basedir}/src/ant/build-samples.xml"/>
<import file="${basedir}/src/ant/build-release.xml"/>
-
+
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
-
+
<property file="ant.properties"/>
<property file="version.properties"/>
-
+
<property environment="env"/>
<property name="build.dir" value="${basedir}/output"/>
<property name="build.classes.dir"
value="${build.dir}/classes"/>
@@ -45,9 +45,9 @@
<property name="test.etc.dir" value="${test.dir}/etc"/>
<property name="test.java.dir" value="${test.dir}/java"/>
<property name="test.resources.dir"
value="${test.dir}/resources"/>
-
+
<property name="thirdparty.dir"
value="${basedir}/thirdparty"/>
-
+
<property name="jboss.home" value="${jboss.jdk15.home}"/>
<property name="jboss.lib" value="${jboss.home}/lib"/>
<property name="jboss.client" value="${jboss.home}/client"/>
@@ -56,20 +56,20 @@
<property name="jboss.server.deploy"
value="${jboss.server}/deploy"/>
<property name="jboss.server.deployers"
value="${jboss.server}/deployers"/>
<property name="jboss.thirdparty"
value="${jboss.home}/../../../thirdparty"/>
-
+
<property name="tomcat.webapps.dir"
value="${tomcat.home}/webapps"/>
<property name="tomcat.common.dir"
value="${tomcat.home}/common"/>
-
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
-
+
<target name="prepare">
-
+
<echo message="jboss.jdk15.home = ${jboss.jdk15.home}"/>
<echo message="tomcat.home = ${tomcat.home}"/>
<echo/>
-
+
<available property="jbossws.portal.content.available"
file="${jbossws.portal.content}" type="dir"/>
<available property="jboss.ejb3.available"
file="${jboss.client}/jboss-ejb3-client.jar"/>
<available property="jbossws.thirdparty.available"
file="${build.lib.dir}/jbossws-thirdparty.jar"/>
@@ -88,36 +88,36 @@
<isfalse value="${checksum.ok}"/>
</or>
</condition>
-
+
<fail message="Not available: ${jboss.client}/jboss-ejb3-client.jar"
unless="jboss.ejb3.available"/>
-
+
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
-
+
</target>
-
+
<target name="init" depends="prepare, thirdparty">
-
+
<!-- The combined compile classpath -->
<path id="core.classpath">
<path refid="library.classpath"/>
<path refid="jboss.core.classpath"/>
</path>
-
+
<!-- The combined integration classpath -->
<path id="integration.classpath">
<path refid="library.classpath"/>
<path refid="jboss.core.classpath"/>
<path refid="jboss.integration.classpath"/>
</path>
-
+
</target>
-
+
<!-- ================================================================== -->
<!-- Compile -->
<!-- ================================================================== -->
-
+
<!--
| Compile everything.
|
@@ -125,28 +125,28 @@
| different type of compile that needs to be performed, short of
| documentation compiles.
-->
-
+
<target name="compile"
depends="init,compile-classes,compile-etc,compile-resources"
description="Compile all source files."/>
-
+
<!-- Compile java sources -->
<target name="compile-classes"
depends="compile-interfaces,compile-core,compile-integration"/>
-
+
<!-- Compile core java sources -->
<target name="compile-interfaces" depends="init">
<mkdir dir="${build.classes14.dir}"/>
- <javac srcdir="${src.java.dir}"
destdir="${build.classes14.dir}" encoding="utf-8"
debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}" source="1.4"
target="1.4">
+ <javac srcdir="${src.java.dir}"
destdir="${build.classes14.dir}" encoding="utf-8"
debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" source="1.4"
target="1.4">
<include name="javax/xml/rpc/**"/>
<include name="javax/xml/soap/**"/>
<classpath refid="core.classpath"/>
</javac>
</target>
-
+
<!-- Compile core java sources -->
<target name="compile-core" depends="compile-interfaces">
<mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" sourcepath=""
destdir="${build.classes.dir}" encoding="utf-8"
debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}">
+ <javac srcdir="${src.java.dir}" sourcepath=""
destdir="${build.classes.dir}" encoding="utf-8"
debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}">
<include name="javax/xml/ws/**"/>
<include name="javax/jws/**"/>
<include name="org/jboss/ws/**"/>
@@ -155,7 +155,7 @@
<classpath refid="core.classpath"/>
</javac>
</target>
-
+
<!-- Compile interation java sources -->
<target name="compile-integration" depends="compile-core">
<mkdir dir="${build.classes.dir}"/>
@@ -166,7 +166,7 @@
<classpath refid="integration.classpath"/>
</javac>
</target>
-
+
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
<mkdir dir="${build.etc.dir}"/>
@@ -181,7 +181,7 @@
</filterset>
</copy>
</target>
-
+
<!-- Compile resource files -->
<target name="compile-resources" depends="init">
<mkdir dir="${build.resources.dir}"/>
@@ -189,22 +189,22 @@
<fileset dir="${src.resources.dir}"/>
</copy>
</target>
-
+
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
-
+
<!--
| Build all jar files.
-->
<target name="jars" description="Builds all jar files."
depends="compile,module-jars">
</target>
-
+
<!--
| Build all jar files.
-->
<target name="module-jars">
-
+
<!-- Build jboss-jaxrpc.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jboss-jaxrpc.jar"
manifest="${build.etc.dir}/default.mf">
@@ -212,7 +212,7 @@
<include name="javax/xml/rpc/**"/>
</fileset>
</jar>
-
+
<!-- Build jboss-saaj.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jboss-saaj.jar"
manifest="${build.etc.dir}/default.mf">
@@ -220,7 +220,7 @@
<include name="javax/xml/soap/**"/>
</fileset>
</jar>
-
+
<!-- Build jboss-jaxws.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jboss-jaxws.jar"
manifest="${build.etc.dir}/default.mf">
@@ -230,7 +230,7 @@
<include name="org/jboss/ws/jaxws/injection/**"/>
</fileset>
</jar>
-
+
<!-- Build jbossws-core.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jbossws-core.jar"
manifest="${build.etc.dir}/default.mf">
@@ -243,7 +243,7 @@
<include name="dtd/**"/>
</fileset>
</jar>
-
+
<!-- Build jbossws-jboss-integration.jar -->
<jar jarfile="${build.lib.dir}/jbossws-jboss-integration.jar"
manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes.dir}">
@@ -251,14 +251,14 @@
<include name="org/jboss/ws/integration/jboss50/**"/>
</fileset>
</jar>
-
+
<!-- Build jbossws-tomcat-integration.jar -->
<jar jarfile="${build.lib.dir}/jbossws-tomcat-integration.jar"
manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes.dir}">
<include name="org/jboss/ws/integration/tomcat/**"/>
</fileset>
</jar>
-
+
<!-- Build jbossws-client.jar -->
<jar jarfile="${build.lib.dir}/jbossws-client.jar"
manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes.dir}">
@@ -281,7 +281,7 @@
<include name="wstools-log4j.xml"/>
</fileset>
</jar>
-
+
<!-- Build jbossws-context.war -->
<war warfile="${build.lib.dir}/jbossws-context.war"
webxml="${build.resources.dir}/jbossws.war/JBoss/WEB-INF/web.xml">
<fileset dir="${build.resources.dir}/jbossws.war">
@@ -292,7 +292,7 @@
<include name="jboss-web.xml"/>
</webinf>
</war>
-
+
<!-- Build jbossws.war -->
<war warfile="${build.lib.dir}/jbossws.war"
webxml="${build.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml">
<fileset dir="${build.resources.dir}/jbossws.war">
@@ -312,7 +312,7 @@
<include name="log4j.xml"/>
</classes>
</war>
-
+
<!-- Build jbossws.sar -->
<jar jarfile="${build.lib.dir}/jbossws.sar"
manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.lib.dir}">
@@ -344,16 +344,16 @@
<include name="jbossws.deployer/META-INF/deployer-beans.xml"/>
</fileset>
</jar>
-
+
<zip destfile="${build.lib.dir}/jbossws-src.zip">
- <fileset dir="${src.java.dir}" />
+ <fileset dir="${src.java.dir}"/>
</zip>
</target>
-
+
<!-- ================================================================== -->
<!-- Documentation -->
<!-- ================================================================== -->
-
+
<!-- Generate the JavaDoc -->
<target name="javadoc" depends="init" description="Generate
the Javadoc">
<javadoc destdir="${build.api}" author="true"
version="true" use="true" windowtitle="JBossWS API">
@@ -365,11 +365,11 @@
</packageset>
</javadoc>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment -->
<!-- ================================================================== -->
-
+
<!-- Deploy jbossws to the server -->
<target name="deploy-jbossws" depends="main"
description="Deploy jbossws">
<antcall target="deploy-to-server">
@@ -381,29 +381,29 @@
<param name="jbossws" value="jbossws"/>
</antcall>
</target>
-
+
<!-- Deploy to jboss -->
<target name="deploy-to-server">
<copy todir="${jboss.deploy.home}/client"
file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss.deploy.home}/lib"
file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss.deploy.home}/client"
overwrite="true">
- <fileset dir="${build.lib.dir}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="${jbossws}-client.jar"/>
- </fileset>
+ <fileset dir="${build.lib.dir}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="${jbossws}-client.jar"/>
+ </fileset>
</copy>
<copy todir="${jboss.deploy.home}/server/${jboss.server.instance}/lib"
overwrite="true">
- <fileset dir="${build.lib.dir}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
+ <fileset dir="${build.lib.dir}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
</copy>
<delete
dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>
<mkdir
dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>
<unjar
dest="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"
src="${build.lib.dir}/${jbossws}.sar"/>
</target>
-
+
<!-- Deploy to jboss/thirdparty -->
<target name="deploy-to-thirdparty"
if="jboss.source.dist.available">
<!-- Only needed for the JBossAS webservice testsuite
@@ -412,7 +412,7 @@
<copy
todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib"
file="${build.lib.dir}/${jbossws}.sar" overwrite="true"/>
-->
</target>
-
+
<!-- Deploy to Tomcat -->
<target name="deploy-tomcat"
depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to
Tomcat">
<copy todir="${tomcat.common.dir}/endorsed"
file="${thirdparty.dir}/serializer.jar"/>
@@ -424,13 +424,13 @@
<copy todir="${tomcat.common.dir}/lib"
file="${build.lib.dir}/jbossws-core.jar" overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib"
file="${build.lib.dir}/jbossws-tomcat-integration.jar"
overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib"
file="${build.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib"
file="${build.lib.dir}/jboss-jaxws.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib"
file="${build.lib.dir}/jboss-jaxws.jar" overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib"
file="${build.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib"
file="${build.lib.dir}/jboss-saaj.jar" overwrite="true"/>
<copy todir="${tomcat.webapps.dir}"
file="${build.lib.dir}/jbossws.war" overwrite="true"/>
<delete dir="${tomcat.webapps.dir}/jbossws"/>
</target>
-
+
<target name="jbossws-thirdparty-jar"
unless="jbossws.thirdparty.available">
<!-- Build jbossws-thirdparty.jar -->
<mkdir dir="${build.lib.dir}/build"/>
@@ -452,21 +452,20 @@
</jar>
<delete dir="${build.lib.dir}/build"/>
</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 name="all" description="Create a distribution zip file"
depends="build-bin-dist,build-src-dist">
</target>
-
-</project>
+
+</project>
\ No newline at end of file