[jbossws-commits] JBossWS SVN: r11961 - in stack/cxf/trunk: modules/resources/src/main/resources/resources and 1 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Thu Apr 8 05:22:00 EDT 2010 

Author: alessio.soldano at jboss.com
Date: 2010-04-08 05:21:59 -0400 (Thu, 08 Apr 2010)
New Revision: 11961

Modified:
   stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
   stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
   stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
   stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
   stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2923] Updating deploy macro for moving libs to common/lib, removing deployment of xml-resolver.jar which is the same as resolver.jar


Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh	2010-04-08 09:20:09 UTC (rev 11960)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsconsume.sh	2010-04-08 09:21:59 UTC (rev 11961)
@@ -116,7 +116,7 @@
 WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-javaee.jar"
 WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/velocity.jar"
 WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/XmlSchema.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/xml-resolver.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/resolver.jar"
 WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/wsdl4j.jar"
 
 # For Cygwin, switch paths to Windows format before running java

Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh	2010-04-08 09:20:09 UTC (rev 11960)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh	2010-04-08 09:21:59 UTC (rev 11961)
@@ -125,7 +125,7 @@
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/stax-api.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/velocity.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/XmlSchema.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/xml-resolver.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/resolver.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wsdl4j.jar"
 WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wstx.jar"
 

Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh	2010-04-08 09:20:09 UTC (rev 11960)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh	2010-04-08 09:21:59 UTC (rev 11961)
@@ -124,7 +124,7 @@
 WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar"
 WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/velocity.jar"
 WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/XmlSchema.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/xml-resolver.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/resolver.jar"
 WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wsdl4j.jar"
 WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/wstx.jar"
 

Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2010-04-08 09:20:09 UTC (rev 11960)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2010-04-08 09:21:59 UTC (rev 11961)
@@ -55,7 +55,6 @@
     <include name="**/wsdl4j.jar"/>
     <include name="**/wss4j.jar"/>
     <include name="**/wstx.jar"/>
-    <include name="**/xml-resolver.jar"/>
     <include name="**/XmlSchema.jar"/>
     <include name="**/FastInfoset.jar"/>
   </patternset>
@@ -67,27 +66,24 @@
 
   <patternset id="jbossws.lib.endorsed.patternset">
     <include name="**/jaxb-api.jar"/>
+    <include name="**/jaxws-api.jar"/>
+    <include name="**/stax-api.jar"/>
   </patternset>
 
   <patternset id="jbossws.server.lib.patternset">
+    <include name="**/asm.jar"/>
     <include name="**/commons-beanutils.jar"/>
-    <include name="**/jaxws-api.jar"/>
-    <include name="**/geronimo-ws-metadata*.jar"/>
-    <include name="**/jbossws-common.jar"/>
-    <include name="**/jbossws-framework.jar"/>
-    <include name="**/jbossws-spi.jar"/>
-    <include name="**/saaj-api.jar"/>
-  </patternset>
-
-  <patternset id="jbossws.service.lib.patternset">
     <include name="**/cxf-*.jar"/>
+    <include name="**/FastInfoset.jar"/>
     <include name="**/geronimo-javamail*.jar"/>
     <include name="**/geronimo-ws-metadata*.jar"/>
     <include name="**/jaxrpc-api.jar"/>
     <include name="**/jaxws-api.jar"/>
+    <include name="**/geronimo-ws-metadata*.jar"/>
     <include name="**/jboss-jaxb-intros.jar"/>
-    <include name="**/jbossws-cxf-client*.jar"/>
-    <include name="**/jbossws-cxf-server*.jar"/>
+    <include name="**/jbossws-common.jar"/>
+    <include name="**/jbossws-framework.jar"/>
+    <include name="**/jbossws-spi.jar"/>
     <include name="**/jdom.jar"/>
     <include name="**/neethi.jar"/>
     <include name="**/saaj-api.jar"/>
@@ -97,15 +93,17 @@
     <include name="**/spring-core.jar"/>
     <include name="**/spring-jms.jar"/>
     <include name="**/spring-tx.jar"/>
+    <include name="**/XmlSchema.jar"/>
+    <include name="**/xmlsec.jar"/>
     <include name="**/wsdl4j.jar"/>
     <include name="**/wss4j.jar"/>
-    <include name="**/xml-resolver.jar"/>
-    <include name="**/xmlsec.jar"/>
-    <include name="**/asm.jar"/>
-    <include name="**/XmlSchema.jar"/>
-    <include name="**/FastInfoset.jar"/>
   </patternset>
 
+  <patternset id="jbossws.service.lib.patternset">
+    <include name="**/jbossws-cxf-client*.jar"/>
+    <include name="**/jbossws-cxf-server*.jar"/>
+  </patternset>
+
   <!-- ================================================================== -->
   <!-- Deploy Bin                                                         -->
   <!-- ================================================================== -->

Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2010-04-08 09:20:09 UTC (rev 11960)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2010-04-08 09:21:59 UTC (rev 11961)
@@ -42,7 +42,6 @@
               <include>org.springframework:spring-jms:jar</include>
               <include>org.springframework:spring-tx:jar</include>
               <include>wsdl4j:wsdl4j:jar</include>
-              <include>xml-resolver:xml-resolver:jar</include>
               <include>org.apache.ws.commons.schema:XmlSchema:jar</include>
               <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
               <include>org.apache.ws.security:wss4j:jar</include>

More information about the jbossws-commits mailing list