[jbossws-commits] JBossWS SVN: r17727 - in stack/cxf/branches/jbossws-cxf-4.1.x: modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main and 15 other directories.

Monday, 24 June 2013

Author: alessio.soldano(a)jboss.com
Date: 2013-06-24 11:31:38 -0400 (Mon, 24 Jun 2013)
New Revision: 17727

Added:
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorld.java
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorldImpl.java
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/Helper.java
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/WEB-INF/
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/WEB-INF/jboss-deployment-structure.xml
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/cxf.xml
Removed:
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorld.java
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorldImpl.java
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/Helper.java
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/WEB-INF/
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/WEB-INF/jboss-deployment-structure.xml
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/cxf.xml
Modified:
   stack/cxf/branches/jbossws-cxf-4.1.x/
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml
  
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
   stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml
Log:
Merged revisions 17236,17539,17709,17711 via svnmerge from 
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk

.......
  r17236 | jim.ma | 2013-01-15 01:00:52 +0100 (Tue, 15 Jan 2013) | 1 line
  
  Add javax.activation dependency explicitly
.......
  r17539 | alessio.soldano(a)jboss.com | 2013-05-08 17:53:16 +0200 (Wed, 08 May 2013) | 2
lines
  
  [JBWS-3607] Adding testcase
.......
  r17709 | jim.ma | 2013-06-18 12:15:27 +0200 (Tue, 18 Jun 2013) | 1 line
  
  [JBWS-3650]:import service from org.apache.cxf module
.......
  r17711 | alessio.soldano(a)jboss.com | 2013-06-19 14:03:48 +0200 (Wed, 19 Jun 2013) | 2
lines
  
  [JBWS-3650] Misc fixes on module dependencies; import META-INF from spring module, move
META-INF and META-INF/cxf import of cxf api module from AS server integration module to
cxf impl module (to work for client side too), remove trailing slash in META-INF/ imports
which makes the import ineffective.
.......



Property changes on: stack/cxf/branches/jbossws-cxf-4.1.x
___________________________________________________________________
Modified: svnmerge-integrated
   -
/stack/cxf/trunk:1-17199,17260-17277,17279,17345,17400-17414,17433,17479,17481-17482,17484,17487-17490,17492-17493,17501-17504,17506-17520,17522-17523,17529-17530,17540-17549,17552-17553,17556-17580,17582,17586,17591-17592,17596,17606-17608,17612-17614,17618,17621-17626,17628,17630-17638,17640-17644,17646,17648-17665,17667-17672,17677,17679-17685,17687,17690-17705,17707,17710,17713-17715,17717
   +
/stack/cxf/trunk:1-17199,17236-17242,17244-17245,17247-17255,17259-17334,17336-17345,17348-17350,17352-17361,17363-17364,17367-17379,17382-17414,17416-17426,17428-17433,17435-17452,17454-17469,17471-17477,17479,17481-17482,17484,17487-17490,17492-17493,17501-17504,17506-17520,17522-17523,17529-17530,17539-17549,17552-17553,17556-17580,17582,17586,17591-17592,17596,17606-17608,17612-17614,17618,17621-17626,17628,17630-17638,17640-17644,17646,17648-17665,17667-17672,17677,17679-17685,17687,17690-17705,17707,17709-17711,17713-17715,17717
Modified: svn:mergeinfo
   - /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:17260-17277,17279,17345,17400-17414,17433,17479,17618,17623,17628,17714-17715,17717
   + /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:17236,17260-17277,17279,17345,17400-17414,17433,17479,17539,17618,17623,17628,17709-17711,17714-17715,17717

Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml	2013-06-24
12:03:11 UTC (rev 17726)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -52,7 +52,20 @@
         <module name="org.apache.santuario.xmlsec" />
         <module name="org.joda.time" />
         <module name="org.opensaml" />
