Author: richard.opalka(a)jboss.com Date: 2011-09-13 08:18:53 -0400 (Tue, 13 Sep 2011) New Revision: 15007 Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: fix AS 700 & AS 710 integration Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-09-13 12:18:28 UTC (rev 15006) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-09-13 12:18:53 UTC (rev 15007) @@ -47,10 +47,10 @@ <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-jbossws targetdir="${jboss600.server}" - defaultconf="${jbossws.default.deploy.conf}" - defaultserverconf="${jbossws.default.server.deploy.conf}" - modifyjbossintegration="true" - removenativecore="false" /><!-- [JBWS-2505][JBWS-2895] --> + defaultconf="${jbossws.default.deploy.conf}" + defaultserverconf="${jbossws.default.server.deploy.conf}" + modifyjbossintegration="true" + removenativecore="false" /><!-- [JBWS-2505][JBWS-2895] --> </target> <!-- ================================================================== --> @@ -89,29 +89,30 @@ <target name="undeploy-jboss610" depends="target-jboss610,init" description="Remove jbossws from jboss610"> <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/> <macro-undeploy-jbossws targetdir="${jboss610.server}" - defaultconf="${jbossws.default.deploy.conf}" - defaultserverconf="${jbossws.default.server.deploy.conf}" - modifyjbossintegration="true" - removenativecore="false"/><!-- [JBWS-2505][JBWS-2895] --> + defaultconf="${jbossws.default.deploy.conf}" + defaultserverconf="${jbossws.default.server.deploy.conf}" + modifyjbossintegration="true" + removenativecore="false"/><!-- [JBWS-2505][JBWS-2895] --> </target> - + <!-- ================================================================== --> <!-- Prepare Deployment Structure JBoss-7.0.0 --> <!-- ================================================================== --> <target name="deploy-structure-jboss700" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - + <path id="jbossws-common.path"> <fileset dir="${deploy.artifacts.dir}"> <include name="**/jbossws-common-tools.jar"/> </fileset> </path> <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> - + <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> </antcall> </target> @@ -150,17 +151,18 @@ <target name="deploy-structure-jboss710" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - + <path id="jbossws-common.path"> <fileset dir="${deploy.artifacts.dir}"> <include name="**/jbossws-common-tools.jar"/> </fileset> </path> <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> - + <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> </antcall> </target> @@ -193,7 +195,6 @@ <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/> </target> - <!-- ================================================================== --> <!-- Spring --> <!-- ================================================================== --> @@ -204,7 +205,7 @@ </and> </condition> </target> - + <target name="install-spring" if="spring-required"> <antcall target="deploy-spring" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> 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 2011-09-13 12:18:28 UTC (rev 15006) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-09-13 12:18:53 UTC (rev 15007) @@ -327,6 +327,7 @@ <macrodef name="macro-deploy-jbossws-modules"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential> <!-- libraries --> <copy todir="@{targetdir}/org/jboss/ws/jaxws-client/main" flatten="false" overwrite="true"> @@ -397,7 +398,7 @@ <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-cxf-resources.jar"/> - <include name="**/jbossws-jboss700.jar"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; </fileset> </copy> <!-- module.xml files --> @@ -453,7 +454,7 @@ <target name="deploy-jbossws-cxf-modules"> <fail message="installserver must be specified" unless="installserver"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> - <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> <!-- ================================================================== -->