[jbossws-commits] JBossWS SVN: r15006 - in stack/native/trunk/modules: resources/src/main/resources/resources and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Sep 13 08:18:28 EDT 2011
Author: richard.opalka at jboss.com
Date: 2011-09-13 08:18:28 -0400 (Tue, 13 Sep 2011)
New Revision: 15006
Modified:
stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
fix AS 700 & AS 710 integration
Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-09-13 09:15:00 UTC (rev 15005)
+++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-09-13 12:18:28 UTC (rev 15006)
@@ -47,9 +47,9 @@
<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"/><!-- [JBWS-2505] -->
+ defaultconf="${jbossws.default.deploy.conf}"
+ defaultserverconf="${jbossws.default.server.deploy.conf}"
+ modifyjbossintegration="true"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
@@ -88,9 +88,9 @@
<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"/><!-- [JBWS-2505] -->
+ defaultconf="${jbossws.default.deploy.conf}"
+ defaultserverconf="${jbossws.default.server.deploy.conf}"
+ modifyjbossintegration="true"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
@@ -99,17 +99,18 @@
<target name="deploy-structure-jboss700" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
-
+
<path id="jbossws-common-tools.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-tools.path"/>
-
+
<antcall target="deploy-jbossws-native-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>
@@ -145,32 +146,33 @@
<!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-7.1.0 -->
<!-- ================================================================== -->
-
+
<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-native-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>
-
+
<!-- ================================================================== -->
<!-- Deployment jboss710 -->
<!-- ================================================================== -->
-
+
<target name="target-jboss710">
<property name="jbossws.integration.target" value="jboss710"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
-
+
<target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss710" description="Deploy jbossws to jboss710">
<fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/>
<copy todir="${jboss710.home}" overwrite="true" verbose="true">
@@ -185,7 +187,7 @@
</fileset>
</installModules>
</target>
-
+
<target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710">
<fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/>
<macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/>
@@ -213,7 +215,7 @@
<property name="jbossws.deployers.dir" value="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
<!-- Create jbossws-deploy.conf -->
<fileset id="jbossws.deploy.fileset" dir="@{deploystructure}">
- <patternset refid="jbossws.deploy.conf.patternset"/>
+ <patternset refid="jbossws.deploy.conf.patternset"/>
</fileset>
<property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
<echo file="${jbossws.deployers.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/>
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 2011-09-13 09:15:00 UTC (rev 15005)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-09-13 12:18:28 UTC (rev 15006)
@@ -283,6 +283,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">
@@ -393,7 +394,7 @@
<copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jbossws-native-resources.jar"/>
- <include name="**/jbossws-jboss700.jar"/>
+ <include name="**/jbossws-@{jbossid}.jar"/>
</fileset>
</copy>
<!-- module.xml files -->
@@ -436,7 +437,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}"/>
+ <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-deployment targetdir="${installserver}/standalone/deployments/jbossws-console.war" thirdpartydir="${thirdpartydir}"/>
<touch file="${installserver}/standalone/deployments/jbossws-console.war.dodeploy"/>
</target>
More information about the jbossws-commits
mailing list