[jbossws-commits] JBossWS SVN: r11224 - in stack/native/trunk: src/main/distro and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Dec 9 06:37:39 EST 2009
Author: richard.opalka at jboss.com
Date: 2009-12-09 06:37:39 -0500 (Wed, 09 Dec 2009)
New Revision: 11224
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/src/main/distro/build-deploy.xml
Log:
[JBWS-2821] fixing Native
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-12-09 11:01:33 UTC (rev 11223)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-12-09 11:37:39 UTC (rev 11224)
@@ -13,8 +13,6 @@
<!--
These patterns should be common for all supported containers.
- All jars must also be declared in component-info.xml to ensure
- that the AS build uses the same version.
-->
<patternset id="jbossws.bin.patternset">
<include name="**/wsconsume.bat"/>
@@ -56,7 +54,8 @@
</patternset>
<patternset id="jbossws.lib.patternset">
- <include name="**/nothing-to-deploy"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/wstx.jar"/>
</patternset>
<patternset id="jbossws.lib.endorsed.patternset">
@@ -82,7 +81,7 @@
<include name="**/jboss-jaxb-intros.jar"/>
<include name="**/jbossws-native-core.jar"/>
<include name="**/jettison.jar"/>
- <include name="**/netty.jar"/>
+ <include name="**/netty.jar"/>
<include name="**/policy.jar"/>
<include name="**/wsdl4j.jar"/>
<include name="**/xmlsec.jar"/>
@@ -109,7 +108,7 @@
<!-- Deploy Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-lib50">
+ <macrodef name="macro-deploy-jbossws-lib">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<sequential>
@@ -117,58 +116,11 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.lib.patternset"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/wstx.jar"/>
</fileset>
</copy>
</sequential>
</macrodef>
- <macrodef name="macro-deploy-jbossws-lib51">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.patternset"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/wstx.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-jbossws-lib52">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.patternset"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/wstx.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-jbossws-lib60">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.lib.patternset"/>
- <include name="**/jaxb-impl.jar"/>
- <include name="**/wstx.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<!-- ================================================================== -->
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
@@ -190,84 +142,26 @@
<!-- Deploy Client -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-client50">
+ <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-client51">
- <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-client52">
- <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"/>
- <!-- JBWS-2505 -->
- <!-- START -->
- <!--
- <include name="**/jbossws-@{jbossid}.jar"/>
- -->
- <!-- END -->
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-jbossws-client60">
- <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"/>
- <!-- JBWS-2505 -->
- <!-- START -->
- <!--
- <include name="**/jbossws-@{jbossid}.jar"/>
- -->
- <!-- END -->
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<!-- ================================================================== -->
<!-- Deploy Server Lib -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-server-lib50">
+ <macrodef name="macro-deploy-jbossws-server-lib">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
- <attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
@@ -278,48 +172,6 @@
</sequential>
</macrodef>
- <macrodef name="macro-deploy-jbossws-server-lib51">
- <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"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-jbossws-server-lib52">
- <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"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-jbossws-server-lib60">
- <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"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
<!-- ================================================================== -->
<!-- Deploy JUDDI Service -->
<!-- ================================================================== -->
@@ -344,17 +196,15 @@
</macrodef>
<!-- ================================================================== -->
- <!-- Deploy JBossWS Service -->
+ <!-- Deploy JBossWS Console -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-sar50">
+ <macrodef name="macro-deploy-jbossws-deployment">
<attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
<attribute name="targetdir"/>
- <attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}/jbossws-management.war">
+ <unzip dest="@{targetdir}">
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-native-management.war"/>
</fileset>
@@ -362,56 +212,12 @@
</sequential>
</macrodef>
- <macrodef name="macro-deploy-jbossws-sar51">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}/jbossws-management.war">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-native-management.war"/>
- </fileset>
- </unzip>
- </sequential>
- </macrodef>
- <macrodef name="macro-deploy-jbossws-sar52">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}/jbossws-management.war">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-native-management.war"/>
- </fileset>
- </unzip>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-jbossws-sar60">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <unzip dest="@{targetdir}/jbossws-management.war">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-native-management.war"/>
- </fileset>
- </unzip>
- </sequential>
- </macrodef>
-
<!-- ================================================================== -->
<!-- Deploy Deployers -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-deployers50">
+ <macrodef name="macro-deploy-jbossws-deployers">
<attribute name="thirdpartydir"/>
<attribute name="artifactsdir"/>
<attribute name="targetdir"/>
@@ -437,364 +243,105 @@
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-@{jbossid}.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/stack-agnostic-jboss-beans.xml"/>
- </fileset>
- </copy>
+ <antcall target="modify-jboss-integration">
+ <param name="targetdir" value="@{targetdir}"/>
+ </antcall>
</sequential>
</macrodef>
- <macrodef name="macro-deploy-jbossws-deployers51">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
+ <target name="modify-jboss-integration" depends="process-jboss-integration" if="fixintegration">
<sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
+ <copy todir="${targetdir}" flatten="true" overwrite="true">
+ <fileset dir="${thirdpartydir}">
+ <include name="**/jbossws-${jbossid}.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{artifactsdir}/resources">
- <include name="standard-*-config.xml"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-@{jbossid}.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
+ <copy todir="${targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="${artifactsdir}/resources/jbossws-${jbossid}">
<include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
</sequential>
- </macrodef>
+ </target>
- <macrodef name="macro-deploy-jbossws-deployers52">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{artifactsdir}/resources">
- <include name="standard-*-config.xml"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <include name="**/jbossws-@{jbossid}.jar"/>
- -->
- <!-- END -->
- </fileset>
- </copy>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/stack-agnostic-jboss-beans.xml"/>
- </fileset>
- </copy>
- -->
- <!-- END -->
- </sequential>
- </macrodef>
-
- <macrodef name="macro-deploy-jbossws-deployers60">
- <attribute name="thirdpartydir"/>
- <attribute name="artifactsdir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{artifactsdir}/resources">
- <include name="standard-*-config.xml"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <include name="**/jbossws-@{jbossid}.jar"/>
- -->
- <!-- END -->
- </fileset>
- </copy>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/stack-agnostic-jboss-beans.xml"/>
- </fileset>
- </copy>
- -->
- <!-- END -->
- </sequential>
- </macrodef>
-
<!-- ================================================================== -->
<!-- Deploy JBossWS -->
<!-- ================================================================== -->
- <available classname="java.io.Console" property="HAVE_JDK16_OR_ABOVE"/>
-
- <target name="deploy-jbossws-native50" depends="check-parameters">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
- <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
+ <target name="check-parameters">
+ <fail message="installserver must be specified" unless="installserver"/>
+ <fail message="artifactsdir must be specified" unless="artifactsdir"/>
+ <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
+ <fail message="modifyjbossintegration must be specified" unless="modifyjbossintegration"/>
</target>
- <target name="deploy-jbossws-native51" depends="check-parameters">
+ <target name="deploy-jbossws-native" depends="check-parameters">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client51 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib51 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib51 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
- <macro-deploy-jbossws-sar51 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deployers51 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/>
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
- <target name="deploy-jbossws-native52" depends="check-parameters">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client52 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib52 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib52 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
- <macro-deploy-jbossws-sar52 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deployers52 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
- </target>
- <target name="deploy-jbossws-native60" depends="check-parameters">
- <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client60 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-lib60 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-server-lib60 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
- <macro-deploy-jbossws-sar60 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deployers60 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
- </target>
-
- <target name="deploy-jbossws-endorsed" if="HAVE_JDK16_OR_ABOVE">
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
- </target>
-
- <target name="check-parameters">
- <fail message="artifactsdir must be specified" unless="artifactsdir"/>
- <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
- <fail message="installserver must be specified" unless="installserver"/>
- </target>
-
<!-- ================================================================== -->
<!-- Undeploy JBossWS -->
<!-- ================================================================== -->
- <macrodef name="macro-undeploy-jbossws50">
+ <macrodef name="macro-undeploy-jbossws">
<attribute name="defaultconf"/>
<attribute name="targetdir"/>
+ <attribute name="modifyjbossintegration"/>
<sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deploy/jbossws.sar/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" failonerror="false"/>
<loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
- <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <property name="jboss.server.home" value="@{targetdir}"/>
<property name="jboss.home" value="${jboss.server.home}/../.."/>
<available property="jboss.undeploy.client" file="${jboss.home}/client"/>
<fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
- <!-- delete stale container integration jars -->
- <delete>
+ <delete includeemptydirs="true">
<fileset dir="${jboss.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
+ <include name="**/jbossws.sar/**"/>
+ <include name="**/juddi-service.sar/**"/>
+ <include name="**/jbossws-console.war/**"/>
</fileset>
- <fileset dir="${jboss.home}/client">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
</delete>
+ <antcall target="remove-jboss-integration">
+ <param name="modifyjbossintegration" value="@{modifyjbossintegration}"/>
+ </antcall>
<!-- delete content of last deployment -->
<delete>
<fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
</delete>
-
- <!-- delete jbossws.sar -->
- <delete dir="@{targetdir}"/>
-
- <!-- delete juddi-service.sar -->
- <delete dir="@{targetdir}/../juddi-service.sar"/>
-
</sequential>
</macrodef>
- <macrodef name="macro-undeploy-jbossws51">
- <attribute name="defaultconf"/>
- <attribute name="targetdir"/>
- <sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+ <target name="remove-jboss-integration" depends="process-jboss-integration" if="fixintegration">
+ <delete>
+ <fileset dir="${jboss.server.home}">
+ <include name="**/jbossws-jboss*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="**/jbossws-jboss*.jar"/>
+ </fileset>
+ </delete>
+ </target>
- <property name="jboss.server.home" value="@{targetdir}/../.."/>
- <property name="jboss.home" value="${jboss.server.home}/../.."/>
- <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
- <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+ <target name="process-jboss-integration">
+ <condition property="fixintegration">
+ <and>
+ <istrue value="${modifyjbossintegration}"/>
+ </and>
+ </condition>
+ </target>
- <!-- delete stale container integration jars -->
- <delete>
- <fileset dir="${jboss.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
-
- <!-- delete content of last deployment -->
- <delete>
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
- </delete>
-
- <!-- delete jbossws.sar -->
- <delete dir="@{targetdir}"/>
-
- <!-- delete juddi-service.sar -->
- <delete dir="@{targetdir}/../juddi-service.sar"/>
-
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-jbossws52">
- <attribute name="defaultconf"/>
- <attribute name="targetdir"/>
- <sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
-
- <property name="jboss.server.home" value="@{targetdir}/../.."/>
- <property name="jboss.home" value="${jboss.server.home}/../.."/>
- <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
- <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
-
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!-- delete stale container integration jars -->
- <!--
- <delete>
- <fileset dir="${jboss.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
- -->
- <!-- END -->
-
- <!-- delete content of last deployment -->
- <delete>
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
- </delete>
-
- <!-- delete jbossws.sar -->
- <delete dir="@{targetdir}"/>
-
- <!-- delete juddi-service.sar -->
- <delete dir="@{targetdir}/../juddi-service.sar"/>
-
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-jbossws60">
- <attribute name="defaultconf"/>
- <attribute name="targetdir"/>
- <sequential>
- <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
-
- <property name="jboss.server.home" value="@{targetdir}/../.."/>
- <property name="jboss.home" value="${jboss.server.home}/../.."/>
- <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
- <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
-
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!-- delete stale container integration jars -->
- <!--
- <delete>
- <fileset dir="${jboss.server.home}">
- <include name="**/jbossws-jboss*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/client">
- <include name="jbossws-jboss*.jar"/>
- </fileset>
- </delete>
- -->
- <!-- END -->
-
- <!-- delete content of last deployment -->
- <delete>
- <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
- </delete>
-
- <!-- delete jbossws.sar -->
- <delete dir="@{targetdir}"/>
-
- <!-- delete juddi-service.sar -->
- <delete dir="@{targetdir}/../juddi-service.sar"/>
-
- </sequential>
- </macrodef>
-
</project>
Modified: stack/native/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-deploy.xml 2009-12-09 11:01:33 UTC (rev 11223)
+++ stack/native/trunk/src/main/distro/build-deploy.xml 2009-12-09 11:37:39 UTC (rev 11224)
@@ -17,11 +17,12 @@
<target name="deploy-structure-jboss50" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-native50" inheritall="false">
+ <antcall target="deploy-jbossws-native" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ <param name="modifyjbossintegration" value="true"/>
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
@@ -45,7 +46,7 @@
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws targetdir="${jboss500.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
@@ -67,7 +68,7 @@
<target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws targetdir="${jboss501.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
@@ -76,11 +77,12 @@
<target name="deploy-structure-jboss51" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-native51" inheritall="false">
+ <antcall target="deploy-jbossws-native" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ <param name="modifyjbossintegration" value="true"/>
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
@@ -104,7 +106,7 @@
<target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510">
<fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/>
- <macro-undeploy-jbossws51 targetdir="${jboss510.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws targetdir="${jboss510.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
@@ -113,11 +115,12 @@
<target name="deploy-structure-jboss52" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-native52" inheritall="false">
+ <antcall target="deploy-jbossws-native" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ <param name="modifyjbossintegration" value="false"/><!-- [JBWS-2505] -->
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
@@ -141,7 +144,7 @@
<target name="undeploy-jboss520" depends="target-jboss520,init" description="Remove jbossws from jboss520">
<fail message="Not available: ${jboss520.available.file}" unless="jboss520.available"/>
- <macro-undeploy-jbossws52 targetdir="${jboss520.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws targetdir="${jboss520.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
@@ -150,11 +153,12 @@
<target name="deploy-structure-jboss60" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-native60" inheritall="false">
+ <antcall target="deploy-jbossws-native" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ <param name="modifyjbossintegration" value="false"/><!-- [JBWS-2505] -->
</antcall>
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
@@ -178,7 +182,7 @@
<target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
<fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <macro-undeploy-jbossws60 targetdir="${jboss600.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
@@ -188,11 +192,11 @@
<macrodef name="macro-create-deploy-conf">
<attribute name="deploystructure"/>
<sequential>
- <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**,**/juddi-service.sar/**"/>
+ <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/juddi-service.sar/**"/>
<property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
- <property name="jbossws.sar.dir" value="@{deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/>
- <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
+ <property name="jbossws.deployers.dir" value="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <echo file="${jbossws.deployers.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/>
+ <replace file="${jbossws.deployers.dir}/jbossws-deploy.conf" token=";" value=" "/>
</sequential>
</macrodef>
More information about the jbossws-commits
mailing list