12:27 p.m.
Author: alessio.soldano(a)jboss.com
Date: 2012-02-14 06:27:29 -0500 (Tue, 14 Feb 2012)
New Revision: 15647
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/opensaml/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/opensaml/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/opensaml/main/module.xml
Removed:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/opensaml/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/opensaml/main/module.xml
Modified:
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-3434] Adding OpenSaml (related) dependencies and module
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-14
11:25:15 UTC (rev 15646)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-14
11:27:29 UTC (rev 15647)
@@ -47,6 +47,9 @@
<include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
<include>org.apache.ws.security:wss4j:jar</include>
<include>org.apache.santuario:xmlsec:jar</include>
+ <include>org.opensaml:open*:jar</include>
+ <include>org.opensaml:xmltooling:jar</include>
+ <include>joda-time:joda-time:jar</include>
<include>asm:asm:jar</include>
<include>apache-velocity:velocity:jar</include>
<include>commons-collections:commons-collections:jar</include>
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-02-14
11:25:15 UTC (rev 15646)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-02-14
11:27:29 UTC (rev 15647)
@@ -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.opensaml" />
<module name="org.springframework.spring"
optional="true"/>
</dependencies>
</module>
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml 2012-02-14
11:25:15 UTC (rev 15646)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml 2012-02-14
11:27:29 UTC (rev 15647)
@@ -34,5 +34,6 @@
<module name="org.apache.commons.logging" />
<module name="org.apache.santuario.xmlsec" />
<module name="org.apache.xalan" />
+ <module name="org.opensaml" />
</dependencies>
</module>
Deleted:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/opensaml/main/module.xml
===================================================================
---
stack/cxf/branches/wstrust/modules/resources/src/main/resources/modules/jboss710/org/opensaml/main/module.xml 2012-02-09
15:55:06 UTC (rev 15624)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/opensaml/main/module.xml 2012-02-14
11:27:29 UTC (rev 15647)
@@ -1,36 +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.opensaml">
-
- <resources>
- <!-- Insert resources here -->
- </resources>
-
- <dependencies>
- <module name="javax.api"/>
- <module name="org.slf4j"/>
- <module name="org.apache.santuario.xmlsec"/>
- </dependencies>
-</module>
Copied:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/opensaml/main/module.xml
(from rev 15624,
stack/cxf/branches/wstrust/modules/resources/src/main/resources/modules/jboss710/org/opensaml/main/module.xml)
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/opensaml/main/module.xml
(rev 0)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/opensaml/main/module.xml 2012-02-14
11:27:29 UTC (rev 15647)
@@ -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.1" 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>
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-02-14
11:25:15 UTC (rev 15646)
+++
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-02-14
11:27:29 UTC (rev 15647)
@@ -123,6 +123,14 @@
<include name="**/xmlschema-core.jar"/>
</fileset>
</copy>
+ <copy todir="@{targetdir}/org/opensaml/main" flatten="false"
overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/opensaml.jar"/>
+ <include name="**/openws.jar"/>
+ <include name="**/joda-time.jar"/>
+ <include name="**/xmltooling.jar"/>
+ </fileset>
+ </copy>
<copy todir="@{targetdir}/org/jboss/as/webservices/main"
flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jbossws-cxf-resources.jar"/>