[jbossws-commits] JBossWS SVN: r16493 - in stack/cxf/trunk: modules/dist and 4 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Thu Jul 19 06:32:18 EDT 2012


Author: richard.opalka at jboss.com
Date: 2012-07-19 06:32:17 -0400 (Thu, 19 Jul 2012)
New Revision: 16493

Modified:
   stack/cxf/trunk/modules/dist/pom.xml
   stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
   stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
   stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
   stack/cxf/trunk/modules/testsuite/pom.xml
   stack/cxf/trunk/pom.xml
Log:
[JBWS-3484] refactoring AS 71x integration layers

Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml	2012-07-19 08:55:26 UTC (rev 16492)
+++ stack/cxf/trunk/modules/dist/pom.xml	2012-07-19 10:32:17 UTC (rev 16493)
@@ -131,68 +131,22 @@
         <artifactId>opensaml</artifactId>
         <scope>provided</scope>
       </dependency>
-
-      <!-- Container integrations -->
+      <!-- container integration -->
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss710</artifactId>
+        <artifactId>jbossws-jboss710-server-integration</artifactId>
         <scope>provided</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>org.jboss.as</groupId>
-            <artifactId>jboss-as-controller-client</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.jboss.as</groupId>
-            <artifactId>jboss-as-security</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.jboss.marshalling</groupId>
-            <artifactId>jboss-marshalling-river</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss711</artifactId>
+        <artifactId>jbossws-jboss711-server-integration</artifactId>
         <scope>provided</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>org.jboss.as</groupId>
-            <artifactId>jboss-as-controller-client</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.jboss.as</groupId>
-            <artifactId>jboss-as-security</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.jboss.marshalling</groupId>
-            <artifactId>jboss-marshalling-river</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
-
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss712</artifactId>
+        <artifactId>jbossws-jboss712-server-integration</artifactId>
         <scope>provided</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>org.jboss.as</groupId>
-            <artifactId>jboss-as-controller-client</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.jboss.as</groupId>
-            <artifactId>jboss-as-security</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.jboss.marshalling</groupId>
-            <artifactId>jboss-marshalling-river</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
-
       <!--junit-->
       <dependency>
         <groupId>junit</groupId>
@@ -282,40 +236,23 @@
         <!-- Libraries required for running binary distro testsuite and not available on server-->
         <dependency>
           <groupId>org.jboss.ws</groupId>
-          <artifactId>jbossws-jboss710</artifactId>
-          <classifier>tests-integration</classifier>
+          <artifactId>jbossws-jboss710-tests-integration</artifactId>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.jboss.ws</groupId>
-          <artifactId>jbossws-jboss711</artifactId>
-          <classifier>tests-integration</classifier>
+          <artifactId>jbossws-jboss711-tests-integration</artifactId>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.jboss.ws</groupId>
-          <artifactId>jbossws-jboss712</artifactId>
-          <classifier>tests-integration</classifier>
+          <artifactId>jbossws-jboss712-tests-integration</artifactId>
           <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.jboss.as</groupId>
           <artifactId>jboss-as-webservices-tests-integration</artifactId>
           <scope>provided</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>org.jboss.as</groupId>
-              <artifactId>jboss-as-build-config</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss.as</groupId>
-              <artifactId>jboss-as-server</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss.marshalling</groupId>
-              <artifactId>jboss-marshalling-river</artifactId>
-            </exclusion>
-          </exclusions>
         </dependency>
       </dependencies>
       <build>

Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml	2012-07-19 08:55:26 UTC (rev 16492)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml	2012-07-19 10:32:17 UTC (rev 16493)
@@ -101,7 +101,7 @@
 
   <target name="undeploy-jboss711" depends="target-jboss711,init" description="Remove jbossws from jboss711">
     <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/>
-    <macro-undeploy-jbossws-modules targetdir="${jboss711.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
+    <macro-undeploy-jbossws-modules targetdir="${jboss711.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
   </target>
 
   <!-- ================================================================== -->
@@ -130,7 +130,7 @@
 
   <target name="undeploy-jboss712" depends="target-jboss712,init" description="Remove jbossws from jboss712">
     <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/>
-    <macro-undeploy-jbossws-modules targetdir="${jboss712.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/>
+    <macro-undeploy-jbossws-modules targetdir="${jboss712.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
   </target>
 
   <!-- ================================================================== -->

Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2012-07-19 08:55:26 UTC (rev 16492)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2012-07-19 10:32:17 UTC (rev 16493)
@@ -79,7 +79,6 @@
               <include>org.opensaml:open*:jar</include>
               <include>org.opensaml:xmltooling:jar</include>
               <include>org.jboss.ws:jbossws-common-tools:jar</include>
