[jbossws-commits] JBossWS SVN: r8744 - in stack/metro/branches/asoldano: modules/client and 4 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Tue Nov 18 03:29:51 EST 2008


Author: alessio.soldano at jboss.com
Date: 2008-11-18 03:29:51 -0500 (Tue, 18 Nov 2008)
New Revision: 8744

Modified:
   stack/metro/branches/asoldano/modules/client/pom.xml
   stack/metro/branches/asoldano/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
   stack/metro/branches/asoldano/modules/server/pom.xml
   stack/metro/branches/asoldano/modules/testsuite/pom.xml
   stack/metro/branches/asoldano/pom.xml
   stack/metro/branches/asoldano/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Fix dependencies and deploy macros to use native jaxrpc


Modified: stack/metro/branches/asoldano/modules/client/pom.xml
===================================================================
--- stack/metro/branches/asoldano/modules/client/pom.xml	2008-11-18 08:29:00 UTC (rev 8743)
+++ stack/metro/branches/asoldano/modules/client/pom.xml	2008-11-18 08:29:51 UTC (rev 8744)
@@ -71,6 +71,11 @@
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>wstx-lgpl</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.jboss.ws.native</groupId>
+      <artifactId>jbossws-native-client</artifactId>
+    </dependency>
     
     <!-- jboss provided -->
     <dependency>

Modified: stack/metro/branches/asoldano/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/branches/asoldano/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2008-11-18 08:29:00 UTC (rev 8743)
+++ stack/metro/branches/asoldano/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2008-11-18 08:29:51 UTC (rev 8744)
@@ -46,6 +46,10 @@
     <include name="**/stax-api.jar"/>
     <include name="**/wsdl4j.jar"/>
     <include name="**/wstx.jar"/>
+  	<include name="**/jbossws-native-client.jar"/>
+  	<include name="**/jbossws-native-core.jar"/>
+    <include name="**/jbossws-native-jaxrpc.jar"/>
+  	<include name="**/apache-xmlsec.jar"/>
   </patternset>
   
   <patternset id="jbossws.lib.patternset">
@@ -99,6 +103,11 @@
     <include name="**/wstx.jar"/>
     <include name="**/xmlsec.jar"/>
     <include name="**/xws-security.jar"/>
+  	<include name="**/jbossws-native-client.jar"/>
+  	<include name="**/jbossws-native-core.jar"/>
+    <include name="**/jbossws-native-jaxrpc.jar"/>
+  	<include name="**/jbossws-native-jaxws-ext.jar"/>
+  	<include name="**/apache-xmlsec.jar"/>
   </patternset>
   
   <!-- ================================================================== -->

Modified: stack/metro/branches/asoldano/modules/server/pom.xml
===================================================================
--- stack/metro/branches/asoldano/modules/server/pom.xml	2008-11-18 08:29:00 UTC (rev 8743)
+++ stack/metro/branches/asoldano/modules/server/pom.xml	2008-11-18 08:29:51 UTC (rev 8744)
@@ -93,6 +93,11 @@
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>wstx-lgpl</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.jboss.ws.native</groupId>
+      <artifactId>jbossws-native-client</artifactId>
+    </dependency>
     
     <!-- jboss provided -->
     <dependency>

Modified: stack/metro/branches/asoldano/modules/testsuite/pom.xml
===================================================================
--- stack/metro/branches/asoldano/modules/testsuite/pom.xml	2008-11-18 08:29:00 UTC (rev 8743)
+++ stack/metro/branches/asoldano/modules/testsuite/pom.xml	2008-11-18 08:29:51 UTC (rev 8744)
@@ -74,6 +74,12 @@
       <artifactId>wsit-rt</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.jboss.ws.native</groupId>
+      <artifactId>jbossws-native-client</artifactId>
+    </dependency>
+
     <!-- JAXR samples -->
     <dependency>
       <groupId>apache-scout</groupId>

Modified: stack/metro/branches/asoldano/pom.xml
===================================================================
--- stack/metro/branches/asoldano/pom.xml	2008-11-18 08:29:00 UTC (rev 8743)
+++ stack/metro/branches/asoldano/pom.xml	2008-11-18 08:29:51 UTC (rev 8744)
@@ -72,6 +72,7 @@
     <sun.saaj.impl.version>1.3</sun.saaj.impl.version>
     <woodstox.version>3.2.6</woodstox.version>
     <wsdl4j.version>1.6.1</wsdl4j.version>
+    <jbossws.native.version>3.0.5-SNAPSHOT</jbossws.native.version>
   </properties>
   
   <!-- DependencyManagement -->
@@ -261,7 +262,25 @@
         <artifactId>wstx-lgpl</artifactId>
         <version>${woodstox.version}</version>
       </dependency>
-      
+
+      <!-- Native dependencies for JAX-RPC -->
+      <dependency>
+        <groupId>org.jboss.ws.native</groupId>
+        <artifactId>jbossws-native-client</artifactId>
+        <version>${jbossws.native.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.ws.native</groupId>
+            <artifactId>jbossws-native-saaj</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.jboss.ws.native</groupId>
+            <artifactId>jbossws-native-jaxws</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+
       <!-- jboss provided -->
       <dependency>
         <groupId>jboss.common</groupId>

Modified: stack/metro/branches/asoldano/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/branches/asoldano/src/main/scripts/assembly-deploy-artifacts.xml	2008-11-18 08:29:00 UTC (rev 8743)
+++ stack/metro/branches/asoldano/src/main/scripts/assembly-deploy-artifacts.xml	2008-11-18 08:29:51 UTC (rev 8744)
@@ -49,6 +49,10 @@
               <include>com.sun.xml.wsit:xws-security:jar</include>
               <include>wsdl4j:wsdl4j:jar</include>
               <include>junit:junit:jar</include>
+              <include>org.jboss.ws.native:jbossws-native-client:jar</include>
+              <include>org.jboss.ws.native:jbossws-native-core:jar</include>
+              <include>org.jboss.ws.native:jbossws-native-jaxrpc:jar</include>
+              <include>org.jboss.ws.native:jbossws-native-jaxws-ext:jar</include>
             </includes>
           </dependencySet>
           <dependencySet>
@@ -58,6 +62,13 @@
               <include>org.codehaus.woodstox:wstx-lgpl:jar</include>
             </includes>
           </dependencySet>
+          <dependencySet>
+            <outputFileNameMapping>apache-xmlsec.jar</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
+            <includes>
+              <include>xml-security:xmlsec:jar</include>
+            </includes>
+          </dependencySet>
         </dependencySets>
       </binaries>
     </moduleSet>




More information about the jbossws-commits mailing list