Author: alessio.soldano(a)jboss.com Date: 2013-02-12 08:20:24 -0500 (Tue, 12 Feb 2013) New Revision: 17297 Modified: stack/native/branches/jbossws-native-4.1.x/modules/dist/src/main/distro/build-deploy.xml stack/native/branches/jbossws-native-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: svn merge -r 17295:17296 https://svn.jboss.org/repos/jbossws/stack/native/trunk . Modified: stack/native/branches/jbossws-native-4.1.x/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/branches/jbossws-native-4.1.x/modules/dist/src/main/distro/build-deploy.xml 2013-02-12 09:03:50 UTC (rev 17296) +++ stack/native/branches/jbossws-native-4.1.x/modules/dist/src/main/distro/build-deploy.xml 2013-02-12 13:20:24 UTC (rev 17297) @@ -39,11 +39,16 @@ <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> <antcall target="deploy-jbossws-native-modules" inheritall="false"> - <param name="installserver" value="${deploy.structure}"/> + <param name="installserver" value="${deploy.structure}/modules"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="modules-jbossid" value="jboss713"/> </antcall> + <copy toDir="${deploy.structure}/modules"> + <fileset dir="${deploy.artifacts.dir}/modules/jboss713"> + <include name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </copy> </target> <!-- ================================================================== --> @@ -61,11 +66,16 @@ <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> <antcall target="deploy-jbossws-native-modules" inheritall="false"> - <param name="installserver" value="${deploy.structure}"/> + <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="modules-jbossid" value="jboss720"/> </antcall> + <copy toDir="${deploy.structure}/modules/system/layers/base"> + <fileset dir="${deploy.artifacts.dir}/modules/jboss720"> + <include name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </copy> </target> <!-- ================================================================== --> @@ -94,7 +104,7 @@ <target name="undeploy-jboss713" depends="target-jboss713,init" description="Remove jbossws from jboss713"> <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss713.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> + <macro-undeploy-jbossws-modules targetdir="${jboss713.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target> <!-- ================================================================== --> @@ -114,8 +124,8 @@ </fileset> </copy> <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS --> - <installModules targetDir="${jboss720.home}/modules"> - <fileset dir="${deploy.structure}/modules"> + <installModules targetDir="${jboss720.home}/modules/system/layers/base/"> + <fileset dir="${deploy.structure}/modules/system/layers/base"> <include name="**/jboss/as/webservices/**/module.xml"/> </fileset> </installModules> @@ -123,7 +133,7 @@ <target name="undeploy-jboss720" depends="target-jboss720,init" description="Remove jbossws from jboss720"> <fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss720.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <macro-undeploy-jbossws-modules targetdir="${jboss720.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> </target> </project> Modified: stack/native/branches/jbossws-native-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/jbossws-native-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-02-12 09:03:50 UTC (rev 17296) +++ stack/native/branches/jbossws-native-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-02-12 13:20:24 UTC (rev 17297) @@ -78,11 +78,6 @@ <exclude name="**/jboss/as/webservices/**/module.xml"/> </fileset> </installModules> - <copy toDir="@{targetdir}"> - <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> </sequential> </macrodef> @@ -100,7 +95,7 @@ <target name="deploy-jbossws-native-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}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/> + <macro-deploy-jbossws-modules targetdir="${installserver}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/> </target> <!-- ================================================================== --> @@ -113,23 +108,22 @@ <attribute name="modifyjbossintegration"/> <sequential> - <loadfile property="jbossws.modules.conf" srcfile=&quot;(a){targetdir}/modules/org/jboss/as/webservices/jbossws-modules.conf&quot; failonerror="false"/> + <loadfile property="jbossws.modules.conf" srcfile=&quot;(a){targetdir}/org/jboss/as/webservices/jbossws-modules.conf&quot; failonerror="false"/> <loadfile property="jbossws.modules.conf" srcfile="@{defaultmodulesconf}" failonerror="false"/> - <property name="jboss.modules" value="@{targetdir}/modules"/> - <delete includeemptydirs="true" verbose="true"> - <fileset dir="${jboss.modules}"> + <fileset dir="@{targetdir}"> <include name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/> </fileset> </delete> + <property name="jboss.modules" value="@{targetdir}"/> <antcall target="remove-jboss-integration-module"> <param name="modifyjbossintegration" value="@{modifyjbossintegration}"/> </antcall> <!-- delete content of last deployment --> <delete includeemptydirs="true" verbose="true"> - <fileset dir="${jboss.modules}" includes="${jbossws.modules.conf}"/> + <fileset dir="@{targetdir}" includes="${jbossws.modules.conf}"/> </delete> </sequential> </macrodef>