Author: asoldano Date: 2014-06-25 09:22:17 -0400 (Wed, 25 Jun 2014) New Revision: 18764 Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml Log: [JBWS-3806] Updating org/jboss/as/webservices/main/module.xml to be in synch with wildfly master and reference the webservices subsystem Maven artifact. Enabling filtering in assembly plugin for relying on 'wildfly900.version' property, we'll have to use a more generic one later Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-06-25 13:12:21 UTC (rev 18763) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-06-25 13:22:17 UTC (rev 18764) @@ -18,6 +18,7 @@ <fileSet> <directory>../resources/src/main/resources/modules</directory> <outputDirectory>deploy-artifacts/modules</outputDirectory> + <filtered>true</filtered> <includes> <include>**/module.xml</include> </includes> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml 2014-06-25 13:12:21 UTC (rev 18763) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml 2014-06-25 13:22:17 UTC (rev 18764) @@ -22,12 +22,17 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices"> +<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.webservices"> <properties> <property name="jboss.api" value="private"/> </properties> + + <exports> + <exclude path="org/jboss/as/webservices/logging"/> + </exports> <resources> + <artifact name="org.wildfly:wildfly-webservices-server-integration:${wildfly900.version}"/> <!-- Insert resources here --> </resources> @@ -41,7 +46,10 @@ <module name="org.jboss.ejb3"/> <module name="org.jboss.invocation"/> <module name="org.jboss.jandex"/> - <module name="org.jboss.metadata"/> + <module name="org.jboss.metadata.common"/> + <module name="org.jboss.metadata.web"/> + <module name="org.jboss.metadata.ear"/> + <module name="org.jboss.metadata.ejb"/> <module name="org.jboss.staxmapper"/> <module name="org.jboss.as.controller"/> <module name="org.jboss.as.ejb3"/>