-        <module name="org.springframework.spring"
optional="true"/>
-        <module name="org.apache.cxf" export="true"/>
+        <module name="org.springframework.spring"
optional="true">
+          <imports>
+            <include path="META-INF"/>
+          </imports>
+        </module>
+        <module name="org.apache.cxf" export="true">
+          <imports>
+            <include path="META-INF/cxf"/>
+            <include path="META-INF"/>
+          </imports>
+          <exports>
+            <include path="META-INF/cxf"/>
+            <include path="META-INF"/>
+          </exports>
+        </module>
     </dependencies>
 </module>

Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml	2013-06-24
12:03:11 UTC (rev 17726)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -32,7 +32,7 @@
         <module name="org.apache.cxf.impl" services="import">
             <imports>
                 <include path="META-INF/cxf"/> 
-                <include path="META-INF/"/>
+                <include path="META-INF"/>
             </imports>
         </module>
         <module name="asm.asm" />
@@ -45,6 +45,10 @@
         <module name="org.apache.neethi" />
         <module name="org.apache.ws.xmlschema" />
         <module name="org.codehaus.woodstox" />
-        <module name="org.springframework.spring" optional="true"
/>
+        <module name="org.springframework.spring"
optional="true">
+            <imports>
+                <include path="META-INF"/>
+            </imports>
+        </module>
     </dependencies>
 </module>

Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml	2013-06-24
12:03:11 UTC (rev 17726)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -45,19 +45,23 @@
         <module name="org.apache.cxf.impl">
           <imports>
             <include path="META-INF/cxf"/> 
-            <include path="META-INF/"/>
+            <include path="META-INF"/>
           </imports>
         </module>
         <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver"
services="import">
           <imports>
             <include path="META-INF/cxf"/> 
-            <include path="META-INF/"/>
+            <include path="META-INF"/>
           </imports>
         </module>
         <module name="org.jboss.common-core" />
         <module name="org.jboss.logging" />
         <module name="org.apache.ws.security" />
         <module name="org.picketbox" />
-        <module name="org.springframework.spring" optional="true"
/>
+        <module name="org.springframework.spring"
optional="true">
+          <imports>
+            <include path="META-INF"/>
+          </imports>
+        </module>
     </dependencies>
 </module>

Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml	2013-06-24
12:03:11 UTC (rev 17726)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -37,7 +37,7 @@
         <module name="org.apache.cxf.impl" services="import">
           <imports>
             <include path="META-INF/cxf"/> 
-            <include path="META-INF/"/>
+            <include path="META-INF"/>
           </imports>
         </module>
         <module name="org.jboss.com.sun.httpserver"/>

Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml	2013-06-24
12:03:11 UTC (rev 17726)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -42,19 +42,23 @@
         <module name="org.apache.cxf.impl">
           <imports>
             <include path="META-INF/cxf"/> 
-            <include path="META-INF/"/>
+            <include path="META-INF"/>
           </imports>
         </module>
         <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver"
services="import">
           <imports>
             <include path="META-INF/cxf"/> 
-            <include path="META-INF/"/>
+            <include path="META-INF"/>
           </imports>
         </module>
         <module name="org.apache.log4j" />
         <module name="org.apache.neethi" />
         <module name="org.jboss.logging" />
-        <module name="org.springframework.spring" optional="true"
/>
+        <module name="org.springframework.spring"
optional="true">
+          <imports>
+            <include path="META-INF"/>
+          </imports>
+        </module>
         <module name="javax.wsdl4j.api" />
     </dependencies>
 </module>

Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml	2013-06-24
12:03:11 UTC (rev 17726)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -51,7 +51,20 @@
         <module name="org.apache.santuario.xmlsec" />
         <module name="org.joda.time" />
         <module name="org.opensaml" />
-        <module name="org.springframework.spring"
optional="true"/>
-        <module name="org.apache.cxf" export="true"/>
+        <module name="org.springframework.spring"
optional="true">
+          <imports>
+            <include path="META-INF"/>
+          </imports>
+        </module>
+        <module name="org.apache.cxf" export="true">
+          <imports>
+            <include path="META-INF/cxf"/>
+            <include path="META-INF"/>
+          </imports>
+          <exports>
+            <include path="META-INF/cxf"/>
+            <include path="META-INF"/>
+          </exports>
+        </module>
     </dependencies>
 </module>

Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml	2013-06-24
12:03:11 UTC (rev 17726)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -32,7 +32,7 @@
         <module name="org.apache.cxf.impl" services="import">
             <imports>
                 <include path="META-INF/cxf"/> 
