Author: asoldano Date: 2014-04-02 10:35:26 -0400 (Wed, 02 Apr 2014) New Revision: 18560 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/wildfly800/org/apache/santuario/xmlsec/main/module.xml stack/cxf/branches/asoldano/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/pom.xml Log: - Adding jasypt to wss4j module - Adding jaxb dependency to xmlsec module - Fixing tests with embedded spring 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-02 08:40:23 UTC (rev 18559) +++ stack/cxf/branches/asoldano/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-04-02 14:35:26 UTC (rev 18560) @@ -56,6 +56,7 @@ <include>wsdl4j:wsdl4j:jar</include> <include>org.apache.ws.xmlschema:xmlschema-core:jar</include> <include>org.apache.wss4j:wss4j-*:jar</include> + <include>org.jasypt:jasypt: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-02 08:40:23 UTC (rev 18559) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml 2014-04-02 14:35:26 UTC (rev 18560) @@ -41,5 +41,7 @@ <module name="org.apache.commons.logging" /> <module name="org.apache.xalan" /> <module name="org.slf4j" /> + <module name="javax.xml.bind.api" services="import"/> + <module name="com.sun.xml.bind" services="import"/> </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-02 08:40:23 UTC (rev 18559) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/wildfly800/org/apache/santuario/xmlsec/main/module.xml 2014-04-02 14:35:26 UTC (rev 18560) @@ -41,5 +41,7 @@ <module name="org.apache.commons.logging" /> <module name="org.apache.xalan" /> <module name="org.slf4j" /> + <module name="javax.xml.bind.api" services="import"/> + <module name="com.sun.xml.bind" services="import"/> </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-02 08:40:23 UTC (rev 18559) +++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-04-02 14:35:26 UTC (rev 18560) @@ -110,6 +110,7 @@ <copy todir="@{targetdir}/org/apache/ws/security/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/wss4j-*.jar"/> + <include name="**/jasypt.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/apache/ws/xmlschema/main" flatten="false" overwrite="true"> @@ -232,6 +233,7 @@ <copy todir="@{targetdir}/org/apache/ws/security/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/wss4j-*.jar"/> + <include name="**/jasypt.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/apache/ws/xmlschema/main" flatten="false" overwrite="true"> Modified: stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/pom.xml 2014-04-02 08:40:23 UTC (rev 18559) +++ stack/cxf/branches/asoldano/modules/testsuite/cxf-tests/pom.xml 2014-04-02 14:35:26 UTC (rev 18560) @@ -155,6 +155,11 @@ <artifactId>spring-aop</artifactId> <version>${test.spring.version}</version> </artifactItem> + <artifactItem> + <groupId>org.springframework</groupId> + <artifactId>spring-asm</artifactId> + <version>${test.spring.version}</version> + </artifactItem> </artifactItems> <outputDirectory>target/spring</outputDirectory> </configuration>