Author: alessio.soldano(a)jboss.com Date: 2012-04-13 09:17:26 -0400 (Fri, 13 Apr 2012) New Revision: 16161 Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/opensaml/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/opensaml/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/opensaml/main/module.xml Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/ws/security/main/module.xml Log: [JBWS-3448][JBWS-3434] Adding opensaml module for jboss 7.0.x too as CXF-4212 is making opensaml a mandatory dependency in CXF 2.5.3 Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/ws/security/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/ws/security/main/module.xml 2012-04-13 11:54:57 UTC (rev 16160) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/ws/security/main/module.xml 2012-04-13 13:17:26 UTC (rev 16161) @@ -34,5 +34,10 @@ <module name="org.apache.commons.logging" /> <module name="org.apache.santuario.xmlsec" /> <module name="org.apache.xalan" /> + <!-- + Optional dependency on OpenSAML which is used by Apache WSS4J for providing WS-Trust / SAML functionalities; + the export="true" flag can be replaced by having additional org.opensaml dependency in org.apache.cxf module. + --> + <module name="org.opensaml" optional="true" export="true" /> </dependencies> </module> \ No newline at end of file Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/opensaml/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/opensaml/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/opensaml/main/module.xml 2012-04-13 13:17:26 UTC (rev 16161) @@ -0,0 +1,36 @@ +<?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.opensaml"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.slf4j"/> + <module name="org.apache.santuario.xmlsec"/> + </dependencies> +</module>