Author: richard.opalka(a)jboss.com Date: 2012-08-20 07:53:40 -0400 (Mon, 20 Aug 2012) New Revision: 16630 Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/jaxrpc-integration/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/jaxrpc-integration/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/xb/main/module.xml Log: sync with AS7 upstream Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/main/module.xml 2012-08-20 11:40:59 UTC (rev 16629) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/main/module.xml 2012-08-20 11:53:40 UTC (rev 16630) @@ -23,6 +23,9 @@ --> <module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices"> + <properties> + <property name="jboss.api" value="private"/> + </properties> <resources> <!-- Insert resources here --> @@ -41,8 +44,8 @@ <module name="org.jboss.metadata"/> <module name="org.jboss.staxmapper"/> <module name="org.jboss.as.controller"/> + <module name="org.jboss.as.ejb3"/> <module name="org.jboss.as.server"/> - <module name="org.jboss.as.ejb3"/> <module name="org.jboss.as.ee"/> <module name="org.jboss.as.naming"/> <module name="org.jboss.as.security"/> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml 2012-08-20 11:40:59 UTC (rev 16629) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml 2012-08-20 11:53:40 UTC (rev 16630) @@ -23,31 +23,68 @@ --> <module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices.server.integration"> + <properties> + <property name="jboss.api" value="private"/> + </properties> <resources> </resources> <dependencies> <module name="javax.api" export="true"/> + <module name="javax.jws.api" export="true"/> <module name="javax.wsdl4j.api" export="true"/> + <module name="javax.xml.ws.api" export="true"/> + <module name="com.sun.xml.bind" services="export" export="true"/> <module name="org.jboss.ws.api" export="true"/> <module name="org.jboss.ws.spi" export="true"/> <module name="org.jboss.ws.common" services="import" export="true"/> - <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true"> + <module name="org.jboss.ws.jaxws-client" services="export" export="true"> <imports> + <include path="META-INF/cxf"/> <include path="META-INF"/> - <include path="dtd"/> - <include path="schema"/> </imports> <exports> + <include path="META-INF/cxf"/> <include path="META-INF"/> - <include path="dtd"/> - <include path="schema"/> </exports> </module> - <module name="org.jboss.ws.native.jbossws-native-services" services="export" export="true"/> + <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" export="true"/> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" 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.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/> + <!-- Do not import services from cxf module directly, those need to come from jbossws --> + <module name="org.apache.cxf.impl" 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"/> + <module name="com.sun.xml.messaging.saaj" services="export" export="true"/> + <module name="org.apache.ws.security" export="true"/> + <module name="org.apache.santuario.xmlsec" export="true"/> + <module name="org.springframework.spring" optional="true" export="true"> + <imports> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF"/> + </exports> + </module> </dependencies> - </module> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml =================================================================== (Binary files differ) Property changes on: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml 2012-08-20 11:40:59 UTC (rev 16629) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/api/main/module.xml 2012-08-20 11:53:40 UTC (rev 16630) @@ -34,5 +34,7 @@ <module name="javax.xml.ws.api"/> <module name="org.jboss.logging"/> <module name="org.jboss.modules"/> + <module name="org.jboss.ws.jaxws-client" services="import"/> </dependencies> + </module> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/main/module.xml 2012-08-20 11:40:59 UTC (rev 16629) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/common/main/module.xml 2012-08-20 11:53:40 UTC (rev 16630) @@ -24,6 +24,10 @@ <module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.common"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + <resources> <!-- Insert resources here --> </resources> @@ -42,5 +46,6 @@ <module name="org.jboss.logging"/> <module name="org.jboss.common-core"/> <module name="org.apache.xerces" services="import"/> + <module name="org.jboss.jaxbintros"/> </dependencies> </module> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-08-20 11:40:59 UTC (rev 16629) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-08-20 11:53:40 UTC (rev 16630) @@ -24,6 +24,10 @@ <module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.native.jbossws-native-core"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + <resources> <!-- Insert resources here --> </resources> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/main/module.xml 2012-08-20 11:40:59 UTC (rev 16629) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/native/jbossws-native-services/main/module.xml 2012-08-20 11:53:40 UTC (rev 16630) @@ -24,11 +24,11 @@ <module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.native.jbossws-native-services"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + <resources> <!-- Insert resources here --> </resources> - - <dependencies> - - </dependencies> </module> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/main/module.xml 2012-08-20 11:40:59 UTC (rev 16629) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/spi/main/module.xml 2012-08-20 11:53:40 UTC (rev 16630) @@ -24,6 +24,10 @@ <module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.spi"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + <resources> <!-- Insert resources here --> </resources> Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/xb/main/module.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/xb/main/module.xml 2012-08-20 11:40:59 UTC (rev 16629) +++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/xb/main/module.xml 2012-08-20 11:53:40 UTC (rev 16630) @@ -23,6 +23,9 @@ --> <module xmlns="urn:jboss:module:1.1" name="org.jboss.xb"> + <properties> + <property name="jboss.api" value="private"/> + </properties> <resources> <!-- Insert resources here -->