-              <include>org.jboss.ws:jbossws-jboss*:jar</include>
             </includes>
             <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
             <scope>provided</scope>
@@ -90,10 +89,21 @@
             <outputDirectory>deploy-artifacts/lib</outputDirectory>
             <unpack>false</unpack>
             <includes>
-              <include>org.jboss.ws:jbossws-jboss*:jar:*:tests-integration</include>
+              <include>org.jboss.ws:jbossws-jboss*-tests-integration:jar</include>
+            </includes>
+            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+            <scope>provided</scope>
+            <useProjectArtifact>false</useProjectArtifact>
+         </dependencySet>
+
+
+         <dependencySet>
+            <outputDirectory>deploy-artifacts/lib</outputDirectory>
+            <unpack>false</unpack>
+            <includes>
               <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include>
             </includes>
-            <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
+            <outputFileNameMapping>jbossws-jboss720-tests-integration.jar</outputFileNameMapping>
             <scope>provided</scope>
             <useProjectArtifact>false</useProjectArtifact>
          </dependencySet>
@@ -102,6 +112,17 @@
             <outputDirectory>deploy-artifacts/lib</outputDirectory>
             <unpack>false</unpack>
             <includes>
+              <include>org.jboss.ws:jbossws-jboss*-server-integration:jar</include>
+            </includes>
+            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+            <scope>provided</scope>
+            <useProjectArtifact>false</useProjectArtifact>
+         </dependencySet>
+
+         <dependencySet>
+            <outputDirectory>deploy-artifacts/lib</outputDirectory>
+            <unpack>false</unpack>
+            <includes>
               <include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*:jboss*</include>
             </includes>
             <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>

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	2012-07-19 08:55:26 UTC (rev 16492)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2012-07-19 10:32:17 UTC (rev 16493)
@@ -131,7 +131,7 @@
       <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true">
         <fileset dir="@{thirdpartydir}/lib">
           <include name="**/jbossws-cxf-resources-@{jbossid}.jar"/>
-          <include name="**/jbossws-@{jbossid}.jar"/>
+          <include name="**/jbossws-@{jbossid}-server-integration.jar"/>
         </fileset>
       </copy>
       <!-- module.xml files -->

Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml	2012-07-19 08:55:26 UTC (rev 16492)
+++ stack/cxf/trunk/modules/testsuite/pom.xml	2012-07-19 10:32:17 UTC (rev 16493)
@@ -583,133 +583,8 @@
       <dependencies>
         <dependency>
           <groupId>org.jboss.ws</groupId>
-          <artifactId>jbossws-jboss710</artifactId>
-          <classifier>tests-integration</classifier>
-          <exclusions>
-            <exclusion>
-              <groupId>org.jboss.as</groupId>
-              <artifactId>jboss-as-transactions</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss.remoting3</groupId>
-              <artifactId>jboss-remoting</artifactId>
-            </exclusion>
-          </exclusions>
+          <artifactId>jbossws-jboss710-tests-integration</artifactId>
         </dependency>
-        <dependency>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-ejb-client</artifactId>
-          <version>1.0.2.Final</version>
-          <exclusions>
-            <exclusion>
-              <groupId>org.jboss.remoting3</groupId>
-              <artifactId>jboss-remoting</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss.xnio</groupId>
-              <artifactId>xnio-api</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss.ejb3</groupId>
-          <artifactId>jboss-ejb3-ext-api</artifactId>
-          <version>2.0.0</version>
-        </dependency>
-        <dependency>
-          <groupId>javassist</groupId>
-          <artifactId>javassist</artifactId>
-          <version>3.12.1.GA</version>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-          <exclusions>
-              <exclusion>
-                  <groupId>org.jboss.logging</groupId>
-                  <artifactId>jboss-logging-spi</artifactId>
-              </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-          <scope>test</scope>
-          <exclusions>
-              <exclusion>
-                  <groupId>xml-apis</groupId>
-                  <artifactId>xml-apis</artifactId>
-              </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jbossxb</artifactId>
-          <version>${jboss.xb.version}</version>
-          <scope>test</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>apache-xerces</groupId>
-              <artifactId>xml-apis</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>apache-xerces</groupId>
-              <artifactId>xercesImpl</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>jboss</groupId>
-              <artifactId>jboss-common-core</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss.logging</groupId>
-              <artifactId>jboss-logging-spi</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss.logging</groupId>
-              <artifactId>jboss-logging-log4j</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>sun-jaxb</groupId>
-              <artifactId>jaxb-api</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>xml-apis</groupId>
-              <artifactId>xml-apis</artifactId>
-            </exclusion>
-            <exclusion>
-               <groupId>wutka-dtdparser</groupId>
-               <artifactId>dtdparser121</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss.remoting3</groupId>
-          <artifactId>remoting-jmx</artifactId>
-          <version>1.0.0.Final</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss.remoting3</groupId>
-          <artifactId>jboss-remoting</artifactId>
-          <version>3.2.1.GA</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.hornetq</groupId>
-          <artifactId>hornetq-jms</artifactId>
-          <version>2.2.11.Final</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.hornetq</groupId>
-          <artifactId>hornetq-core</artifactId>
-          <version>2.2.11.Final</version>
-          <scope>test</scope>
-        </dependency>
       </dependencies>
       <build>
         <plugins>
