Author: asoldano Date: 2014-04-02 04:40:23 -0400 (Wed, 02 Apr 2014) New Revision: 18559 Modified: stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/main/module.xml stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/ws/security/main/module.xml stack/cxf/branches/asoldano/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: - Adding neethi dependency in wss4j module - Adding woodstox dependency in cxf impl module - Moving cxf-core.jar in cxf api module for now Modified: stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml =================================================================== --- stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml 2014-04-01 16:34:52 UTC (rev 18558) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml 2014-04-02 08:40:23 UTC (rev 18559) @@ -49,6 +49,7 @@ <module name="org.apache.ws.xmlschema" /> <module name="org.apache.ws.security" /> <module name="org.apache.santuario.xmlsec" /> + <module name="org.codehaus.woodstox" /> <module name="org.joda.time" /> <module name="org.opensaml" /> <module name="org.springframework.spring" optional="true"> Modified: stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml 2014-04-01 16:34:52 UTC (rev 18558) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml 2014-04-02 08:40:23 UTC (rev 18559) @@ -38,10 +38,15 @@ <module name="asm.asm" /> <module name="javax.api" /> <module name="javax.annotation.api" /> + <module name="javax.jws.api" /> <module name="javax.mail.api" /> + <module name="javax.resource.api" /> <module name="javax.wsdl4j.api" /> <module name="javax.xml.bind.api" services="import"/> <module name="com.sun.xml.bind" services="import"/> + <module name="javax.xml.soap.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.ws.api" /> <module name="org.apache.neethi" /> <module name="org.apache.ws.xmlschema" /> <module name="org.codehaus.woodstox" /> Modified: stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/main/module.xml =================================================================== --- stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/main/module.xml 2014-04-01 16:34:52 UTC (rev 18558) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/main/module.xml 2014-04-02 08:40:23 UTC (rev 18559) @@ -31,6 +31,7 @@ <module name="javax.api" /> <module name="javax.xml.rpc.api" /> <module name="org.apache.commons.logging" /> + <module name="org.apache.neethi" /> <module name="org.apache.santuario.xmlsec" /> <module name="org.apache.xalan" /> <module name="org.joda.time" /> Modified: stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml =================================================================== --- stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml 2014-04-01 16:34:52 UTC (rev 18558) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml 2014-04-02 08:40:23 UTC (rev 18559) @@ -49,6 +49,7 @@ <module name="org.apache.ws.xmlschema" /> <module name="org.apache.ws.security" /> <module name="org.apache.santuario.xmlsec" /> + <module name="org.codehaus.woodstox" /> <module name="org.joda.time" /> <module name="org.opensaml" /> <module name="org.springframework.spring" optional="true"> Modified: stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml 2014-04-01 16:34:52 UTC (rev 18558) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml 2014-04-02 08:40:23 UTC (rev 18559) @@ -38,10 +38,15 @@ <module name="asm.asm" /> <module name="javax.api" /> <module name="javax.annotation.api" /> + <module name="javax.jws.api" /> <module name="javax.mail.api" /> + <module name="javax.resource.api" /> <module name="javax.wsdl4j.api" /> <module name="javax.xml.bind.api" services="import"/> <module name="com.sun.xml.bind" services="import"/> + <module name="javax.xml.soap.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.ws.api" /> <module name="com.sun.xml.fastinfoset"/> <module name="org.apache.neethi" /> <module name="org.apache.ws.xmlschema" /> Modified: stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/ws/security/main/module.xml =================================================================== --- stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/ws/security/main/module.xml 2014-04-01 16:34:52 UTC (rev 18558) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/ws/security/main/module.xml 2014-04-02 08:40:23 UTC (rev 18559) @@ -31,6 +31,7 @@ <module name="javax.api" /> <module name="javax.xml.rpc.api" /> <module name="org.apache.commons.logging" /> + <module name="org.apache.neethi" /> <module name="org.apache.santuario.xmlsec" /> <module name="org.apache.xalan" /> <module name="org.joda.time" /> Modified: stack/cxf/branches/asoldano/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/asoldano/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-04-01 16:34:52 UTC (rev 18558) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-04-02 08:40:23 UTC (rev 18559) @@ -68,13 +68,13 @@ </copy> <copy todir="@{targetdir}/org/apache/cxf/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/cxf-api*.jar"/> + <include name="**/cxf-core*.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/apache/cxf/impl/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/cxf-*.jar"/> - <exclude name="**/cxf-api*.jar"/> + <exclude name="**/cxf-core*.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/jboss/ws/api/main" flatten="false" overwrite="true"> @@ -190,13 +190,13 @@ </copy> <copy todir="@{targetdir}/org/apache/cxf/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/cxf-api*.jar"/> + <include name="**/cxf-core*.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/apache/cxf/impl/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/cxf-*.jar"/> - <exclude name="**/cxf-api*.jar"/> + <exclude name="**/cxf-core*.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/jboss/ws/api/main" flatten="false" overwrite="true">