[jbossws-commits] JBossWS SVN: r8587 - in stack/cxf/branches/ropalka: modules/resources/src/main/resources/resources and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2008-10-29 16:39:02 -0400 (Wed, 29 Oct 2008)
New Revision: 8587

Modified:
   stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
   stack/cxf/branches/ropalka/pom.xml
Log:
[JBWS-2338] jbossws-container-jboss-beans.xml no more available

Modified: stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2008-10-29 20:32:20 UTC (rev 8586)
+++ stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2008-10-29 20:39:02 UTC (rev 8587)
@@ -325,34 +325,6 @@
   </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-@{jbossid}-container.jar"/>
-        </fileset>
-      </copy>
-      <unzip dest="@{targetdir}" src="@{targetdir}/jbossws-@{jbossid}-container.jar">
-        <patternset>
-          <include name="META-INF/jbossws-container-jboss-beans.xml"/>
-        </patternset>
-      </unzip>
-      <move file="@{targetdir}/META-INF/jbossws-container-jboss-beans.xml" tofile="@{targetdir}/jbossws-container-jboss-beans.xml"/>
-      <delete file="@{targetdir}/jbossws-@{jbossid}-container.jar"/>
-      <delete dir="@{targetdir}/META-INF"/>
-    </sequential>
-  </macrodef>
-  <!-- END -->
-  
-  <!-- ================================================================== -->
   <!-- Deploy JBossWS                                                     -->
   <!-- ================================================================== -->
   
@@ -374,10 +346,6 @@
     <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}"/>
-    <!-- [JBWS-2263] -->
-    <!-- START -->
-    <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deployers/jbossws.deployer/META-INF" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
-    <!-- END -->
   </target>
   
   <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">

Modified: stack/cxf/branches/ropalka/pom.xml
===================================================================
--- stack/cxf/branches/ropalka/pom.xml	2008-10-29 20:32:20 UTC (rev 8586)
+++ stack/cxf/branches/ropalka/pom.xml	2008-10-29 20:39:02 UTC (rev 8587)
@@ -53,7 +53,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 -->
     <cxf.version>2.1</cxf.version>
     <cxf.stax.version>1.0.1</cxf.stax.version>