[jbossws-commits] JBossWS SVN: r6682 - in stack/native/trunk: ant-import and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Apr 25 05:40:53 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-04-25 05:40:52 -0400 (Fri, 25 Apr 2008)
New Revision: 6682
Modified:
stack/native/trunk/ant-import/build-deploy.xml
stack/native/trunk/ant-import/build-prepare-deploy.xml
stack/native/trunk/ant-import/build-thirdparty.xml
stack/native/trunk/ant-import/jbossws-deploy-macros.xml
stack/native/trunk/build.xml
stack/native/trunk/version.properties
Log:
Switch to jbossws-jboss42x-3.0.0-SNAPSHOT
Modified: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml 2008-04-25 09:07:01 UTC (rev 6681)
+++ stack/native/trunk/ant-import/build-deploy.xml 2008-04-25 09:40:52 UTC (rev 6682)
@@ -21,8 +21,9 @@
<delete dir="${deploy.structure.jboss42}"/>
<antcall target="deploy-jbossws-native42" inheritall="false">
<param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/>
- <param name="resourcesdir" value="${deploy.artifacts.dir}/resources/jbossws-jboss42.sar"/>
+ <param name="resourcesdir" value="${deploy.artifacts.dir}/resources"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ <param name="jbossid" value="${deploy.target}"/>
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/>
</target>
@@ -30,6 +31,10 @@
<!-- ================================================================== -->
<!-- Deployment JBoss421 -->
<!-- ================================================================== -->
+
+ <target name="deploy-target-jboss421" depends="prepare">
+ <property name="deploy.target" value="jboss421"/>
+ </target>
<target name="deploy-jboss421" depends="undeploy-jboss421,deploy-structure-jboss42" description="Deploy jbossws to jboss421">
<fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
@@ -58,7 +63,7 @@
</copy>
</target>
- <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws from jboss421">
+ <target name="undeploy-jboss421" depends="deploy-target-jboss421" description="Remove jbossws from jboss421">
<fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/>
<macro-undeploy-jbossws targetdir="${jboss421.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<delete file="${jboss421.server.lib}/jbossws-integration.jar"/>
@@ -69,6 +74,10 @@
<!-- Deployment JBoss422 -->
<!-- ================================================================== -->
+ <target name="deploy-target-jboss422" depends="prepare">
+ <property name="deploy.target" value="jboss422"/>
+ </target>
+
<target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
<copy todir="${jboss422.home}" overwrite="true">
@@ -78,7 +87,7 @@
<chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422">
+ <target name="undeploy-jboss422" depends="deploy-target-jboss422" description="Remove jbossws from jboss422">
<fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
<macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<delete dir="${jboss422.server.deploy}/juddi-service.sar"/>
@@ -88,6 +97,10 @@
<!-- Deployment JBoss423 -->
<!-- ================================================================== -->
+ <target name="deploy-target-jboss423" depends="prepare">
+ <property name="deploy.target" value="jboss423"/>
+ </target>
+
<target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
<copy todir="${jboss423.home}" overwrite="true">
@@ -97,7 +110,7 @@
<chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423">
+ <target name="undeploy-jboss423" depends="deploy-target-jboss423" description="Remove jbossws from jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
<macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<delete dir="${jboss423.server.deploy}/juddi-service.sar"/>
@@ -112,6 +125,7 @@
<antcall target="deploy-jbossws-native50" inheritall="false">
<param name="installserver" value="${deploy.structure.jboss50}/server/${jboss.server.instance}"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ <param name="jbossid" value="${deploy.target}"/>
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure.jboss50}"/>
</target>
@@ -120,6 +134,10 @@
<!-- Deployment JBoss500 -->
<!-- ================================================================== -->
+ <target name="deploy-target-jboss500" depends="prepare">
+ <property name="deploy.target" value="jboss500"/>
+ </target>
+
<target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<copy todir="${jboss500.home}" overwrite="true">
@@ -129,7 +147,7 @@
<chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500">
+ <target name="undeploy-jboss500" depends="deploy-target-jboss500" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
<macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<delete dir="${jboss500.server.deploy}/juddi-service.sar"/>
@@ -139,6 +157,10 @@
<!-- Deployment JBoss501 -->
<!-- ================================================================== -->
+ <target name="deploy-target-jboss501" depends="prepare">
+ <property name="deploy.target" value="jboss501"/>
+ </target>
+
<target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<copy todir="${jboss501.home}" overwrite="true">
@@ -148,7 +170,7 @@
<chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
+ <target name="undeploy-jboss501" depends="deploy-target-jboss501" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<delete dir="${jboss501.server.deploy}/juddi-service.sar"/>
Modified: stack/native/trunk/ant-import/build-prepare-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-prepare-deploy.xml 2008-04-25 09:07:01 UTC (rev 6681)
+++ stack/native/trunk/ant-import/build-prepare-deploy.xml 2008-04-25 09:40:52 UTC (rev 6682)
@@ -32,7 +32,8 @@
<patternset refid="jbossws.service.lib.patternset"/>
<include name="jboss-xml-binding.jar"/>
<include name="jbossws-jboss421.jar"/>
- <include name="jbossws-jboss42.jar"/>
+ <include name="jbossws-jboss422.jar"/>
+ <include name="jbossws-jboss423.jar"/>
<include name="jbossws-jboss50.jar"/>
<include name="jbossws-jboss50-container.jar"/>
<include name="juddi-service.sar"/>
@@ -49,9 +50,7 @@
<copy todir="${deploy.artifacts.dir}/resources">
<fileset dir="${core.output.resources.dir}">
<include name="standard-*-config.xml"/>
- <include name="jbossws-native42-beans.xml"/>
- <include name="jbossws-native50-beans.xml"/>
- <include name="jbossws-jboss42.sar/**"/>
+ <include name="jbossws-jboss*/**"/>
<include name="jbossws-deployer-beans.xml"/>
</fileset>
</copy>
Modified: stack/native/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-25 09:07:01 UTC (rev 6681)
+++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-04-25 09:40:52 UTC (rev 6682)
@@ -48,20 +48,6 @@
thirdpartry-get
-->
- <target name="get422-jars" if="jbossws.integration.jboss422">
- <mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss422}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
- </target>
-
- <target name="get423-jars" if="jbossws.integration.jboss423">
- <mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss42.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss42-src.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss423}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
- </target>
-
<target name="get501-jars" if="jbossws.integration.jboss501">
<mkdir dir="${thirdparty.dir}"/>
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/>
@@ -70,7 +56,7 @@
<get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss501}/lib/jbossws-jboss50-deployer-resources.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" usetimestamp="true" verbose="true"/>
</target>
- <target name="thirdparty-get" depends="thirdparty-delete, get422-jars, get423-jars, get501-jars" if="force.thirdparty"
+ <target name="thirdparty-get" depends="thirdparty-delete,get501-jars" if="force.thirdparty"
description="Gets the thirdparty libraries">
<!--
@@ -90,6 +76,12 @@
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.jar" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.jar" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss422/${jbossws-jboss422}/lib/jbossws-jboss422.jar" dest="${thirdparty.dir}/jbossws-jboss422.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss422/${jbossws-jboss422}/lib/jbossws-jboss422-src.jar" dest="${thirdparty.dir}/jbossws-jboss422-src.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss422/${jbossws-jboss422}/lib/jbossws-jboss422-resources.zip" dest="${thirdparty.dir}/jbossws-jboss422-resources.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423.jar" dest="${thirdparty.dir}/jbossws-jboss423.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423-src.jar" dest="${thirdparty.dir}/jbossws-jboss423-src.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss423/${jbossws-jboss423}/lib/jbossws-jboss423-resources.zip" dest="${thirdparty.dir}/jbossws-jboss423-resources.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 09:07:01 UTC (rev 6681)
+++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-25 09:40:52 UTC (rev 6682)
@@ -201,59 +201,50 @@
<macrodef name="macro-deploy-jbossws-client">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
+ <attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
+ <include name="**/jbossws-@{jbossid}.jar"/>
</fileset>
</copy>
</sequential>
</macrodef>
-
- <macrodef name="macro-deploy-jbossws-client42">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-jboss42.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
<!-- ================================================================== -->
<!-- Deploy Server Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-server-lib">
+ <macrodef name="macro-deploy-jbossws-server-lib42">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
+ <attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.server.lib.patternset"/>
+ <include name="**/jbossws-@{jbossid}.jar"/>
</fileset>
</copy>
</sequential>
</macrodef>
-
- <macrodef name="macro-deploy-jbossws-server-lib42">
+
+ <macrodef name="macro-deploy-jbossws-server-lib50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-jboss42.jar"/>
+ <patternset refid="jbossws.server.lib.patternset"/>
</fileset>
</copy>
</sequential>
</macrodef>
-
+
<!-- ================================================================== -->
<!-- Deploy JBossWS Service -->
<!-- ================================================================== -->
@@ -262,6 +253,7 @@
<attribute name="thirdpartydir"/>
<attribute name="resourcesdir"/>
<attribute name="targetdir"/>
+ <attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
@@ -281,16 +273,16 @@
</unzip>
<copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-native42-beans.xml"/>
+ <include name="**/jbossws-@{jbossid}-beans.xml"/>
</fileset>
</copy>
- <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-native42-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/>
+ <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-@{jbossid}-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/>
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<include name="**/standard-jaxrpc-*-config.xml"/>
<include name="**/standard-jaxws-*-config.xml"/>
</fileset>
- <fileset dir="@{resourcesdir}/META-INF"/>
+ <fileset dir="@{resourcesdir}/jbossws-@{jbossid}/jbossws-jboss42.sar/META-INF"/>
</copy>
</sequential>
</macrodef>
@@ -298,6 +290,7 @@
<macrodef name="macro-deploy-jbossws-native50-sar">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
+ <attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
@@ -315,7 +308,7 @@
<fileset dir="@{thirdpartydir}">
<include name="**/standard-jaxrpc-*-config.xml"/>
<include name="**/standard-jaxws-*-config.xml"/>
- <include name="**/jbossws-native50-beans.xml"/>
+ <include name="**/jbossws-@{jbossid}-beans.xml"/>
</fileset>
</copy>
</sequential>
@@ -330,22 +323,20 @@
<target name="deploy-jbossws-native42" depends="deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/>
+ <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}" jbossid="${jbossid}"/>
</target>
<target name="deploy-jbossws-native50" depends="deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-native50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-native50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
</target>
<target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-04-25 09:07:01 UTC (rev 6681)
+++ stack/native/trunk/build.xml 2008-04-25 09:40:52 UTC (rev 6682)
@@ -88,9 +88,9 @@
-->
<project default="main" basedir="." name="JBossWS-Native">
-
+
<property name="core.dir" value="${basedir}"/>
-
+
<import file="${basedir}/ant-import/build-setup.xml"/>
<import file="${basedir}/ant-import/build-bin-dist.xml"/>
<import file="${basedir}/ant-import/build-prepare-deploy.xml"/>
@@ -113,7 +113,7 @@
<property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/>
<property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
<property name="core.output.resources.dir" value="${core.output.dir}/resources"/>
-
+
<property name="deploy.artifacts.dir" value="${core.output.deploy.dir}-artifacts"/>
<property name="deploy.structure.jboss42" value="${core.output.deploy.dir}-jboss42"/>
<property name="deploy.structure.jboss50" value="${core.output.deploy.dir}-jboss50"/>
@@ -121,38 +121,37 @@
<target name="init" depends="prepare,thirdparty">
</target>
-
+
<!-- ================================================================== -->
<!-- Compile -->
<!-- ================================================================== -->
-
+
<!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | 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 everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | 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="init">
-
+
<!-- Compile interfaces with jdk1.4 -->
<mkdir dir="${core.output.classes14.dir}"/>
- <javac srcdir="${core.java.dir}" destdir="${core.output.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="${core.java.dir}" destdir="${core.output.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="thirdparty.classpath"/>
</javac>
-
+
<!-- Compile core classes with jdk1.5 -->
<mkdir dir="${core.output.classes.dir}"/>
<javac srcdir="${core.java.dir}" sourcepath="" destdir="${core.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
<include name="javax/annotation/**"/>
<include name="javax/xml/ws/**"/>
<include name="javax/jws/**"/>
@@ -162,14 +161,14 @@
<classpath path="${core.output.classes14.dir}"/>
<classpath refid="thirdparty.classpath"/>
</javac>
-
+
<copy todir="${core.output.classes.dir}">
- <fileset dir="${core.java.dir}">
- <include name="**/*.xml"/>
- </fileset>
+ <fileset dir="${core.java.dir}">
+ <include name="**/*.xml"/>
+ </fileset>
</copy>
</target>
-
+
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
<mkdir dir="${core.output.etc.dir}"/>
@@ -184,61 +183,70 @@
</filterset>
</copy>
</target>
-
- <!-- Compile resource files -->
- <target name="compile42-resources" if="jbossws.integration.jboss42">
- <mkdir dir="${core.output.resources.dir}"/>
- <!-- Concat jboss-beans.xml -->
- <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
- <concat destfile="${core.output.resources.dir}/jbossws-native42-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
- </header>
- <fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
- <fileset file="${core.output.resources.dir}/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
- </target>
-
-
- <target name="compile50-resources" if="jbossws.integration.jboss50">
- <mkdir dir="${core.output.resources.dir}"/>
- <unzip src="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" dest="${core.output.resources.dir}"/>
-
- <!-- Concat jbossws-native50-beans.xml -->
- <concat destfile="${core.output.resources.dir}/jbossws-native50-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0">
- </header>
- <fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
- </target>
-
- <target name="compile-resources" depends="init, compile42-resources, compile50-resources">
- <mkdir dir="${core.output.resources.dir}"/>
- <copy todir="${core.output.resources.dir}">
- <fileset dir="${core.resources.dir}/standard-config">
- <include name="standard-*-config.xml"/>
- </fileset>
- </copy>
-
+
+ <!-- Compile resource files -->
+ <target name="compile42-resources">
+
+ <unzip dest="${core.output.dir}/resources/jbossws-jboss422" src="${thirdparty.dir}/jbossws-jboss422-resources.zip"/>
+ <unzip dest="${core.output.dir}/resources/jbossws-jboss423" src="${thirdparty.dir}/jbossws-jboss423-resources.zip"/>
+
+ <!-- Concat jbossws-jboss422-beans.xml -->
+ <concat destfile="${core.output.resources.dir}/jbossws-jboss422/jbossws-jboss422-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer"> </header>
+ <fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
+ <fileset file="${core.output.resources.dir}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ <!-- Concat jbossws-jboss423-beans.xml -->
+ <concat destfile="${core.output.resources.dir}/jbossws-jboss423/jbossws-jboss423-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer"> </header>
+ <fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
+ <fileset file="${core.output.resources.dir}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
</target>
-
+
+ <target name="compile50-resources">
+
+ <unzip dest="${core.output.resources.dir}" src="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip"/>
+
+ <!-- Concat jbossws-jboss501-beans.xml -->
+ <concat destfile="${core.output.resources.dir}/jbossws-jboss501-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+ </target>
+
+ <target name="compile-resources" depends="init, compile42-resources, compile50-resources">
+ <mkdir dir="${core.output.resources.dir}"/>
+ <copy todir="${core.output.resources.dir}">
+ <fileset dir="${core.resources.dir}/standard-config">
+ <include name="standard-*-config.xml"/>
+ </fileset>
+ </copy>
+
+ </target>
+
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
-
+
<!--
- | Build all jar files.
- -->
+ | Build all jar files.
+ -->
<target name="jars" depends="compile" description="Builds all jar files.">
-
+
<!-- Build jboss-jaxrpc.jar -->
<mkdir dir="${core.output.lib.dir}"/>
<jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${core.output.etc.dir}/default.mf">
@@ -246,7 +254,7 @@
<include name="javax/xml/rpc/**"/>
</fileset>
</jar>
-
+
<!-- Build jboss-saaj.jar -->
<mkdir dir="${core.output.lib.dir}"/>
<jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${core.output.etc.dir}/default.mf">
@@ -255,7 +263,7 @@
</fileset>
<metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/>
</jar>
-
+
<!-- Build jboss-jaxws.jar -->
<mkdir dir="${core.output.lib.dir}"/>
<jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${core.output.etc.dir}/default.mf">
@@ -281,7 +289,7 @@
</fileset>
<metainf dir="${core.resources.dir}/jboss-jaxws.jar/META-INF"/>
</jar>
-
+
<!-- Build jboss-jaxws-ext.jar -->
<mkdir dir="${core.output.lib.dir}"/>
<jar jarfile="${core.output.lib.dir}/jboss-jaxws-ext.jar" manifest="${core.output.etc.dir}/default.mf">
@@ -301,10 +309,11 @@
<include name="javax/xml/ws/soap/Addressing.class"/>
<include name="javax/xml/ws/soap/MTOM.class"/>
<include name="javax/xml/ws/soap/MTOMFeature.class"/>
- <include name="javax/xml/ws/wsaddressing/**"/> </fileset>
+ <include name="javax/xml/ws/wsaddressing/**"/>
+ </fileset>
<metainf dir="${core.resources.dir}/jboss-jaxws-ext.jar/META-INF"/>
</jar>
-
+
<!-- Build jbossws-core.jar -->
<mkdir dir="${core.output.lib.dir}"/>
<jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${core.output.etc.dir}/default.mf">
@@ -320,24 +329,23 @@
</fileset>
<metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/>
</jar>
-
- <!-- Build jbossws-embedded.jar -->
- <mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jbossws-embedded.jar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.classes.dir}">
- <include name="org/jboss/wsf/stack/jbws/embedded/**"/>
- </fileset>
- <metainf dir="${core.resources.dir}/jbossws-embedded.jar/META-INF"/>
- </jar>
-
-
- <!-- Build jbossws-client.jar -->
+
+ <!-- Build jbossws-embedded.jar -->
+ <mkdir dir="${core.output.lib.dir}"/>
+ <jar jarfile="${core.output.lib.dir}/jbossws-embedded.jar" manifest="${core.output.etc.dir}/default.mf">
+ <fileset dir="${core.output.classes.dir}">
+ <include name="org/jboss/wsf/stack/jbws/embedded/**"/>
+ </fileset>
+ <metainf dir="${core.resources.dir}/jbossws-embedded.jar/META-INF"/>
+ </jar>
+
+ <!-- Build jbossws-client.jar -->
<jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${core.output.etc.dir}/default.mf">
<fileset dir="${core.output.classes.dir}">
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/wsf/stack/jbws/embedded/**"/>
-
+
<!-- JAX-WS 2.1 extensions -->
<include name="javax/xml/ws/**/*21.class"/>
<include name="javax/xml/ws/Action.class"/>
@@ -367,7 +375,7 @@
<metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/>
<metainf dir="${core.resources.dir}/standard-config"/>
</jar>
-
+
<!-- Build jbossws-context.war -->
<copy todir="${core.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true">
<fileset dir="${core.resources.dir}/jbossws-context.war"/>
@@ -377,8 +385,7 @@
<filtersfile file="${core.dir}/version.properties"/>
</filterset>
</copy>
- <war warfile="${core.output.lib.dir}/jbossws-context.war"
- webxml="${core.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
+ <war warfile="${core.output.lib.dir}/jbossws-context.war" webxml="${core.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
manifest="${core.output.etc.dir}/default.mf">
<fileset dir="${core.output.resources.dir}/jbossws-context.war">
<include name="index.html"/>
@@ -388,9 +395,9 @@
<include name="jboss-web.xml"/>
</webinf>
</war>
-
+
<!-- Build jbossws-core-scripts.zip -->
- <zip zipfile="${core.output.lib.dir}/jbossws-core-scripts.zip" >
+ <zip zipfile="${core.output.lib.dir}/jbossws-core-scripts.zip">
<fileset dir="${core.output.etc.dir}">
<include name="wsrunclient.bat"/>
<include name="wstools.bat"/>
@@ -400,28 +407,29 @@
<include name="wstools.sh"/>
</zipfileset>
</zip>
-
+
<!-- Build jbossws-core-src.zip -->
- <zip zipfile="${core.output.lib.dir}/jbossws-core-src.zip" >
+ <zip zipfile="${core.output.lib.dir}/jbossws-core-src.zip">
<fileset dir="${core.java.dir}"/>
</zip>
-
+
</target>
-
+
<!-- ================================================================== -->
<!-- Documentation -->
<!-- ================================================================== -->
-
+
<!-- Generate the JavaDoc -->
<target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">
-
+
<mkdir dir="${core.output.apidocs.dir}"/>
<javadoc destdir="${core.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
<classpath refid="thirdparty.classpath"/>
<packageset dir="${core.java.dir}" defaultexcludes="yes">
<include name="org/jboss/ws/**"/>
</packageset>
- <doctitle><![CDATA[<h1>JBossWS Native</h1>]]></doctitle>
+ <doctitle><![CDATA[<h1>JBossWS Native</h1>]]>
+ </doctitle>
<tag name="todo" scope="all" description="To do:"/>
<group title="Core" packages="org.jboss.ws.core*"/>
<group title="Metadata" packages="org.jboss.ws.metadata*"/>
@@ -430,20 +438,20 @@
<group title="Tools" packages="org.jboss.ws.tools*"/>
</javadoc>
</target>
-
+
<target name="clean" depends="prepare" description="Cleans up most generated files.">
<delete dir="${core.output.dir}"/>
</target>
-
+
<target name="clobber" depends="clean" description="Cleans up all generated files.">
<delete dir="${core.dir}/thirdparty"/>
</target>
-
+
<target name="main" description="Executes the default target (most)." depends="most"/>
-
+
<target name="most" description="Builds almost everything." depends="jars,tests-main"/>
-
+
<target name="all" description="Create a distribution zip file" depends="most">
</target>
-
+
</project>
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-04-25 09:07:01 UTC (rev 6681)
+++ stack/native/trunk/version.properties 2008-04-25 09:40:52 UTC (rev 6682)
@@ -28,8 +28,8 @@
jbossws-common=3.0.0-SNAPSHOT
jbossws-framework=3.0.2-SNAPSHOT
-jbossws-jboss422=4.2.2.DEV
-jbossws-jboss423=4.2.3.DEV
+jbossws-jboss422=3.0.0-SNAPSHOT
+jbossws-jboss423=3.0.0-SNAPSHOT
jbossws-jboss501=5.0.1.DEV
# JBossAS-5.0
More information about the jbossws-commits
mailing list