Author: alessio.soldano(a)jboss.com Date: 2012-02-16 09:10:16 -0500 (Thu, 16 Feb 2012) New Revision: 15671 Added: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml Removed: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: Merged revisions 15668 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15668 | alessio.soldano(a)jboss.com | 2012-02-16 14:52:45 +0100 (Thu, 16 Feb 2012) | 2 lines [JBWS-3436] Setting explicit dependency versions for xmlsec and wss4j; adding module.xml for xmlsec ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658 + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668 Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668 Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml 2012-02-16 13:52:45 UTC (rev 15668) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml 2012-02-16 14:10:16 UTC (rev 15671) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2012, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.0" name="org.apache.santuario.xmlsec"> - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="javax.api" /> - <module name="org.apache.commons.logging" /> - <module name="org.apache.xalan" /> - </dependencies> -</module> Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml (from rev 15668, stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml 2012-02-16 14:10:16 UTC (rev 15671) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2012, Red Hat, Inc., and individual contributors + ~ as indicated by the @author tags. See the copyright.txt file in the + ~ distribution for a full listing of individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<module xmlns="urn:jboss:module:1.0" name="org.apache.santuario.xmlsec"> + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="org.apache.commons.logging" /> + <module name="org.apache.xalan" /> + </dependencies> +</module> Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml 2012-02-16 13:52:45 UTC (rev 15668) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml 2012-02-16 14:10:16 UTC (rev 15671) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2012, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="org.apache.santuario.xmlsec"> - <properties> - <property name="jboss.api" value="private"/> - </properties> - - <resources> - <!-- Insert resources here --> - </resources> - - <dependencies> - <module name="javax.api" /> - <module name="org.apache.commons.logging" /> - <module name="org.apache.xalan" /> - </dependencies> -</module> Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml (from rev 15668, stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml 2012-02-16 14:10:16 UTC (rev 15671) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2012, Red Hat, Inc., and individual contributors + ~ as indicated by the @author tags. See the copyright.txt file in the + ~ distribution for a full listing of individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.apache.santuario.xmlsec"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="org.apache.commons.logging" /> + <module name="org.apache.xalan" /> + </dependencies> +</module> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-02-16 14:04:49 UTC (rev 15670) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-02-16 14:10:16 UTC (rev 15671) @@ -113,6 +113,11 @@ <include name="**/neethi.jar"/> </fileset> </copy> + <copy todir="@{targetdir}/org/apache/santuario/xmlsec/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/xmlsec.jar"/> + </fileset> + </copy> <copy todir="@{targetdir}/org/apache/ws/security/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/wss4j.jar"/> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-02-16 14:04:49 UTC (rev 15670) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-02-16 14:10:16 UTC (rev 15671) @@ -104,6 +104,7 @@ <velocity.version>1.5</velocity.version> <xerces.version>2.9.1</xerces.version> <xmlsec.version>1.4.5</xmlsec.version> + <wss4j.version>1.6.4</wss4j.version> <wstx.version>3.2.9</wstx.version> <spring.version>3.0.6.RELEASE</spring.version> </properties> @@ -957,6 +958,11 @@ <version>${xmlsec.version}</version> </dependency> <dependency> + <groupId>org.apache.ws.security</groupId> + <artifactId>wss4j</artifactId> + <version>${wss4j.version}</version> + </dependency> + <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-lgpl</artifactId> <version>${wstx.version}</version>