[jbossws-commits] JBossWS SVN: r15796 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/dist and 3 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Thu Mar 1 06:04:51 EST 2012 

Author: alessio.soldano at jboss.com
Date: 2012-03-01 06:04:50 -0500 (Thu, 01 Mar 2012)
New Revision: 15796

Modified:
   stack/cxf/branches/jbossws-cxf-4.0.x/
   stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml
   stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
   stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml
   stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
Merged revisions 15794 via svnmerge from 
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk

.......
  r15794 | alessio.soldano at jboss.com | 2012-03-01 11:20:52 +0100 (Thu, 01 Mar 2012) | 2 lines
  
  Fix assembly plugin configuration to avoid picking the same jbossws-cxf-resources.jar for all target containers; simplify assembly plugin configuration a bit and add missing dependency in dist module
.......



Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
   - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757,15765-15766,15768,15770-15773,15780-15781,15784
   + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757,15765-15766,15768,15770-15773,15780-15781,15784,15794
Modified: svn:mergeinfo
   - /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784
   + /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml	2012-03-01 10:59:10 UTC (rev 15795)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml	2012-03-01 11:04:50 UTC (rev 15796)
@@ -52,6 +52,13 @@
 
       <dependency>
          <groupId>org.jboss.ws.cxf</groupId>
+         <artifactId>jbossws-cxf-resources</artifactId>
+         <version>${project.version}</version>
+         <classifier>jboss711</classifier>     
+      </dependency>
+
+      <dependency>
+         <groupId>org.jboss.ws.cxf</groupId>
          <artifactId>jbossws-cxf-server</artifactId>
          <version>${project.version}</version>     
       </dependency>
@@ -129,6 +136,7 @@
         <scope>provided</scope>
       </dependency>
 
+      <!-- Container integrations -->
       <dependency>
         <groupId>org.jboss.ws</groupId>
         <artifactId>jbossws-jboss701</artifactId>

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2012-03-01 10:59:10 UTC (rev 15795)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2012-03-01 11:04:50 UTC (rev 15796)
@@ -30,7 +30,10 @@
             <outputDirectory>deploy-artifacts/lib</outputDirectory>
             <unpack>false</unpack>
             <includes>
-              <include>org.jboss.ws.cxf:*</include>
+              <include>org.jboss.ws.cxf:jbossws-cxf-client:jar</include>
+              <include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include>
+              <include>org.jboss.ws.cxf:jbossws-cxf-server:jar</include>
+              <include>org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar</include>
               <include>org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:jar</include>
               <include>org.jboss.com.sun.httpserver:httpserver:jar</include>
               <include>org.apache.cxf:cxf-*</include>
@@ -75,53 +78,39 @@
               <include>apache-scout:scout:jar</include>
               <include>juddi:juddi:jar</include>
               <include>org.jboss.ws:jbossws-common-tools:jar</include>
-              <include>org.jboss.ws:jbossws-jboss701:jar</include>
-              <include>org.jboss.ws:jbossws-jboss702:jar</include>
-              <include>org.jboss.ws:jbossws-jboss710:jar</include>
+              <include>org.jboss.ws:jbossws-jboss*:jar</include>
               <include>org.jboss.as:jboss-as-webservices-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.ws:jbossws-jboss701:jar:*:tests-integration</include>
+              <include>org.jboss.ws:jbossws-jboss*:jar:*:tests-integration</include>
             </includes>
             <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
             <scope>provided</scope>
             <useProjectArtifact>false</useProjectArtifact>
-          </dependencySet>
+         </dependencySet>
 
          <dependencySet>
             <outputDirectory>deploy-artifacts/lib</outputDirectory>
             <unpack>false</unpack>           
             <includes>
-              <include>org.jboss.ws:jbossws-jboss702:jar:*:tests-integration</include>
+              <include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*:jboss*</include>
             </includes>
             <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
-            <scope>provided</scope>
             <useProjectArtifact>false</useProjectArtifact>
-          </dependencySet>
+         </dependencySet>
 
          <dependencySet>
             <outputDirectory>deploy-artifacts/lib</outputDirectory>
             <unpack>false</unpack>           
             <includes>
-              <include>org.jboss.ws:jbossws-jboss710:jar:*:tests-integration</include>
-            </includes>
-            <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping>
-            <scope>provided</scope>
-            <useProjectArtifact>false</useProjectArtifact>
-          </dependencySet>
-
-         <dependencySet>
-            <outputDirectory>deploy-artifacts/lib</outputDirectory>
-            <unpack>false</unpack>           
-            <includes>
               <include>org.jboss.ws:jbossws-shared-testsuite:jar</include>
             </includes>
             <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml	2012-03-01 10:59:10 UTC (rev 15795)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml	2012-03-01 11:04:50 UTC (rev 15796)
@@ -41,13 +41,6 @@
             <id>all</id>
             <goals><goal>jar</goal></goals>
             <phase>package</phase>
-            <configuration>
-              <excludes>
-                <exclude>**/jbossws-jboss701/**</exclude>
-                <exclude>**/jbossws-jboss702/**</exclude>
-                <exclude>**/jbossws-jboss710/**</exclude>
-              </excludes>
-            </configuration>
           </execution>
           <execution>
             <id>jboss701</id>
@@ -76,6 +69,15 @@
               <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>jboss711</id>
+            <goals><goal>jar</goal></goals>
+            <phase>package</phase>
+            <configuration>
+              <classifier>jboss711</classifier>
+              <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss711/jbossws.beans</classesDirectory>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>

Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2012-03-01 10:59:10 UTC (rev 15795)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2012-03-01 11:04:50 UTC (rev 15796)
@@ -130,7 +130,7 @@
       </copy>
       <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true">
         <fileset dir="@{thirdpartydir}/lib">
-          <include name="**/jbossws-cxf-resources.jar"/>
+          <include name="**/jbossws-cxf-resources-@{jbossid}.jar"/>
           <include name="**/jbossws-@{jbossid}.jar"/>
         </fileset>
       </copy>

More information about the jbossws-commits mailing list