-                <include path="META-INF/"/>
+                <include path="META-INF"/>
             </imports>
         </module>
         <module name="asm.asm" />
@@ -45,6 +45,10 @@
         <module name="org.apache.neethi" />
         <module name="org.apache.ws.xmlschema" />
         <module name="org.codehaus.woodstox" />
-        <module name="org.springframework.spring" optional="true"
/>
+        <module name="org.springframework.spring"
optional="true">
+            <imports>
+                <include path="META-INF"/>
+            </imports>
+        </module>
     </dependencies>
 </module>

Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml	2013-06-24
12:03:11 UTC (rev 17726)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -49,19 +49,23 @@
         <module name="org.apache.cxf.impl">
           <imports>
             <include path="META-INF/cxf"/> 
-            <include path="META-INF/"/>
+            <include path="META-INF"/>
           </imports>
         </module>
         <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver"
services="import">
           <imports>
             <include path="META-INF/cxf"/> 
-            <include path="META-INF/"/>
+            <include path="META-INF"/>
           </imports>
         </module>
         <module name="org.jboss.common-core" />
         <module name="org.jboss.logging" />
         <module name="org.apache.ws.security" />
         <module name="org.picketbox" />
-        <module name="org.springframework.spring" optional="true"
/>
+        <module name="org.springframework.spring"
optional="true">
+          <imports>
+            <include path="META-INF"/>
+          </imports>
+        </module>
     </dependencies>
 </module>

Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml	2013-06-24
12:03:11 UTC (rev 17726)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -41,7 +41,7 @@
         <module name="org.apache.cxf.impl" services="import">
           <imports>
             <include path="META-INF/cxf"/> 
-            <include path="META-INF/"/>
+            <include path="META-INF"/>
           </imports>
         </module>
         <module name="org.jboss.com.sun.httpserver"/>

Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml	2013-06-24
12:03:11 UTC (rev 17726)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -46,19 +46,23 @@
         <module name="org.apache.cxf.impl">
           <imports>
             <include path="META-INF/cxf"/> 
-            <include path="META-INF/"/>
+            <include path="META-INF"/>
           </imports>
         </module>
         <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver"
services="import">
           <imports>
             <include path="META-INF/cxf"/> 
-            <include path="META-INF/"/>
+            <include path="META-INF"/>
           </imports>
         </module>
         <module name="org.apache.log4j" />
         <module name="org.apache.neethi" />
         <module name="org.jboss.logging" />
-        <module name="org.springframework.spring" optional="true"
/>
+        <module name="org.springframework.spring"
optional="true">
+          <imports>
+            <include path="META-INF"/>
+          </imports>
+        </module>
         <module name="javax.wsdl4j.api" />
     </dependencies>
 </module>

Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml	2013-06-24
12:03:11 UTC (rev 17726)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -102,6 +102,27 @@
       </manifest>
     </war>
 
+    
+    <war
warfile="${tests.output.dir}/test-libs/jaxws-cxf-in_container_client.war"
needxmlfile='false'>
+      <classes dir="${tests.output.dir}/test-classes">
+        <include
name="org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorld*.class"/>
+      </classes>
+    </war>
+    <war
warfile="${tests.output.dir}/test-libs/jaxws-cxf-in_container_client-client.war"
 needxmlfile='false'>
+      <classes dir="${tests.output.dir}/test-classes">
+        <include
name="org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorld.class"/>
+      	<include
name="org/jboss/test/ws/jaxws/cxf/in_container_client/Helper.class"/>
+        <include name="org/jboss/wsf/test/TestServlet.class"/>
+        <include name="org/jboss/wsf/test/ClientHelper.class"/>
+      </classes>
+      <classes
dir="${tests.output.dir}/test-resources/jaxws/cxf/in_container_client/">
+         <include name="cxf.xml"/>
+      </classes>
+      <webinf
dir="${tests.output.dir}/test-resources/jaxws/cxf/in_container_client/WEB-INF">
+        <include name="jboss-deployment-structure.xml"/>
+      </webinf>
+    </war>
+
     
     <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-mixtype.war"
webxml="${tests.output.dir}/test-resources/jaxws/cxf/mixtype/WEB-INF/web.xml">
       <classes dir="${tests.output.dir}/test-classes">