@@ -750,7 +625,7 @@
 
                  <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
                  <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
-                 
+
                  <!--# [JBWS-3503] Enable this after find out how to easily generate client classpath in as7-->
                  <exclude>org/jboss/test/ws/jaxws/jbws1666/**</exclude>
 
@@ -800,142 +675,8 @@
       <dependencies>
         <dependency>
           <groupId>org.jboss.ws</groupId>
-          <artifactId>jbossws-jboss711</artifactId>
-          <classifier>tests-integration</classifier>
-          <exclusions>
-            <exclusion>
-              <groupId>org.jboss.as</groupId>
-              <artifactId>jboss-as-transactions</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss.remoting3</groupId>
-              <artifactId>jboss-remoting</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss</groupId>
-              <artifactId>jboss-remote-naming</artifactId>
-            </exclusion>
-          </exclusions>
+          <artifactId>jbossws-jboss711-tests-integration</artifactId>
         </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-remote-naming</artifactId>
-          <version>1.0.2.Final</version>
-        </dependency>
-        <dependency>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-ejb-client</artifactId>
-          <version>1.0.4.Final</version>
-          <exclusions>
-            <exclusion>
-              <groupId>org.jboss.remoting3</groupId>
-              <artifactId>jboss-remoting</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss.xnio</groupId>
-              <artifactId>xnio-api</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss.ejb3</groupId>
-          <artifactId>jboss-ejb3-ext-api</artifactId>
-          <version>2.0.0</version>
-        </dependency>
-        <dependency>
-          <groupId>javassist</groupId>
-          <artifactId>javassist</artifactId>
-          <version>3.12.1.GA</version>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-          <exclusions>
-              <exclusion>
-                  <groupId>org.jboss.logging</groupId>
-                  <artifactId>jboss-logging-spi</artifactId>
-              </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-          <scope>test</scope>
-          <exclusions>
-              <exclusion>
-                  <groupId>xml-apis</groupId>
-                  <artifactId>xml-apis</artifactId>
-              </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jbossxb</artifactId>
-          <version>${jboss.xb.version}</version>
-          <scope>test</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>apache-xerces</groupId>
-              <artifactId>xml-apis</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>apache-xerces</groupId>
-              <artifactId>xercesImpl</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>jboss</groupId>
-              <artifactId>jboss-common-core</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss.logging</groupId>
-              <artifactId>jboss-logging-spi</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss.logging</groupId>
-              <artifactId>jboss-logging-log4j</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>sun-jaxb</groupId>
-              <artifactId>jaxb-api</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>xml-apis</groupId>
-              <artifactId>xml-apis</artifactId>
-            </exclusion>
-            <exclusion>
-               <groupId>wutka-dtdparser</groupId>
-               <artifactId>dtdparser121</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss.remotingjmx</groupId>
-          <artifactId>remoting-jmx</artifactId>
-          <version>1.0.2.Final</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss.remoting3</groupId>
-          <artifactId>jboss-remoting</artifactId>
-          <version>3.2.2.GA</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.hornetq</groupId>
-          <artifactId>hornetq-jms</artifactId>
-          <version>2.2.13.Final</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.hornetq</groupId>
-          <artifactId>hornetq-core</artifactId>
-          <version>2.2.13.Final</version>
-          <scope>test</scope>
-        </dependency>
       </dependencies>
       <build>
         <plugins>
@@ -993,143 +734,9 @@
       </properties>
       <dependencies>
         <dependency>
-          <groupId>org.jboss.as</groupId>
-          <artifactId>jboss-as-webservices-tests-integration</artifactId>
-          <version>${jboss.version}</version>
-          <exclusions>
-            <exclusion>
-              <groupId>org.jboss.as</groupId>
-              <artifactId>jboss-as-transactions</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss.remoting3</groupId>
-              <artifactId>jboss-remoting</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss</groupId>
-              <artifactId>jboss-remote-naming</artifactId>
-            </exclusion>
-          </exclusions>
+          <groupId>org.jboss.ws</groupId>
+          <artifactId>jbossws-jboss712-tests-integration</artifactId>
         </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-remote-naming</artifactId>
-          <version>1.0.3.Final</version>
-        </dependency>
-        <dependency>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-ejb-client</artifactId>
-          <version>1.0.10.Final</version>
-          <exclusions>
-            <exclusion>
-              <groupId>org.jboss.remoting3</groupId>
-              <artifactId>jboss-remoting</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss.xnio</groupId>
-              <artifactId>xnio-api</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss.ejb3</groupId>
-          <artifactId>jboss-ejb3-ext-api</artifactId>
-          <version>2.0.0</version>
-        </dependency>
-        <dependency>
-          <groupId>javassist</groupId>
-          <artifactId>javassist</artifactId>
-          <version>3.12.1.GA</version>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-          <exclusions>
-              <exclusion>
-                  <groupId>org.jboss.logging</groupId>
-                  <artifactId>jboss-logging-spi</artifactId>
-              </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-          <scope>test</scope>
-          <exclusions>
-              <exclusion>
-                  <groupId>xml-apis</groupId>
-                  <artifactId>xml-apis</artifactId>
-              </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jbossxb</artifactId>
-          <version>${jboss.xb.version}</version>
-          <scope>test</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>apache-xerces</groupId>
-              <artifactId>xml-apis</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>apache-xerces</groupId>
-              <artifactId>xercesImpl</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>jboss</groupId>
-              <artifactId>jboss-common-core</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss.logging</groupId>
-              <artifactId>jboss-logging-spi</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>org.jboss.logging</groupId>
-              <artifactId>jboss-logging-log4j</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>sun-jaxb</groupId>
-              <artifactId>jaxb-api</artifactId>
-            </exclusion>
-            <exclusion>
-              <groupId>xml-apis</groupId>
-              <artifactId>xml-apis</artifactId>
-            </exclusion>
-            <exclusion>
-               <groupId>wutka-dtdparser</groupId>
-               <artifactId>dtdparser121</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss.remotingjmx</groupId>
-          <artifactId>remoting-jmx</artifactId>
-          <version>1.0.3.Final</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss.remoting3</groupId>
-          <artifactId>jboss-remoting</artifactId>
-          <version>3.2.7.GA</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.hornetq</groupId>
-          <artifactId>hornetq-jms</artifactId>
-          <version>2.2.16.Final</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.hornetq</groupId>
-          <artifactId>hornetq-core</artifactId>
-          <version>2.2.16.Final</version>
-          <scope>test</scope>
-        </dependency>
       </dependencies>
       <build>
         <plugins>

Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml	2012-07-19 08:55:26 UTC (rev 16492)
+++ stack/cxf/trunk/pom.xml	2012-07-19 10:32:17 UTC (rev 16493)
@@ -149,36 +149,33 @@
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss710</artifactId>
+        <artifactId>jbossws-jboss710-server-integration</artifactId>
         <version>${jbossws.jboss710.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss710</artifactId>
+        <artifactId>jbossws-jboss710-tests-integration</artifactId>
         <version>${jbossws.jboss710.version}</version>
-        <classifier>tests-integration</classifier>
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss711</artifactId>
+        <artifactId>jbossws-jboss711-server-integration</artifactId>
         <version>${jbossws.jboss711.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss711</artifactId>
+        <artifactId>jbossws-jboss711-tests-integration</artifactId>
         <version>${jbossws.jboss711.version}</version>
-        <classifier>tests-integration</classifier>
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss712</artifactId>
+        <artifactId>jbossws-jboss712-server-integration</artifactId>
         <version>${jbossws.jboss712.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss712</artifactId>
+        <artifactId>jbossws-jboss712-tests-integration</artifactId>
         <version>${jbossws.jboss712.version}</version>
-        <classifier>tests-integration</classifier>
       </dependency>
       <dependency>
         <groupId>org.jboss.as</groupId>



More information about the jbossws-commits mailing list