[jbossws-commits] JBossWS SVN: r8422 - stack/metro/trunk/modules/resources/src/main/resources/resources.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2008-10-09 11:42:09 -0400 (Thu, 09 Oct 2008)
New Revision: 8422

Modified:
   stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
   stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] refactoring JBossWS libs from deploy to deployers directory

Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf	2008-10-09 15:41:27 UTC (rev 8421)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf	2008-10-09 15:42:09 UTC (rev 8422)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
 s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar
\ No newline at end of file
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-native-jaxrpc.jar server/default/lib/jbossw!
 s-native-jaxws-ext.jar server/default/lib/jbossws-native-jaxws.jar server/default/lib/jbossws-native-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar

Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2008-10-09 15:41:27 UTC (rev 8421)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2008-10-09 15:42:09 UTC (rev 8422)
@@ -298,21 +298,11 @@
     <attribute name="jbossid"/>
     <sequential>
       <mkdir dir="@{targetdir}"/>
-      <copy todir="@{targetdir}" flatten="true" overwrite="true">
-        <fileset dir="@{thirdpartydir}">
-          <patternset refid="jbossws.service.lib.patternset"/>
-        </fileset>
-      </copy>
       <unzip dest="@{targetdir}/jbossws-management.war">
         <fileset dir="@{thirdpartydir}">
           <include name="**/jbossws-metro-management.war"/>
         </fileset>
       </unzip>
-      <copy todir="@{targetdir}">
-        <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws.beans">
-          <include name="META-INF/**"/>
-        </fileset>
-      </copy>
     </sequential>
   </macrodef>
   
@@ -329,6 +319,16 @@
         <mkdir dir="@{targetdir}"/>
         <copy todir="@{targetdir}" flatten="true" overwrite="true">
           <fileset dir="@{thirdpartydir}">
+            <patternset refid="jbossws.service.lib.patternset"/>
+          </fileset>
+        </copy>
+        <copy todir="@{targetdir}">
+          <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws.beans">
+            <include name="META-INF/**"/>
+          </fileset>
+        </copy>
+        <copy todir="@{targetdir}" flatten="true" overwrite="true">
+          <fileset dir="@{thirdpartydir}">
             <include name="**/jbossws-common.jar"/>
             <include name="**/jbossws-framework.jar"/>
             <!-- JBWS-2263 -->
@@ -401,7 +401,7 @@
     <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
     <!-- JBWS-2263 -->
     <!-- START -->
-    <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+    <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>