Author: asoldano Date: 2014-04-01 12:07:32 -0400 (Tue, 01 Apr 2014) New Revision: 18557 Modified: stack/cxf/branches/asoldano/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/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/santuario/xmlsec/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 stack/cxf/branches/asoldano/modules/resources/src/main/resources/resources/modules-deploy.conf Log: Fixing the wss4j and xmlsec modules to let the AS boot with the new stack Modified: stack/cxf/branches/asoldano/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/asoldano/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-04-01 14:45:25 UTC (rev 18556) +++ stack/cxf/branches/asoldano/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-04-01 16:07:32 UTC (rev 18557) @@ -55,7 +55,7 @@ <include>org.apache.neethi:neethi:jar</include> <include>wsdl4j:wsdl4j:jar</include> <include>org.apache.ws.xmlschema:xmlschema-core:jar</include> - <include>org.apache.ws.security:wss4j:jar</include> + <include>org.apache.wss4j:wss4j-*:jar</include> <include>org.apache.santuario:xmlsec:jar</include> <include>asm:asm:jar</include> <include>org.apache.velocity:velocity:jar</include> Modified: stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml =================================================================== --- stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml 2014-04-01 14:45:25 UTC (rev 18556) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml 2014-04-01 16:07:32 UTC (rev 18557) @@ -40,5 +40,6 @@ <module name="javax.api" /> <module name="org.apache.commons.logging" /> <module name="org.apache.xalan" /> + <module name="org.slf4j" /> </dependencies> </module> 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 14:45:25 UTC (rev 18556) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/ws/security/main/module.xml 2014-04-01 16:07:32 UTC (rev 18557) @@ -35,5 +35,6 @@ <module name="org.apache.xalan" /> <module name="org.joda.time" /> <module name="org.opensaml" /> + <module name="org.slf4j" /> </dependencies> </module> Modified: stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/santuario/xmlsec/main/module.xml =================================================================== --- stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/santuario/xmlsec/main/module.xml 2014-04-01 14:45:25 UTC (rev 18556) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/santuario/xmlsec/main/module.xml 2014-04-01 16:07:32 UTC (rev 18557) @@ -40,5 +40,6 @@ <module name="javax.api" /> <module name="org.apache.commons.logging" /> <module name="org.apache.xalan" /> + <module name="org.slf4j" /> </dependencies> </module> 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 14:45:25 UTC (rev 18556) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/ws/security/main/module.xml 2014-04-01 16:07:32 UTC (rev 18557) @@ -35,5 +35,6 @@ <module name="org.apache.xalan" /> <module name="org.joda.time" /> <module name="org.opensaml" /> + <module name="org.slf4j" /> </dependencies> </module> 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 14:45:25 UTC (rev 18556) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-04-01 16:07:32 UTC (rev 18557) @@ -109,7 +109,7 @@ </copy> <copy todir="@{targetdir}/org/apache/ws/security/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/wss4j.jar"/> + <include name="**/wss4j-*.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/apache/ws/xmlschema/main" flatten="false" overwrite="true"> @@ -231,7 +231,7 @@ </copy> <copy todir="@{targetdir}/org/apache/ws/security/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> - <include name="**/wss4j.jar"/> + <include name="**/wss4j-*.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/apache/ws/xmlschema/main" flatten="false" overwrite="true"> Modified: stack/cxf/branches/asoldano/modules/resources/src/main/resources/resources/modules-deploy.conf =================================================================== --- stack/cxf/branches/asoldano/modules/resources/src/main/resources/resources/modules-deploy.conf 2014-04-01 14:45:25 UTC (rev 18556) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/resources/modules-deploy.conf 2014-04-01 16:07:32 UTC (rev 18557) @@ -1 +1 @@ -org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/jaxws-undertow-httpspi/**,org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/opensaml/**, org/springframework/spring/**, org/jboss/ws/native/** +org/apache/cxf/**, org/apache/ws/security/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/jaxws-undertow-httpspi/**,org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/opensaml/**, org/springframework/spring/**, org/jboss/ws/native/**