[jbossws-commits] JBossWS SVN: r14203 - in stack/cxf/branches/cxf24/modules: resources/src/main/resources/modules/org/apache/cxf/main and 4 other directories.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2011-04-27 04:27:34 -0400 (Wed, 27 Apr 2011)
New Revision: 14203

Added:
   stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/ws/xmlschema/
Removed:
   stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/ws/commons/xmlschema/
Modified:
   stack/cxf/branches/cxf24/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
   stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
   stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/ws/xmlschema/main/module.xml
   stack/cxf/branches/cxf24/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
Updating modules to use xmlschema-core 2.0


Modified: stack/cxf/branches/cxf24/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2011-04-26 21:48:29 UTC (rev 14202)
+++ stack/cxf/branches/cxf24/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2011-04-27 08:27:34 UTC (rev 14203)
@@ -61,7 +61,6 @@
               <include>org.jboss.ws:jbossws-spi:jar</include>
               <include>org.apache.neethi:neethi:jar</include>
               <include>wsdl4j:wsdl4j:jar</include>
-              <!-- <include>org.apache.ws.commons.schema:XmlSchema:jar</include> -->
               <include>org.apache.ws.xmlschema:xmlschema-core:jar</include>
               <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
               <include>org.apache.ws.security:wss4j:jar</include>

Modified: stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml	2011-04-26 21:48:29 UTC (rev 14202)
+++ stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml	2011-04-27 08:27:34 UTC (rev 14203)
@@ -42,7 +42,7 @@
         <module name="javax.xml.ws.api" />
         <module name="org.apache.neethi" />
         <module name="org.apache.velocity" />
-        <module name="org.apache.ws.commons.xmlschema" />
+        <module name="org.apache.ws.xmlschema" />
         <module name="org.apache.ws.security" />
         <module name="org.apache.santuario.xmlsec" />
         <module name="org.springframework.spring" optional="true"/>

Modified: stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/ws/xmlschema/main/module.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/ws/commons/xmlschema/main/module.xml	2011-04-26 12:48:58 UTC (rev 14199)
+++ stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/apache/ws/xmlschema/main/module.xml	2011-04-27 08:27:34 UTC (rev 14203)
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.0" name="org.apache.ws.commons.xmlschema">
+<module xmlns="urn:jboss:module:1.0" name="org.apache.ws.xmlschema">
 
     <resources>
         <!-- Insert resources here -->

Modified: stack/cxf/branches/cxf24/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2011-04-26 21:48:29 UTC (rev 14202)
+++ stack/cxf/branches/cxf24/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2011-04-27 08:27:34 UTC (rev 14203)
@@ -382,7 +382,7 @@
           <include name="**/neethi.jar"/>
         </fileset>
       </copy>
-      <copy todir="@{targetdir}/org/apache/ws/commons/xmlschema/main" flatten="false" overwrite="true">
+      <copy todir="@{targetdir}/org/apache/ws/xmlschema/main" flatten="false" overwrite="true">
         <fileset dir="@{thirdpartydir}/lib">
           <include name="**/xmlschema-core.jar"/>
         </fileset>