7:06 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2006-12-22 08:06:00 -0500 (Fri, 22 Dec 2006)
New Revision: 1733
Modified:
trunk/integration-jboss42/build.xml
Log:
restructure build
Modified: trunk/integration-jboss42/build.xml
===================================================================
--- trunk/integration-jboss42/build.xml 2006-12-22 13:05:56 UTC (rev 1732)
+++ trunk/integration-jboss42/build.xml 2006-12-22 13:06:00 UTC (rev 1733)
@@ -15,13 +15,17 @@
<import file="${basedir}/../build/import/build-setup.xml"/>
<import file="${basedir}/../build/import/build-thirdparty.xml"/>
+ <import file="${basedir}/../jbossws/build.xml"/>
+ <property name="jboss42.src.dir"
value="${integration.jboss42.dir}/src/main"/>
+ <property name="jboss42.java.dir"
value="${jboss42.src.dir}/java"/>
+ <property name="jboss42.resources.dir"
value="${jboss42.src.dir}/resources"/>
+ <property name="jboss42.output.dir"
value="${integration.jboss42.dir}/output"/>
+ <property name="jboss42.output.classes.dir"
value="${jboss42.output.dir}/classes"/>
+ <property name="jboss42.output.classes14.dir"
value="${jboss42.output.dir}/classes14"/>
+ <property name="jboss42.output.lib.dir"
value="${jboss42.output.dir}/lib"/>
+
<target name="jboss42-init" depends="prepare, thirdparty">
- <path id="core.classpath">
- <path refid="library.classpath"/>
- <path refid="jboss.core.classpath"/>
- <path path="${jbossws.dir}/output/lib/jbossws-client.jar"/>
- </path>
</target>
<!-- ================================================================== -->
@@ -39,15 +43,15 @@
<target name="jboss42-compile"
depends="jboss42-compile-classes,jboss42-compile-etc" description="Compile
all source files."/>
<!-- Compile integration java sources -->
- <target name="jboss42-compile-classes"
depends="jboss42-init">
+ <target name="jboss42-compile-classes"
depends="jboss42-init,jbossws-compile">
<mkdir dir="${output.classes.dir}"/>
<ant antfile="${jbossws.dir}/build.xml" target="jbossws-jars"
dir="${jbossws.dir}" inheritall="false"/>
- <javac srcdir="${integration.jboss42.dir}/src/main/java"
sourcepath="" destdir="${output.classes.dir}"
encoding="utf-8" debug="${javac.debug}"
verbose="${javac.verbose}"
+ <javac srcdir="${jboss42.java.dir}" sourcepath=""
destdir="${jboss42.output.classes.dir}" encoding="utf-8"
debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}">
<include name="org/jboss/ws/integration/jboss42/**"/>
- <classpath path="${output.classes14.dir}"/>
<classpath refid="jboss42.integration.classpath"/>
- <classpath refid="core.classpath"/>
+ <classpath path="${jbossws.output.classes14.dir}"/>
+ <classpath path="${jbossws.output.classes.dir}"/>
</javac>
</target>
@@ -71,22 +75,24 @@
<target name="jboss42-module-jars">
<!-- Build jbossws-jboss42-integration.jar -->
- <mkdir dir="${output.lib.dir}"/>
- <jar jarfile="${output.lib.dir}/jbossws-jboss42-integration.jar"
manifest="${output.etc.dir}/default.mf">
- <fileset dir="${output.classes.dir}">
+ <mkdir dir="${jboss42.output.lib.dir}"/>
+ <jar jarfile="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar"
manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${jboss42.output.classes.dir}">
<include name="org/jboss/ws/integration/*.class"/>
<include name="org/jboss/ws/integration/jboss42/**"/>
</fileset>
- <metainf
dir="${integration.jboss42.dir}/src/resources/jbossws-jboss42-integration.jar/META-INF"/>
+ <metainf
dir="${jboss42.resources.dir}/jbossws-jboss42-integration.jar/META-INF"/>
</jar>
<!-- Build jbossws42.sar -->
- <jar jarfile="${output.lib.dir}/jbossws42.sar"
manifest="${output.etc.dir}/default.mf">
- <fileset dir="${output.lib.dir}">
+ <jar jarfile="${jboss42.output.lib.dir}/jbossws42.sar"
manifest="${output.etc.dir}/default.mf">
+ <fileset dir="${jboss42.output.lib.dir}">
<include name="jbossws-jboss42-integration.jar"/>
+ <include name="jbossws-context.war"/>
+ </fileset>
+ <fileset dir="${jbossws.output.lib.dir}">
<include name="jbossws-core.jar"/>
<include name="jboss-jaxws.jar"/>
- <include name="jbossws-context.war"/>
</fileset>
<fileset dir="${thirdparty.dir}">
<include name="jaxb-api.jar"/>
@@ -97,7 +103,7 @@
<include name="wstx-lgpl-2.9.3.jar"/>
<include name="xmlsec.jar"/>
</fileset>
- <fileset dir="${integration.jboss42.dir}/src/resources">
+ <fileset dir="${jboss42.resources.dir}">
<include name="jbossws.beans/META-INF/jboss-beans.xml"/>
</fileset>
<metainf dir="${jbossws.resources.dir}/jbossws.sar/META-INF">
@@ -106,7 +112,7 @@
<include name="standard-jaxws-client-config.xml"/>
<include name="standard-jaxws-endpoint-config.xml"/>
</metainf>
- <metainf
dir="${integration.jboss42.dir}/src/resources/jbossws.sar/META-INF">
+ <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF">
<include name="jboss-service.xml"/>
</metainf>
</jar>
@@ -122,21 +128,21 @@
<copy todir="${jboss42.home}/client"
file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss42.home}/lib"
file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss42.home}/client" overwrite="true">
- <fileset dir="${output.lib.dir}">
+ <fileset dir="${jbossws.output.lib.dir}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
</fileset>
</copy>
<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib"
overwrite="true">
- <fileset dir="${output.lib.dir}">
+ <fileset dir="${jbossws.output.lib.dir}">
<include name="jboss-jaxrpc.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
</copy>
<delete
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<mkdir
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar
dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="${output.lib.dir}/jbossws42.sar"/>
+ <unjar
dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="${jboss42.output.lib.dir}/jbossws42.sar"/>
</target>
<!-- ================================================================== -->
@@ -144,7 +150,7 @@
<!-- ================================================================== -->
<target name="clean" depends="prepare" description="Cleans
up most generated files.">
- <delete dir="${output.dir}"/>
+ <delete dir="${jboss42.output.dir}"/>
</target>
<target name="main" description="Executes the default target
(most)." depends="most"/>