[jbossws-commits] JBossWS SVN: r7891 - in stack/native/trunk: modules/resources/src/main/resources/resources and 2 other directories.

Author: richard.opalka(a)jboss.com Date: 2008-07-23 05:48:21 -0400 (Wed, 23 Jul 2008) New Revision: 7891 Modified: stack/native/trunk/modules/management/pom.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2263] container integration lives in AS code base, don't replace it (WIP) Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2008-07-23 09:35:00 UTC (rev 7890) +++ stack/native/trunk/modules/management/pom.xml 2008-07-23 09:48:21 UTC (rev 7891) @@ -45,7 +45,7 @@ <artifactId>jbossws-jboss424x</artifactId> <scope>runtime</scope> </dependency> - <dependency> + <!--dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500CR1</artifactId> <scope>runtime</scope> @@ -66,7 +66,7 @@ <artifactId>jbossws-jboss500x</artifactId> <classifier>container</classifier> <scope>runtime</scope> - </dependency> + </dependency--> <dependency> <groupId>org.jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> 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 2008-07-23 09:35:00 UTC (rev 7890) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-07-23 09:48:21 UTC (rev 7891) @@ -307,14 +307,16 @@ <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> - <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + <!-- [JBWS-2263] --> + <!--include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/--&gt; <!-- see #1 below --> </fileset> </copy> - <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <!-- [JBWS-2263] --> + <!--copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> <include name="**/jbossws-deployer-beans.xml"/> </fileset> - </copy> + </copy--> </sequential> </macrodef> @@ -322,7 +324,8 @@ <!-- Deploy Deploy --> <!-- ================================================================== --> - <macrodef name="macro-deploy-jbossws-deploy50"> + <!-- [JBWS-2263] --> + <!--macrodef name="macro-deploy-jbossws-deploy50"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> @@ -341,7 +344,7 @@ <delete file=&quot;@{targetdir}/jbossws-(a){jbossid}-container.jar&quot;/&gt; <delete dir="@{targetdir}/META-INF"/> </sequential> - </macrodef> + </macrodef--> <!-- ================================================================== --> <!-- Deploy JBossWS --> @@ -366,7 +369,8 @@ <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <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-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <!-- [JBWS-2263] --> + <!--macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/--> <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> </target> @@ -384,7 +388,7 @@ <!-- Undeploy JBossWS --> <!-- ================================================================== --> - <macrodef name="macro-undeploy-jbossws"> + <macrodef name="macro-undeploy-jbossws42"> <attribute name="defaultconf"/> <attribute name="targetdir"/> <sequential> @@ -419,5 +423,43 @@ </sequential> </macrodef> + + <macrodef name="macro-undeploy-jbossws50"> + <attribute name="defaultconf"/> + <attribute name="targetdir"/> + <sequential> + <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; 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-2263] --> + <!-- 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> + </project> Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2008-07-23 09:35:00 UTC (rev 7890) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2008-07-23 09:48:21 UTC (rev 7891) @@ -47,7 +47,7 @@ <target name="undeploy-jboss422" depends="target-jboss422,init" 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}"/> + <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target> <!-- ================================================================== --> @@ -69,7 +69,7 @@ <target name="undeploy-jboss423" depends="target-jboss423,init" 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}"/> + <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target> <!-- ================================================================== --> @@ -91,7 +91,7 @@ <target name="undeploy-jboss424" depends="target-jboss424,init" description="Remove jbossws from jboss424"> <fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/> - <macro-undeploy-jbossws targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target> <!-- ================================================================== --> @@ -128,7 +128,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-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> <!-- [JBWS-2177] Test clients fail with xml-apis.jar in lib/endorsed --> <delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/> <!-- wsconsume will fail with a LinkageError too --> @@ -154,7 +154,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-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> </target> <!-- ================================================================== --> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-23 09:35:00 UTC (rev 7890) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-23 09:48:21 UTC (rev 7891) @@ -106,7 +106,7 @@ <include>*:jbossws-jboss424x:jar</include> </includes> </dependencySet> - <dependencySet> + <!--dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> @@ -145,7 +145,7 @@ <includes> <include>*:jbossws-jboss500x:jar:container</include> </includes> - </dependencySet> + </dependencySet--> </dependencySets> </binaries> </moduleSet>