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

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2011-01-11 09:20:09 -0500 (Tue, 11 Jan 2011)
New Revision: 13553

Modified:
   stack/native/trunk/modules/core/pom.xml
   stack/native/trunk/modules/management/pom.xml
   stack/native/trunk/pom.xml
   stack/native/trunk/src/main/distro/build-deploy.xml
   stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
use created ASIL for jboss 600 Final

Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml	2011-01-11 14:19:31 UTC (rev 13552)
+++ stack/native/trunk/modules/core/pom.xml	2011-01-11 14:20:09 UTC (rev 13553)
@@ -196,6 +196,25 @@
               </artifactItems>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-dependencies</id>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.jboss.ws</groupId>
+                  <artifactId>jbossws-jboss600</artifactId>
+                  <version>${jbossws.jboss600.version}</version>
+                  <classifier>resources</classifier>
+                  <type>zip</type>
+                  <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
           <!-- [JBWS-2505] -->
           <!-- START -->
           <!--

Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml	2011-01-11 14:19:31 UTC (rev 13552)
+++ stack/native/trunk/modules/management/pom.xml	2011-01-11 14:20:09 UTC (rev 13553)
@@ -29,6 +29,21 @@
       <scope>provided</scope>
       <type>zip</type>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.ws</groupId>
+      <artifactId>jbossws-jboss600</artifactId>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>sun-jaxb</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <!-- [JBWS-2505] -->
     <!-- START -->
     <!--

Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml	2011-01-11 14:19:31 UTC (rev 13552)
+++ stack/native/trunk/pom.xml	2011-01-11 14:20:09 UTC (rev 13553)
@@ -49,6 +49,7 @@
     <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version>
     <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
     <jbossws.framework.version>4.0.0-SNAPSHOT</jbossws.framework.version>
+    <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
     <!-- [JBWS-2505] -->
     <!-- START -->
     <!--
@@ -105,6 +106,18 @@
         <classifier>testsuite</classifier>
         <type>zip</type>
       </dependency>
+      <dependency>
+        <groupId>org.jboss.ws</groupId>
+        <artifactId>jbossws-jboss600</artifactId>
+        <version>${jbossws.jboss600.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.ws</groupId>
+        <artifactId>jbossws-jboss600</artifactId>
+        <version>${jbossws.jboss600.version}</version>
+        <classifier>resources</classifier>
+        <type>zip</type>
+      </dependency>
       <!-- [JBWS-2505] -->
       <!-- START -->
       <!--

Modified: stack/native/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/src/main/distro/build-deploy.xml	2011-01-11 14:19:31 UTC (rev 13552)
+++ stack/native/trunk/src/main/distro/build-deploy.xml	2011-01-11 14:20:09 UTC (rev 13553)
@@ -22,7 +22,7 @@
       <param name="jbossid" value="${jbossws.integration.target}"/>
       <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
       <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
-      <param name="modifyjbossintegration" value="false"/><!-- [JBWS-2505] -->
+      <param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] -->
     </antcall>
     <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
   </target>
@@ -49,7 +49,7 @@
     <macro-undeploy-jbossws targetdir="${jboss600.server}"
     	                    defaultconf="${jbossws.default.deploy.conf}"
     	                    defaultserverconf="${jbossws.default.server.deploy.conf}"
-    	                    modifyjbossintegration="false"/><!-- [JBWS-2505] -->
+    	                    modifyjbossintegration="true"/><!-- [JBWS-2505] -->
   </target>
 
   <!-- ================================================================== -->

Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2011-01-11 14:19:31 UTC (rev 13552)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2011-01-11 14:20:09 UTC (rev 13553)
@@ -132,6 +132,16 @@
               <include>juddi:juddi:jar</include>
             </includes>
           </dependencySet>
+          <dependencySet>
+            <outputDirectory>deploy-artifacts/lib</outputDirectory>
+            <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
+            <useStrictFiltering>true</useStrictFiltering>
+            <scope>provided</scope>
+            <unpack>false</unpack>
+            <includes>
+              <include>org.jboss.ws:jbossws-jboss600:jar</include>
+            </includes>
+          </dependencySet>
           <!-- [JBWS-2505] -->
           <!-- START -->
           <!--