Deleted:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorld.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorld.java	2013-05-08
15:53:16 UTC (rev 17539)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorld.java	2013-06-24
15:31:38 UTC (rev 17727)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.cxf.in_container_client;
-
-import javax.jws.WebService;
-
-@WebService(targetNamespace =
"http://org.jboss.ws/jaxws/cxf/in_container_client")
-public interface HelloWorld
-{
-   String echo(String input);
-}

Copied:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorld.java
(from rev 17539,
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorld.java)
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorld.java	
                       (rev 0)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorld.java	2013-06-24
15:31:38 UTC (rev 17727)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.in_container_client;
+
+import javax.jws.WebService;
+
+@WebService(targetNamespace =
"http://org.jboss.ws/jaxws/cxf/in_container_client")
+public interface HelloWorld
+{
+   String echo(String input);
+}

Deleted:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorldImpl.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorldImpl.java	2013-05-08
15:53:16 UTC (rev 17539)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorldImpl.java	2013-06-24
15:31:38 UTC (rev 17727)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.cxf.in_container_client;
-
-import javax.jws.WebService;
-
-@WebService
-(
-   serviceName = "HelloWorldService",
-   endpointInterface =
"org.jboss.test.ws.jaxws.cxf.in_container_client.HelloWorld",
-   targetNamespace = "http://org.jboss.ws/jaxws/cxf/in_container_client"
-)
-public class HelloWorldImpl implements HelloWorld
-{
-   public String echo(String input)
-   {
-      return input;
-   }
-}

Copied:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorldImpl.java
(from rev 17539,
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorldImpl.java)
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorldImpl.java	
                       (rev 0)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/HelloWorldImpl.java	2013-06-24
15:31:38 UTC (rev 17727)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.in_container_client;
+
+import javax.jws.WebService;
+
+@WebService
+(
+   serviceName = "HelloWorldService",
+   endpointInterface =
"org.jboss.test.ws.jaxws.cxf.in_container_client.HelloWorld",
+   targetNamespace = "http://org.jboss.ws/jaxws/cxf/in_container_client"
+)
+public class HelloWorldImpl implements HelloWorld
+{
+   public String echo(String input)
+   {
+      return input;
+   }
+}

