JBossWS SVN: r15511 - in stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss: ws/cxf/jbossws-cxf-client/main and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-24 17:13:42 -0500 (Tue, 24 Jan 2012)
New Revision: 15511
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/jaxws-client/main/module.xml
Log:
[JBWS-3413] Do not export services from org.apache.cxf module
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/as/webservices/server/integration/main/module.xml 2012-01-24 16:48:09 UTC (rev 15510)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/as/webservices/server/integration/main/module.xml 2012-01-24 22:13:42 UTC (rev 15511)
@@ -58,7 +58,8 @@
</exports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/>
- <module name="org.apache.cxf" services="export" export="true">
+ <!-- Do not import services from cxf module direclty, those need to come from jbossws -->
+ <module name="org.apache.cxf" export="true">
<imports>
<include path="META-INF/cxf"/>
<include path="META-INF"/>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2012-01-24 16:48:09 UTC (rev 15510)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2012-01-24 22:13:42 UTC (rev 15511)
@@ -41,7 +41,8 @@
<module name="org.jboss.ws.jaxws-client" export="true" services="export" />
<!-- JBossWS configuration of Apache CXF -->
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" />
- <module name="org.apache.cxf" export="true" services="export" />
+ <!-- Apache CXF - do not import services, those need to come from JBossWS -->
+ <module name="org.apache.cxf" export="true" />
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true" services="export" />
<module name="org.jboss.jaxbintros" export="true"/>
</dependencies>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2012-01-24 16:48:09 UTC (rev 15510)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2012-01-24 22:13:42 UTC (rev 15511)
@@ -41,7 +41,8 @@
<module name="org.jboss.ws.common" />
<module name="org.jboss.ws.jaxws-client" />
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/>
- <module name="org.apache.cxf" services="import">
+ <!-- do not import services from cxf, those need to come from jbossws -->
+ <module name="org.apache.cxf">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF/"/>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/jaxws-client/main/module.xml 2012-01-24 16:48:09 UTC (rev 15510)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/jaxws-client/main/module.xml 2012-01-24 22:13:42 UTC (rev 15511)
@@ -37,7 +37,8 @@
<module name="org.jboss.ws.spi" />
<module name="org.jboss.ws.common" />
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/>
- <module name="org.apache.cxf" services="import">
+ <!-- do not import services from cxf, those need to come from jbossws -->
+ <module name="org.apache.cxf">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF/"/>