[jbossws-commits] JBossWS SVN: r11212 - in stack/cxf/branches/jbossws-cxf-3.1.2: src/main/scripts and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: fnasser at redhat.com
Date: 2009-12-08 15:43:26 -0500 (Tue, 08 Dec 2009)
New Revision: 11212

Modified:
   stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
   stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Preserve juddi-service as it is not changed

Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml	2009-12-08 16:15:13 UTC (rev 11211)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml	2009-12-08 20:43:26 UTC (rev 11212)
@@ -61,11 +61,10 @@
   <patternset id="jbossws.server.lib.patternset">
     <include name="**/nothing-to-deploy"/>
     <!-- Do not replace these until they are really different
-         from the ones shipped with the JBoss ative EAP AS
-    <include name="**/jbossws-common.jar"/>
-    <include name="**/jbossws-framework.jar"/>
-    <include name="**/jbossws-spi.jar"/>
-    -->
+         from the ones shipped with the JBoss ative EAP AS -->
+    <!-- <include name="**/jbossws-common.jar"/> -->
+    <!-- <include name="**/jbossws-framework.jar"/> -->
+    <!-- <include name="**/jbossws-spi.jar"/> -->
   </patternset>
   
   <patternset id="jbossws.service.lib.patternset">
@@ -261,8 +260,6 @@
       </copy>
       <copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
         <fileset dir="@{thirdpartydir}">
-          <include name="**/jbossws-common.jar"/>
-          <include name="**/jbossws-framework.jar"/>
           <!-- [JBWS-2505] -->
           <!-- START -->
           <!--
@@ -296,7 +293,9 @@
     <macro-deploy-jbossws-server-lib51 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <!-- Please note the "../../common" to use common server lib! -->
     <macro-deploy-jbossws-cxf51-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
     <macro-deploy-jbossws-deployers51 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+    <!-- No need to do this until we are actually changing something in it
     <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
+    -->
   </target>
 
   <target name="check-parameters">
@@ -348,8 +347,10 @@
       <!-- delete jbossws.sar -->
       <delete dir="@{targetdir}" verbose="true"/>
       
+      <!-- No need to do this until we are actually changing something in it
       <!-- delete juddi-service.sar -->
       <delete dir="@{targetdir}/../juddi-service.sar" verbose="true"/>
+      -->
       
     </sequential>
   </macrodef>

Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml	2009-12-08 16:15:13 UTC (rev 11211)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml	2009-12-08 20:43:26 UTC (rev 11212)
@@ -84,6 +84,7 @@
         <includeDependencies>false</includeDependencies>
         <unpack>false</unpack>
         <dependencySets>
+          <!-- Do not include juddi-service as it has not changed
           <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
@@ -91,12 +92,13 @@
             <scope>provided</scope>
             <unpack>false</unpack>
             <includes>
-              <include>org.jboss.ws:jbossws-framework:jar</include>
+              <!-- <include>org.jboss.ws:jbossws-framework:jar</include> -->
               <include>org.jboss.jaxr:juddi-service:sar</include>
               <include>apache-scout:scout:jar</include>
               <include>juddi:juddi:jar</include>
             </includes>
           </dependencySet>
+          -->
           <!-- [JBWS-2505] -->
           <!-- START -->
           <!--