[jbossws-commits] JBossWS SVN: r14190 - in stack/cxf/branches/cxf24: modules/client and 2 other directories.
Author: alessio.soldano(a)jboss.com
Date: 2011-04-24 18:04:33 -0400 (Sun, 24 Apr 2011)
New Revision: 14190
Modified:
stack/cxf/branches/cxf24/
stack/cxf/branches/cxf24/modules/client/pom.xml
stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml
stack/cxf/branches/cxf24/modules/testsuite/pom.xml
stack/cxf/branches/cxf24/pom.xml
Log:
svn merge -r 14167:HEAD https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
Property changes on: stack/cxf/branches/cxf24
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:14168-14189
Modified: stack/cxf/branches/cxf24/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/client/pom.xml 2011-04-24 21:57:36 UTC (rev 14189)
+++ stack/cxf/branches/cxf24/modules/client/pom.xml 2011-04-24 22:04:33 UTC (rev 14190)
@@ -282,7 +282,7 @@
<customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
</manifest>
<manifestEntries>
- <Class-Path>jaxws-api.jar jboss-logging.jar jboss-logging-spi.jar
jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar
stax-api.jar wstx.jar wstx-lgpl.jar</Class-Path>
+ <Class-Path>jbossws-common-tools.jar jaxws-api.jar jboss-logging.jar
jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar
slf4j-jboss-logging.jar stax-api.jar wstx.jar wstx-lgpl.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
Modified:
stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml
===================================================================
---
stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml 2011-04-24
21:57:36 UTC (rev 14189)
+++
stack/cxf/branches/cxf24/modules/resources/src/main/resources/modules/org/jboss/ws/tools/common/main/module.xml 2011-04-24
22:04:33 UTC (rev 14190)
@@ -31,8 +31,12 @@
<dependencies>
<module name="gnu.getopt"/>
<module name="org.apache.log4j"/>
- <module name="org.jboss.modules"/>
- <module name="org.jboss.ws.api"/>
+ <module name="org.jboss.as.webservices.server.integration"
services="import">
+ <imports>
+ <include path="META-INF"/>
+ <include path="META-INF/cxf"/>
+ </imports>
+ </module>
</dependencies>
</module>
Modified: stack/cxf/branches/cxf24/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/modules/testsuite/pom.xml 2011-04-24 21:57:36 UTC (rev
14189)
+++ stack/cxf/branches/cxf24/modules/testsuite/pom.xml 2011-04-24 22:04:33 UTC (rev
14190)
@@ -828,7 +828,7 @@
<profile>
<id>jboss700</id>
<properties>
- <jboss.version>7.0.0.Beta3-SNAPSHOT</jboss.version>
+ <jboss.version>7.0.0.Beta4-SNAPSHOT</jboss.version>
<jbossws.integration.target>jboss700</jbossws.integration.target>
</properties>
<dependencies>
Modified: stack/cxf/branches/cxf24/pom.xml
===================================================================
--- stack/cxf/branches/cxf24/pom.xml 2011-04-24 21:57:36 UTC (rev 14189)
+++ stack/cxf/branches/cxf24/pom.xml 2011-04-24 22:04:33 UTC (rev 14190)
@@ -56,7 +56,7 @@
<jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
- <jboss700.version>7.0.0.Beta3-SNAPSHOT</jboss700.version>
+ <jboss700.version>7.0.0.Beta4-SNAPSHOT</jboss700.version>
<cxf.version>2.4.0</cxf.version>
<cxf.asm.version>3.3</cxf.asm.version>
<cxf.xjcplugins.version>2.3.2</cxf.xjcplugins.version>