[jbossws-commits] JBossWS SVN: r9577 - in stack/metro/trunk: modules/server and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-03-12 05:13:03 -0400 (Thu, 12 Mar 2009)
New Revision: 9577

Modified:
   stack/metro/trunk/modules/management/pom.xml
   stack/metro/trunk/modules/server/pom.xml
   stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
   stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
   stack/metro/trunk/src/main/scripts/assembly-src-dist.xml
Log:
[JBWS-2573] fix

Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml	2009-03-12 08:47:10 UTC (rev 9576)
+++ stack/metro/trunk/modules/management/pom.xml	2009-03-12 09:13:03 UTC (rev 9577)
@@ -21,29 +21,29 @@
     <dependency>
       <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-framework</artifactId>
-      <scope>runtime</scope>
+      <scope>provided</scope>
     </dependency>    
     <dependency>
       <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-framework</artifactId>
       <classifier>testsuite</classifier>
-      <scope>runtime</scope>
+      <scope>provided</scope>
       <type>zip</type>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-jboss423</artifactId>
-      <scope>runtime</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-jboss500</artifactId>
-      <scope>runtime</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-jboss501</artifactId>
-      <scope>runtime</scope>
+      <scope>provided</scope>
     </dependency>
     <!-- [JBWS-2505] -->
     <!-- START -->
@@ -51,19 +51,19 @@
     <dependency>
       <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-jboss510x</artifactId>
-      <scope>runtime</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-jboss600x</artifactId>
-      <scope>runtime</scope>
+      <scope>provided</scope>
     </dependency>
     -->
     <!-- END -->
     <dependency>
       <groupId>org.jboss.jaxr</groupId>
       <artifactId>juddi-service</artifactId>
-      <scope>runtime</scope>
+      <scope>provided</scope>
       <type>sar</type>
     </dependency>
   </dependencies>
@@ -94,14 +94,13 @@
       <plugin>
          <artifactId>maven-war-plugin</artifactId>
          <configuration>
-           <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
            <webResources>
              <resource>
                <directory>src/main/webapp</directory>
                <filtering>true</filtering>
              </resource>
            </webResources>
-         </configuration>       
+         </configuration>
       </plugin>
     </plugins>
   </build>

Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml	2009-03-12 08:47:10 UTC (rev 9576)
+++ stack/metro/trunk/modules/server/pom.xml	2009-03-12 09:13:03 UTC (rev 9577)
@@ -123,7 +123,7 @@
   <build>
     <resources>
       <resource>
-        <targetPath>/</targetPath>
+        <targetPath>.</targetPath>
         <directory>src/main/resources/jbossws-metro-server.jar</directory>
       </resource>
       <resource>

Modified: stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml	2009-03-12 08:47:10 UTC (rev 9576)
+++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml	2009-03-12 09:13:03 UTC (rev 9577)
@@ -89,7 +89,7 @@
           <dependencySet>
             <outputDirectory>tests</outputDirectory>
             <useStrictFiltering>true</useStrictFiltering>
-            <scope>runtime</scope>
+            <scope>provided</scope>
             <unpack>true</unpack>
             <includes>
               <include>*:jbossws-framework:zip:testsuite</include>

Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2009-03-12 08:47:10 UTC (rev 9576)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml	2009-03-12 09:13:03 UTC (rev 9577)
@@ -75,7 +75,7 @@
             <outputDirectory>lib</outputDirectory>
             <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
-            <scope>runtime</scope>
+            <scope>provided</scope>
             <unpack>false</unpack>
             <includes>
               <include>org.jboss.ws:jbossws-framework:jar</include>
@@ -90,7 +90,7 @@
             <outputDirectory>lib</outputDirectory>
             <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
-            <scope>runtime</scope>
+            <scope>provided</scope>
             <unpack>false</unpack>
             <includes>
               <include>org.jboss.ws:jbossws-jboss501:jar</include>
@@ -103,7 +103,7 @@
             <outputDirectory>lib</outputDirectory>
             <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
-            <scope>runtime</scope>
+            <scope>provided</scope>
             <unpack>false</unpack>
             <includes>
               <include>org.jboss.ws:jbossws-jboss510x:jar</include>
@@ -113,7 +113,7 @@
             <outputDirectory>lib</outputDirectory>
             <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
             <useStrictFiltering>true</useStrictFiltering>
-            <scope>runtime</scope>
+            <scope>provided</scope>
             <unpack>false</unpack>
             <includes>
               <include>org.jboss.ws:jbossws-jboss600x:jar</include>

Modified: stack/metro/trunk/src/main/scripts/assembly-src-dist.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-src-dist.xml	2009-03-12 08:47:10 UTC (rev 9576)
+++ stack/metro/trunk/src/main/scripts/assembly-src-dist.xml	2009-03-12 09:13:03 UTC (rev 9577)
@@ -57,7 +57,7 @@
           <dependencySet>
             <outputDirectory>modules/testsuite/framework-tests/src/test</outputDirectory>
             <useStrictFiltering>true</useStrictFiltering>
-            <scope>runtime</scope>
+            <scope>provided</scope>
             <unpack>true</unpack>
             <includes>
               <include>*:jbossws-framework:zip:testsuite</include>