[jbossws-commits] JBossWS SVN: r11621 - in stack/native/trunk: modules/core and 2 other directories.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2010-02-19 03:48:11 -0500 (Fri, 19 Feb 2010)
New Revision: 11621

Modified:
   stack/native/trunk/modules/core/pom.xml
   stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
   stack/native/trunk/pom.xml
   stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2861] Rollbacking commit 11465


Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml	2010-02-18 17:57:39 UTC (rev 11620)
+++ stack/native/trunk/modules/core/pom.xml	2010-02-19 08:48:11 UTC (rev 11621)
@@ -145,6 +145,10 @@
       <artifactId>wscommons-policy</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>wstx-lgpl</artifactId>
+    </dependency>
+    <dependency>
       <groupId>wsdl4j</groupId>
       <artifactId>wsdl4j</artifactId>
     </dependency>

Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2010-02-18 17:57:39 UTC (rev 11620)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2010-02-19 08:48:11 UTC (rev 11621)
@@ -51,10 +51,12 @@
     <include name="**/stax-ex.jar"/>
     <include name="**/streambuffer.jar"/>
     <include name="**/wsdl4j.jar"/>
+    <include name="**/wstx.jar"/>
   </patternset>
 
   <patternset id="jbossws.lib.patternset">
     <include name="**/jaxb-impl.jar"/>
+    <include name="**/wstx.jar"/>
   </patternset>
 
   <patternset id="jbossws.lib.endorsed.patternset">

Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml	2010-02-18 17:57:39 UTC (rev 11620)
+++ stack/native/trunk/pom.xml	2010-02-19 08:48:11 UTC (rev 11621)
@@ -75,6 +75,7 @@
     <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
     <sun.jaxws.version>2.2</sun.jaxws.version>
     <sun.policy.version>2.0-b01</sun.policy.version>
+    <woodstox.version>3.2.6</woodstox.version>
     <wscommons.policy.version>1.0</wscommons.policy.version>
     <wsdl4j.version>1.6.1</wsdl4j.version>
     <xmlsec.version>1.4.3</xmlsec.version>
@@ -393,6 +394,11 @@
         <version>${wscommons.policy.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>wstx-lgpl</artifactId>
+        <version>${woodstox.version}</version>
+      </dependency>
+      <dependency>
         <groupId>wsdl4j</groupId>
         <artifactId>wsdl4j</artifactId>
         <version>${wsdl4j.version}</version>

Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2010-02-18 17:57:39 UTC (rev 11620)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2010-02-19 08:48:11 UTC (rev 11621)
@@ -67,6 +67,13 @@
               <include>org.apache.ws.policy:wscommons-policy:jar</include>
             </includes>
           </dependencySet>
+          <dependencySet>
+            <outputFileNameMapping>wstx.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
+            <includes>
+              <include>org.codehaus.woodstox:wstx-lgpl:jar</include>
+            </includes>
+          </dependencySet>
         </dependencySets>
       </binaries>
     </moduleSet>