Deleted:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/Helper.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/Helper.java	2013-05-08
15:53:16 UTC (rev 17539)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/Helper.java	2013-06-24
15:31:38 UTC (rev 17727)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.cxf.in_container_client;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.jboss.logging.Logger;
-import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory;
-import org.jboss.wsf.test.ClientHelper;
-
-public class Helper implements ClientHelper
-{
-   private String targetEndpointURL;
-   private Logger log = Logger.getLogger(Helper.class);
-   
-   public Helper()
-   {
-      
-   }
-
-   public Helper(String endpointURL)
-   {
-      setTargetEndpoint(endpointURL);
-   }
-
-   public boolean test() throws Exception
-   {
-      BusFactory factory = BusFactory.newInstance();
-      if (!(factory instanceof JBossWSBusFactory)) { //check jbossws-cxf integration is
on
-         log.error("Expected instance of " + JBossWSBusFactory.class + "
but got: " + factory.getClass());
-         return false;
-      }
-      Bus bus = ((JBossWSBusFactory)factory).createBus("cxf.xml"); //force
Spring bus construction
-      try
-      {
-         BusFactory.setThreadDefaultBus(bus);
-         
-         HelloWorld port = getPort();
-         return ("foo".equals(port.echo("foo")));
-      }
-      finally
-      {
-         bus.shutdown(true);
-      }
-      
-   }
-   
-   private HelloWorld getPort() throws MalformedURLException
-   {
-      URL wsdlURL = new URL(targetEndpointURL + "?wsdl");
-      QName serviceName = new
QName("http://org.jboss.ws/jaxws/cxf/in_container_client",
"HelloWorldService");
-      Service service = Service.create(wsdlURL, serviceName);
-      QName portQName = new
QName("http://org.jboss.ws/jaxws/cxf/in_container_client",
"HelloWorldImplPort");
-      return (HelloWorld) service.getPort(portQName, HelloWorld.class);
-   }
-
-   @Override
-   public void setTargetEndpoint(String address)
-   {
-      this.targetEndpointURL = address;
-   }
-}

Copied:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/Helper.java
(from rev 17539,
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/Helper.java)
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/Helper.java	
                       (rev 0)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/Helper.java	2013-06-24
15:31:38 UTC (rev 17727)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.in_container_client;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory;
+import org.jboss.wsf.test.ClientHelper;
+
+public class Helper implements ClientHelper
+{
+   private String targetEndpointURL;
+   private Logger log = Logger.getLogger(Helper.class);
+   
+   public Helper()
+   {
+      
+   }
+
+   public Helper(String endpointURL)
+   {
+      setTargetEndpoint(endpointURL);
+   }
+
+   public boolean test() throws Exception
+   {
+      BusFactory factory = BusFactory.newInstance();
+      if (!(factory instanceof JBossWSBusFactory)) { //check jbossws-cxf integration is
on
+         log.error("Expected instance of " + JBossWSBusFactory.class + "
but got: " + factory.getClass());
+         return false;
+      }
+      Bus bus = ((JBossWSBusFactory)factory).createBus("cxf.xml"); //force
Spring bus construction
+      try
+      {
+         BusFactory.setThreadDefaultBus(bus);
+         
+         HelloWorld port = getPort();
+         return ("foo".equals(port.echo("foo")));
+      }
+      finally
+      {
+         bus.shutdown(true);
+      }
+      
+   }
+   
+   private HelloWorld getPort() throws MalformedURLException
+   {
+      URL wsdlURL = new URL(targetEndpointURL + "?wsdl");
+      QName serviceName = new
QName("http://org.jboss.ws/jaxws/cxf/in_container_client",
"HelloWorldService");
+      Service service = Service.create(wsdlURL, serviceName);
+      QName portQName = new
QName("http://org.jboss.ws/jaxws/cxf/in_container_client",
"HelloWorldImplPort");
+      return (HelloWorld) service.getPort(portQName, HelloWorld.class);
+   }
+
+   @Override
+   public void setTargetEndpoint(String address)
+   {
+      this.targetEndpointURL = address;
+   }
+}

Deleted:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java	2013-05-08
15:53:16 UTC (rev 17539)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java	2013-06-24
15:31:38 UTC (rev 17727)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.cxf.in_container_client;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSCXFTestSetup;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * A testcase for verifying a cxf.xml Spring descriptor based Bus can
- * successfully be created and used in a in-container client.
- * 
- * @author alessio.soldano(a)jboss.com
- * @since 08-May-2013
- *
- */
-public class ServletTestCase extends JBossWSTest
-{
-   public static Test suite()
-   {
-      return new JBossWSCXFTestSetup(ServletTestCase.class,
"jaxws-cxf-in_container_client.war, jaxws-cxf-in_container_client-client.war");
-   }
-   
-   public void test() throws Exception
-   {
-      assertEquals("1", runTestInContainer("test"));
-   }
-   
-   private String runTestInContainer(String test) throws Exception
-   {
-      URL url = new URL("http://" + getServerHost()
-            +
":8080/jaxws-cxf-in_container_client-client?path=/jaxws-cxf-in_container_client/HelloWorldService&method="
+ test
-            + "&helper=" + Helper.class.getName());
-      BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
-      return br.readLine();
-   }
-}

Copied:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java
(from rev 17539,
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java)
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java	
                       (rev 0)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/in_container_client/ServletTestCase.java	2013-06-24
15:31:38 UTC (rev 17727)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.in_container_client;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * A testcase for verifying a cxf.xml Spring descriptor based Bus can
+ * successfully be created and used in a in-container client.
+ * 
+ * @author alessio.soldano(a)jboss.com
+ * @since 08-May-2013
+ *
+ */
+public class ServletTestCase extends JBossWSTest
+{
+   public static Test suite()
+   {
+      return new JBossWSCXFTestSetup(ServletTestCase.class,
"jaxws-cxf-in_container_client.war, jaxws-cxf-in_container_client-client.war");
+   }
+   
+   public void test() throws Exception
+   {
+      assertEquals("1", runTestInContainer("test"));
+   }
+   
+   private String runTestInContainer(String test) throws Exception
+   {
+      URL url = new URL("http://" + getServerHost()
+            +
":8080/jaxws-cxf-in_container_client-client?path=/jaxws-cxf-in_container_client/HelloWorldService&method="
+ test
+            + "&helper=" + Helper.class.getName());
+      BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+      return br.readLine();
+   }
+}

Deleted:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/WEB-INF/jboss-deployment-structure.xml
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/WEB-INF/jboss-deployment-structure.xml	2013-05-08
15:53:16 UTC (rev 17539)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/WEB-INF/jboss-deployment-structure.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2">
-    <deployment>
-        <dependencies>
-            <module name="org.jboss.ws.cxf.jbossws-cxf-client"
services="import" />
-            <module name="org.apache.cxf.impl">
-                <imports>
-                    <include path="META-INF"/>
-                    <include path="META-INF/cxf"/>
-                </imports>
-            </module>
-            <module name="org.springframework.spring">
-                <imports>
-                    <include path="META-INF"/>
-                </imports>
-            </module>
-        </dependencies>
-    </deployment>
-</jboss-deployment-structure>
\ No newline at end of file

Copied:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/WEB-INF/jboss-deployment-structure.xml
(from rev 17539,
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/WEB-INF/jboss-deployment-structure.xml)
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/WEB-INF/jboss-deployment-structure.xml	
                       (rev 0)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/WEB-INF/jboss-deployment-structure.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2">
+    <deployment>
+        <dependencies>
+            <module name="org.jboss.ws.cxf.jbossws-cxf-client"
services="import" />
+            <module name="org.apache.cxf.impl">
+                <imports>
+                    <include path="META-INF"/>
+                    <include path="META-INF/cxf"/>
+                </imports>
+            </module>
+            <module name="org.springframework.spring">
+                <imports>
+                    <include path="META-INF"/>
+                </imports>
+            </module>
+        </dependencies>
+    </deployment>
+</jboss-deployment-structure>
\ No newline at end of file

Deleted:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/cxf.xml
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/cxf.xml	2013-05-08
15:53:16 UTC (rev 17539)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/cxf.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -1,10 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-  <bean id="cxf.default.workqueue"
class="org.apache.cxf.workqueue.AutomaticWorkQueueImpl"> 
-    <property name="name" value="cxf.default.workqueue"/> 
-    <property name="queueSize" value="10"/> 
-  </bean>
-  
-</beans>
\ No newline at end of file

Copied:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/cxf.xml
(from rev 17539,
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/cxf.xml)
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/cxf.xml	
                       (rev 0)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/in_container_client/cxf.xml	2013-06-24
15:31:38 UTC (rev 17727)
@@ -0,0 +1,10 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+  <bean id="cxf.default.workqueue"
class="org.apache.cxf.workqueue.AutomaticWorkQueueImpl"> 
+    <property name="name" value="cxf.default.workqueue"/> 
+    <property name="queueSize" value="10"/> 
+  </bean>
+  
+</beans>
\ No newline at end of file

Modified: stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml
===================================================================

--- stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml	2013-06-24 12:03:11 UTC (rev 17726)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml	2013-06-24 15:31:38 UTC (rev 17727)
@@ -94,7 +94,7 @@
     <commons-lang.version>2.6</commons-lang.version>
     <commons.logging.version>1.1.1</commons.logging.version>
     <log4j.version>1.2.16</log4j.version>
-    <mail.version>1.4.4</mail.version>
+    <activation.version>1.1</activation.version>
     <neethi.version>3.0.2</neethi.version>
     <opensaml.version>2.5.1-1</opensaml.version>
     <saaj.api.version>1.0.1.Final</saaj.api.version>
@@ -1189,9 +1189,9 @@
         <version>${log4j.version}</version>
       </dependency>
       <dependency>
-        <groupId>javax.mail</groupId>
-        <artifactId>mail</artifactId>
-        <version>${mail.version}</version>
+        <groupId>javax.activation</groupId>
+        <artifactId>activation</artifactId>
+        <version>${activation.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.neethi</groupId>


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[jbossws-commits] JBossWS SVN: r17727 - in stack/cxf/branches/jbossws-cxf-4.1.x: modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main and 15 other directories.