Author: alessio.soldano(a)jboss.com
Date: 2010-11-19 03:39:08 -0500 (Fri, 19 Nov 2010)
New Revision: 13306
Modified:
stack/native/branches/jbossws-native-3.4.0/modules/management/pom.xml
stack/native/branches/jbossws-native-3.4.0/src/main/scripts/assembly-deploy-artifacts.xml
Log:
svn merge -r 13304:13305
https://svn.jboss.org/repos/jbossws/stack/native/trunk
Modified: stack/native/branches/jbossws-native-3.4.0/modules/management/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.0/modules/management/pom.xml 2010-11-18
18:49:58 UTC (rev 13305)
+++ stack/native/branches/jbossws-native-3.4.0/modules/management/pom.xml 2010-11-19
08:39:08 UTC (rev 13306)
@@ -44,14 +44,14 @@
<artifactId>jbossws-jboss510</artifactId>
<scope>provided</scope>
</dependency>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss510-metadata</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600M5</artifactId>
Modified:
stack/native/branches/jbossws-native-3.4.0/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
---
stack/native/branches/jbossws-native-3.4.0/src/main/scripts/assembly-deploy-artifacts.xml 2010-11-18
18:49:58 UTC (rev 13305)
+++
stack/native/branches/jbossws-native-3.4.0/src/main/scripts/assembly-deploy-artifacts.xml 2010-11-19
08:39:08 UTC (rev 13306)
@@ -161,9 +161,6 @@
<include>org.jboss.ws:jbossws-jboss510:jar</include>
</includes>
</dependencySet>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss510-metadata.${module.extension}</outputFileNameMapping>
@@ -174,6 +171,9 @@
<include>org.jboss.ws:jbossws-jboss510-metadata:jar</include>
</includes>
</dependencySet>
+ <!-- [JBWS-2505] -->
+ <!-- START -->
+ <!--
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>