Author: richard.opalka(a)jboss.com
Date: 2008-10-29 16:39:43 -0400 (Wed, 29 Oct 2008)
New Revision: 8589
Modified:
stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/branches/ropalka/pom.xml
Log:
[JBWS-2338] jbossws-container-jboss-beans.xml no more available
Modified:
stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
---
stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-29
20:39:18 UTC (rev 8588)
+++
stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-29
20:39:43 UTC (rev 8589)
@@ -345,42 +345,14 @@
<!-- END -->
</sequential>
</macrodef>
-
+
<!-- ================================================================== -->
- <!-- Deploy Deploy -->
- <!-- ================================================================== -->
-
- <!-- [JBWS-2263] -->
- <!-- START -->
- <macrodef name="macro-deploy-jbossws-deploy50">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
- <copy todir="@{targetdir}" flatten="true"
overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-(a){jbossid}-container.jar"/>
- </fileset>
- </copy>
- <unzip dest="@{targetdir}"
src="@{targetdir}/jbossws-(a){jbossid}-container.jar">
- <patternset>
- <include name="META-INF/jbossws-container-jboss-beans.xml"/>
- </patternset>
- </unzip>
- <move file="(a){targetdir}/META-INF/jbossws-container-jboss-beans.xml"
tofile="(a){targetdir}/jbossws-container-jboss-beans.xml"/>
- <delete file="@{targetdir}/jbossws-(a){jbossid}-container.jar"/>
- <delete dir="@{targetdir}/META-INF"/>
- </sequential>
- </macrodef>
- <!-- END -->
-
- <!-- ================================================================== -->
<!-- Deploy JBossWS -->
<!-- ================================================================== -->
-
+
<!-- JDK Detection -->
<available classname="java.io.Console"
property="HAVE_JDK_1.6"/>
-
+
<target name="deploy-jbossws-native42"
depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin"
artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client42 targetdir="${installserver}/../../client"
thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -397,10 +369,6 @@
<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}"/>
- <!-- [JBWS-2263] -->
- <!-- START -->
- <macro-deploy-jbossws-deploy50
targetdir="${installserver}/deployers/jbossws.deployer/META-INF"
thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <!-- END -->
<macro-deploy-juddi-sar
targetdir="${installserver}/deploy/juddi-service.sar"
thirdpartydir="${thirdpartydir}"/>
</target>
@@ -460,12 +428,12 @@
<sequential>
<loadfile property="jbossws.deploy.conf"
srcfile="(a){targetdir}/jbossws-deploy.conf" 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] -->
<!-- START -->
<!-- delete stale container integration jars -->
@@ -483,15 +451,14 @@
<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/branches/ropalka/pom.xml
===================================================================
--- stack/native/branches/ropalka/pom.xml 2008-10-29 20:39:18 UTC (rev 8588)
+++ stack/native/branches/ropalka/pom.xml 2008-10-29 20:39:43 UTC (rev 8589)
@@ -57,7 +57,7 @@
<!-- [JBWS-2263] -->
<!-- START -->
<jbossws.jboss500.version>3.0.4.GA</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.0.4.GA</jbossws.jboss501.version>
+ <jbossws.jboss501.version>3.0.5-SNAPSHOT</jbossws.jboss501.version>
<!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
Show replies by date