Author: richard.opalka(a)jboss.com Date: 2008-07-23 09:54:12 -0400 (Wed, 23 Jul 2008) New Revision: 7894 Modified: stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2263] container integration lives in AS codebase, don't replace it Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2008-07-23 13:04:47 UTC (rev 7893) +++ stack/cxf/trunk/modules/management/pom.xml 2008-07-23 13:54:12 UTC (rev 7894) @@ -40,7 +40,8 @@ <artifactId>jbossws-jboss423x</artifactId> <scope>runtime</scope> </dependency> - <dependency> + <!-- [JBWS-2263] --> + <!--dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500CR1</artifactId> <scope>runtime</scope> @@ -61,7 +62,7 @@ <artifactId>jbossws-jboss500x</artifactId> <classifier>container</classifier> <scope>runtime</scope> - </dependency> + </dependency--> <dependency> <groupId>jboss.jaxr</groupId> <artifactId>juddi-service</artifactId> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-07-23 13:04:47 UTC (rev 7893) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-07-23 13:54:12 UTC (rev 7894) @@ -164,7 +164,7 @@ <!-- Deploy Client --> <!-- ================================================================== --> - <macrodef name="macro-deploy-jbossws-client"> + <macrodef name="macro-deploy-jbossws-client42"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> @@ -179,6 +179,22 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-client50"> + <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-2263] --> + <!--include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/--&gt; + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy Server Lib --> <!-- ================================================================== --> @@ -291,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; </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> @@ -306,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"/> @@ -325,7 +344,7 @@ <delete file=&quot;@{targetdir}/jbossws-(a){jbossid}-container.jar&quot;/&gt; <delete dir="@{targetdir}/META-INF"/> </sequential> - </macrodef> + </macrodef--> <!-- ================================================================== --> <!-- Deploy JBossWS --> @@ -336,7 +355,7 @@ <target name="deploy-jbossws-cxf42" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> @@ -344,12 +363,13 @@ <target name="deploy-jbossws-cxf50" depends="check-parameters,deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-client50 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}" jbossid="${jbossid}"/> <macro-deploy-jbossws-cxf50-sar 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}"/--> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> @@ -366,7 +386,7 @@ <!-- Undeploy JBossWS --> <!-- ================================================================== --> - <macrodef name="macro-undeploy-jbossws"> + <macrodef name="macro-undeploy-jbossws42"> <attribute name="defaultconf"/> <attribute name="targetdir"/> <sequential> @@ -399,4 +419,38 @@ </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}"/> + + </sequential> + </macrodef> + </project> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2008-07-23 13:04:47 UTC (rev 7893) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-07-23 13:54:12 UTC (rev 7894) @@ -333,8 +333,9 @@ </properties> <dependencies> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500CR1</artifactId> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-webservices</artifactId> + <version>${jboss.version}</version> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -391,8 +392,9 @@ </properties> <dependencies> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss500x</artifactId> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-webservices</artifactId> + <version>${jboss.version}</version> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-07-23 13:04:47 UTC (rev 7893) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-07-23 13:54:12 UTC (rev 7894) @@ -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> <!-- ================================================================== --> @@ -106,7 +106,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"/> </target> @@ -130,7 +130,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/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-23 13:04:47 UTC (rev 7893) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-23 13:54:12 UTC (rev 7894) @@ -91,7 +91,7 @@ <include>*:jbossws-jboss423x:jar</include> </includes> </dependencySet> - <dependencySet> + <!--dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> @@ -130,7 +130,7 @@ <includes> <include>*:jbossws-jboss500x:jar:container</include> </includes> - </dependencySet> + </dependencySet--> </dependencySets> </binaries> </moduleSet>