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

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2012-03-01 08:51:30 -0500 (Thu, 01 Mar 2012)
New Revision: 15802

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

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



Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
   - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791
   + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15795
Modified: svn:mergeinfo
   - /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791
   + /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15795

Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml	2012-03-01 13:46:26 UTC (rev 15801)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml	2012-03-01 13:51:30 UTC (rev 15802)
@@ -64,6 +64,13 @@
     </dependency>
 
     <dependency>
+      <groupId>org.jboss.ws.native</groupId>
+      <artifactId>jbossws-native-resources</artifactId>
+      <version>${project.version}</version>
+      <classifier>jboss711</classifier>
+    </dependency>
+
+    <dependency>
       <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-common-tools</artifactId>
       <scope>provided</scope>
@@ -108,6 +115,7 @@
       <scope>provided</scope>
     </dependency>
 
+    <!-- Container integrations -->
     <dependency>
       <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-jboss701</artifactId>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2012-03-01 13:46:26 UTC (rev 15801)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2012-03-01 13:51:30 UTC (rev 15802)
@@ -35,7 +35,6 @@
         <include>org.jboss.ws.native:jbossws-native-client</include>
         <include>org.jboss.ws.native:jbossws-native-factories:jar</include>
         <include>org.jboss.ws.native:jbossws-native-services:jar</include>
-        <include>org.jboss.ws.native:jbossws-native-resources:jar:jboss701</include>
         <include>org.jboss.ws.native:jbossws-native-core</include>
         <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
         <include>javax.jws:jsr181-api:jar</include>
@@ -69,9 +68,7 @@
         <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:jbossxb:jar</include>
         <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include>
       </includes>
@@ -84,7 +81,7 @@
        <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>
@@ -95,25 +92,13 @@
        <outputDirectory>deploy-artifacts/lib</outputDirectory>
        <unpack>false</unpack>           
        <includes>
-         <include>org.jboss.ws:jbossws-jboss702:jar:*:tests-integration</include>
+          <include>org.jboss.ws.native:jbossws-native-resources:jar:*:jboss*</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-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>

Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml	2012-03-01 13:46:26 UTC (rev 15801)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml	2012-03-01 13:51:30 UTC (rev 15802)
@@ -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/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2012-03-01 13:46:26 UTC (rev 15801)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2012-03-01 13:51:30 UTC (rev 15802)
@@ -160,7 +160,7 @@
       </copy>
       <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true">
         <fileset dir="@{thirdpartydir}/lib">
-          <include name="**/jbossws-native-resources.jar"/>
+          <include name="**/jbossws-native-resources-@{jbossid}.jar"/>
           <include name="**/jbossws-@{jbossid}.jar"/>
         </fileset>
       </copy>