Author: alessio.soldano(a)jboss.com Date: 2013-06-19 08:03:48 -0400 (Wed, 19 Jun 2013) New Revision: 17711 Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml Log: [JBWS-3650] Misc fixes on module dependencies; import META-INF from spring module, move META-INF and META-INF/cxf import of cxf api module from AS server integration module to cxf impl module (to work for client side too), remove trailing slash in META-INF/ imports which makes the import ineffective. Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -52,7 +52,20 @@ <module name="org.apache.santuario.xmlsec" /> <module name="org.joda.time" /> <module name="org.opensaml" /> - <module name="org.springframework.spring" optional="true"/> - <module name="org.apache.cxf" export="true"/> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> + <module name="org.apache.cxf" export="true"> + <imports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </exports> + </module> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -32,7 +32,7 @@ <module name="org.apache.cxf.impl" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="asm.asm" /> @@ -45,6 +45,10 @@ <module name="org.apache.neethi" /> <module name="org.apache.ws.xmlschema" /> <module name="org.codehaus.woodstox" /> - <module name="org.springframework.spring" optional="true" /> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -79,16 +79,6 @@ <include path="META-INF"/> </exports> </module> - <module name="org.apache.cxf" export="true"> - <imports> - <include path="META-INF/cxf"/> - <include path="META-INF"/> - </imports> - <exports> - <include path="META-INF/cxf"/> - <include path="META-INF"/> - </exports> - </module> <module name="org.apache.xalan" services="export" export="true"/> <module name="org.apache.xerces" services="export" export="true"/> <module name="org.jboss.as.webservices" services="export" export="true"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -45,25 +45,29 @@ <module name="org.apache.cxf.impl"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.common-core" /> <module name="org.jboss.logging" /> <module name="org.apache.ws.security" /> <module name="org.picketbox" /> - <module name="org.springframework.spring" optional="true" /> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -37,7 +37,7 @@ <module name="org.apache.cxf.impl" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.com.sun.httpserver"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -34,7 +34,7 @@ <module name="org.apache.cxf.impl" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> </dependencies> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -42,26 +42,30 @@ <module name="org.apache.cxf.impl"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.apache.log4j" /> <module name="org.apache.neethi" /> <module name="org.apache.ws.security" /> <module name="org.jboss.logging" /> - <module name="org.springframework.spring" optional="true" /> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> <module name="javax.wsdl4j.api" /> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -51,7 +51,20 @@ <module name="org.apache.santuario.xmlsec" /> <module name="org.joda.time" /> <module name="org.opensaml" /> - <module name="org.springframework.spring" optional="true"/> - <module name="org.apache.cxf" export="true"/> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> + <module name="org.apache.cxf" export="true"> + <imports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </exports> + </module> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -32,7 +32,7 @@ <module name="org.apache.cxf.impl" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="asm.asm" /> @@ -45,6 +45,10 @@ <module name="org.apache.neethi" /> <module name="org.apache.ws.xmlschema" /> <module name="org.codehaus.woodstox" /> - <module name="org.springframework.spring" optional="true" /> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -82,16 +82,6 @@ <include path="META-INF"/> </exports> </module> - <module name="org.apache.cxf" export="true"> - <imports> - <include path="META-INF/cxf"/> - <include path="META-INF"/> - </imports> - <exports> - <include path="META-INF/cxf"/> - <include path="META-INF"/> - </exports> - </module> <module name="org.apache.xalan" services="export" export="true"/> <module name="org.apache.xerces" services="export" export="true"/> <module name="org.jboss.as.webservices" services="export" export="true"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -49,25 +49,29 @@ <module name="org.apache.cxf.impl"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.common-core" /> <module name="org.jboss.logging" /> <module name="org.apache.ws.security" /> <module name="org.picketbox" /> - <module name="org.springframework.spring" optional="true" /> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -41,7 +41,7 @@ <module name="org.apache.cxf.impl" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.com.sun.httpserver"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -38,7 +38,7 @@ <module name="org.apache.cxf.impl" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> </dependencies> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -46,26 +46,30 @@ <module name="org.apache.cxf.impl"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.apache.log4j" /> <module name="org.apache.neethi" /> <module name="org.apache.ws.security" /> <module name="org.jboss.logging" /> - <module name="org.springframework.spring" optional="true" /> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> <module name="javax.wsdl4j.api" /> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -51,7 +51,20 @@ <module name="org.apache.santuario.xmlsec" /> <module name="org.joda.time" /> <module name="org.opensaml" /> - <module name="org.springframework.spring" optional="true"/> - <module name="org.apache.cxf" export="true"/> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> + <module name="org.apache.cxf" export="true"> + <imports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </exports> + </module> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -32,7 +32,7 @@ <module name="org.apache.cxf.impl" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="asm.asm" /> @@ -46,6 +46,10 @@ <module name="org.apache.neethi" /> <module name="org.apache.ws.xmlschema" /> <module name="org.codehaus.woodstox" /> - <module name="org.springframework.spring" optional="true" /> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -82,16 +82,6 @@ <include path="META-INF"/> </exports> </module> - <module name="org.apache.cxf" export="true"> - <imports> - <include path="META-INF/cxf"/> - <include path="META-INF"/> - </imports> - <exports> - <include path="META-INF/cxf"/> - <include path="META-INF"/> - </exports> - </module> <module name="org.apache.xalan" services="export" export="true"/> <module name="org.apache.xerces" services="export" export="true"/> <module name="org.jboss.as.webservices" services="export" export="true"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -49,25 +49,29 @@ <module name="org.apache.cxf.impl"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.common-core" /> <module name="org.jboss.logging" /> <module name="org.apache.ws.security" /> <module name="org.picketbox" /> - <module name="org.springframework.spring" optional="true" /> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -41,7 +41,7 @@ <module name="org.apache.cxf.impl" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.com.sun.httpserver"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -38,7 +38,7 @@ <module name="org.apache.cxf.impl" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> </dependencies> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711) @@ -46,26 +46,30 @@ <module name="org.apache.cxf.impl"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import"> <imports> <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> - <include path="META-INF/"/> + <include path="META-INF"/> </imports> </module> <module name="org.apache.log4j" /> <module name="org.apache.neethi" /> <module name="org.apache.ws.security" /> <module name="org.jboss.logging" /> - <module name="org.springframework.spring" optional="true" /> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> <module name="javax.wsdl4j.api" /> </dependencies> </module>