4:18 a.m.
Author: richard.opalka(a)jboss.com
Date: 2009-03-12 05:18:54 -0400 (Thu, 12 Mar 2009)
New Revision: 9578
Modified:
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml
Log:
[JBWS-2573] fix
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2009-03-12 09:13:03 UTC (rev 9577)
+++ stack/cxf/trunk/modules/management/pom.xml 2009-03-12 09:18:54 UTC (rev 9578)
@@ -1,49 +1,49 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<name>JBoss Web Services - Stack CXF Management</name>
<artifactId>jbossws-cxf-management</artifactId>
<packaging>war</packaging>
-
+
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
<version>3.1.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
-
+
<dependencies>
- <!--
+ <!--
These runtime dependencies are picked up by the assembly-deploy-artifacts
descriptor. They have no real relevants to this module.
-->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
- <scope>runtime</scope>
- </dependency>
+ <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,23 +51,23 @@
<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>
-
+
<!-- Build -->
<build>
<plugins>
@@ -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/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-03-12 09:13:03 UTC (rev 9577)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-03-12 09:18:54 UTC (rev 9578)
@@ -174,7 +174,7 @@
<build>
<resources>
<resource>
- <targetPath>/</targetPath>
+ <targetPath>.</targetPath>
<directory>src/main/resources/jbossws-cxf-server.jar</directory>
</resource>
<resource>
Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2009-03-12 09:13:03 UTC (rev
9577)
+++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2009-03-12 09:18:54 UTC (rev
9578)
@@ -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/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-12 09:13:03 UTC
(rev 9577)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-12 09:18:54 UTC
(rev 9578)
@@ -87,7 +87,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>
@@ -102,7 +102,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>
@@ -115,7 +115,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>
@@ -125,7 +125,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/cxf/trunk/src/main/scripts/assembly-src-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml 2009-03-12 09:13:03 UTC (rev
9577)
+++ stack/cxf/trunk/src/main/scripts/assembly-src-dist.xml 2009-03-12 09:18:54 UTC (rev
9578)
@@ -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>