Author: asoldano Date: 2014-12-11 09:35:54 -0500 (Thu, 11 Dec 2014) New Revision: 19135 Modified: stack/cxf/branches/arquillian/ stack/cxf/branches/arquillian/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml Log: svn merge -r 19125:19126 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk . Property changes on: stack/cxf/branches/arquillian ___________________________________________________________________ Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/branches/jaspi:18054-18409 /stack/cxf/branches/ropalka:16301-16305,16966-17008 /stack/cxf/branches/ropalka_JBWS-3550:16747-16757 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/branches/jaspi:18054-18409 /stack/cxf/branches/ropalka:16301-16305,16966-17008 /stack/cxf/branches/ropalka_JBWS-3550:16747-16757 /stack/cxf/trunk:19126 Modified: stack/cxf/branches/arquillian/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/cxf/branches/arquillian/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml 2014-12-11 14:34:45 UTC (rev 19134) +++ stack/cxf/branches/arquillian/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml 2014-12-11 14:35:54 UTC (rev 19135) @@ -55,6 +55,7 @@ <module name="org.jboss.as.server"/> <module name="org.jboss.as.ee"/> <module name="org.jboss.as.naming"/> + <module name="org.jboss.as.network"/> <module name="org.jboss.as.security"/> <module name="org.wildfly.security.manager"/> <module name="org.jboss.as.web-common"/> @@ -68,5 +69,6 @@ <module name="org.jboss.ws.common" services="import" /> <module name="org.jboss.ws.spi" /> <module name="org.picketbox" /> + <module name="org.wildfly.extension.undertow" /> </dependencies> </module>