[jbossws-commits] JBossWS SVN: r15831 - in stack/native/trunk/modules/resources/src/main/resources: modules/jboss700/org/apache/santuario and 9 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Sat Mar 3 04:05:50 EST 2012


Author: alessio.soldano at jboss.com
Date: 2012-03-03 04:05:48 -0500 (Sat, 03 Mar 2012)
New Revision: 15831

Added:
   stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/
   stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/
   stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/
   stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml
   stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/
   stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/
   stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/
   stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml
Removed:
   stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/xmlsec/
   stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/xmlsec/
Modified:
   stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml
   stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
   stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-3439] Moving org.apache.xmlsec module to org.apache.santuario.xmlsec to synch with AS7 and CXF stack now that both use Santuario 1.5.x


Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml	                        (rev 0)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml	2012-03-03 09:05:48 UTC (rev 15831)
@@ -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>

Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml	2012-03-02 16:34:12 UTC (rev 15830)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml	2012-03-03 09:05:48 UTC (rev 15831)
@@ -43,7 +43,7 @@
         <module name="javax.xml.ws.api" />
         <module name="org.picketbox"/>
         <module name="org.apache.xerces" services="import"/>
-        <module name="org.apache.xmlsec" optional="true"/>
+        <module name="org.apache.santuario.xmlsec" />
         <module name="org.apache.ws.commons.policy" optional="true"/>
         <module name="org.javassist" />
         <module name="org.codehaus.jettison" optional="true"/>

Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml	                        (rev 0)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml	2012-03-03 09:05:48 UTC (rev 15831)
@@ -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/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml	2012-03-02 16:34:12 UTC (rev 15830)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml	2012-03-03 09:05:48 UTC (rev 15831)
@@ -43,7 +43,7 @@
         <module name="javax.xml.ws.api" />
         <module name="org.picketbox"/>
         <module name="org.apache.xerces" services="import"/>
-        <module name="org.apache.xmlsec" optional="true"/>
+        <module name="org.apache.santuario.xmlsec" />
         <module name="org.apache.ws.commons.policy" optional="true"/>
         <module name="org.javassist" />
         <module name="org.codehaus.jettison" optional="true"/>

Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2012-03-02 16:34:12 UTC (rev 15830)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2012-03-03 09:05:48 UTC (rev 15831)
@@ -93,7 +93,7 @@
           <include name="**/wscommons-policy.jar"/>
         </fileset>
       </copy>
-      <copy todir="@{targetdir}/org/apache/xmlsec/main" flatten="false" overwrite="true">
+      <copy todir="@{targetdir}/org/apache/santuario/xmlsec/main" flatten="false" overwrite="true">
         <fileset dir="@{thirdpartydir}/lib">
           <include name="**/xmlsec.jar"/>
         </fileset>



More information about the jbossws-commits mailing list