[jbossws-commits] JBossWS SVN: r15739 - in stack/native/trunk: modules/dist and 3 other directories.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2012-02-24 12:45:48 -0500 (Fri, 24 Feb 2012)
New Revision: 15739

Modified:
   stack/native/trunk/modules/dist/pom.xml
   stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
   stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
   stack/native/trunk/modules/resources/pom.xml
   stack/native/trunk/pom.xml
Log:
Adding AS710 ASIL


Modified: stack/native/trunk/modules/dist/pom.xml
===================================================================
--- stack/native/trunk/modules/dist/pom.xml	2012-02-24 16:41:02 UTC (rev 15738)
+++ stack/native/trunk/modules/dist/pom.xml	2012-02-24 17:45:48 UTC (rev 15739)
@@ -56,6 +56,13 @@
     </dependency>
 
     <dependency>
+      <groupId>org.jboss.ws.native</groupId>
+      <artifactId>jbossws-native-resources</artifactId>
+      <version>${project.version}</version>
+      <classifier>jboss710</classifier>
+    </dependency>
+
+    <dependency>
       <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-common-tools</artifactId>
       <scope>provided</scope>
@@ -132,6 +139,12 @@
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>org.jboss.ws</groupId>
+      <artifactId>jbossws-jboss710</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <!--junit-->
     <dependency>
       <groupId>junit</groupId>
@@ -241,6 +254,12 @@
           <scope>provided</scope>
         </dependency>
         <dependency>
+          <groupId>org.jboss.ws</groupId>
+          <artifactId>jbossws-jboss710</artifactId>
+          <classifier>tests-integration</classifier>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
           <groupId>org.jboss.as</groupId>
           <artifactId>jboss-as-webservices-tests-integration</artifactId>
           <scope>provided</scope>

Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml	2012-02-24 16:41:02 UTC (rev 15738)
+++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml	2012-02-24 17:45:48 UTC (rev 15739)
@@ -152,7 +152,7 @@
 
    <target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710">
      <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/>
-     <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}"  modifyjbossintegration="false"/>
+     <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}"  modifyjbossintegration="true"/>
    </target>
 
    <!-- ================================================================== -->

Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2012-02-24 16:41:02 UTC (rev 15738)
+++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2012-02-24 17:45:48 UTC (rev 15739)
@@ -71,6 +71,7 @@
         <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:jbossxb:jar</include>
         <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include>
       </includes>
@@ -102,6 +103,17 @@
     </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/trunk/modules/resources/pom.xml
===================================================================
--- stack/native/trunk/modules/resources/pom.xml	2012-02-24 16:41:02 UTC (rev 15738)
+++ stack/native/trunk/modules/resources/pom.xml	2012-02-24 17:45:48 UTC (rev 15739)
@@ -45,6 +45,7 @@
               <excludes>
                 <exclude>**/jbossws-jboss701/**</exclude>
                 <exclude>**/jbossws-jboss702/**</exclude>
+                <exclude>**/jbossws-jboss710/**</exclude>
               </excludes>
             </configuration>
           </execution>
@@ -66,6 +67,15 @@
               <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss702/jbossws.beans</classesDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>jboss710</id>
+            <goals><goal>jar</goal></goals>
+            <phase>package</phase>
+            <configuration>
+              <classifier>jboss710</classifier>
+              <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>

Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml	2012-02-24 16:41:02 UTC (rev 15738)
+++ stack/native/trunk/pom.xml	2012-02-24 17:45:48 UTC (rev 15739)
@@ -65,6 +65,7 @@
     <jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version>
     <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version>
     <jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version>
+    <jbossws.jboss710.version>4.0.2-SNAPSHOT</jbossws.jboss710.version>
     <jboss701.version>7.0.1.Final</jboss701.version>
     <jboss702.version>7.0.2.Final</jboss702.version>
     <jboss710.version>7.1.0.Final</jboss710.version>
@@ -145,12 +146,21 @@
         <version>${jbossws.jboss702.version}</version>
         <classifier>tests-integration</classifier>
       </dependency>
-      <!-- TODO Move dependency below to jboss711.version and add dependency on org.jboss.ws:jbossws-jboss710:${jbossws.jboss710.version}
-           when 710 container integration is needed and created -->
       <dependency>
+        <groupId>org.jboss.ws</groupId>
+        <artifactId>jbossws-jboss710</artifactId>
+        <version>${jbossws.jboss710.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.ws</groupId>
+        <artifactId>jbossws-jboss710</artifactId>
+        <version>${jbossws.jboss710.version}</version>
+        <classifier>tests-integration</classifier>
+      </dependency>
+      <dependency>
         <groupId>org.jboss.as</groupId>
         <artifactId>jboss-as-webservices-tests-integration</artifactId>
-        <version>${jboss710.version}</version>
+        <version>${jboss711.version}</version>
       </dependency>
       <!-- provided apis -->
       <dependency>