Author: richard.opalka(a)jboss.com
Date: 2011-03-09 06:17:10 -0500 (Wed, 09 Mar 2011)
New Revision: 13873
Added:
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/xmlsec/
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml
Modified:
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/branches/ropalka/modules/testsuite/pom.xml
Log:
[JBWS-3216] adding apache xmlsecurity to the CP
Added:
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml
===================================================================
---
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml
(rev 0)
+++
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/xmlsec/main/module.xml 2011-03-09
11:17:10 UTC (rev 13873)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, 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.xmlsec">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.slf4j.jcl-over-slf4j"/>
+ </dependencies>
+
+</module>
Modified:
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
===================================================================
---
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-09
11:16:13 UTC (rev 13872)
+++
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-09
11:17:10 UTC (rev 13873)
@@ -53,11 +53,11 @@
<module name="org.jboss.ws.native.jbossws-native-factories"
services="import"/>
<module name="org.jboss.ws.native.jbossws-native-services"
services="import"/>
<module name="org.jboss.ws.native.jbossws-native-core"
services="import">
- <module name="org.jboss.ws.jaxws-client"
services="import"/>
<imports>
<include path="META-INF"/>
</imports>
</module>
+ <module name="org.jboss.ws.jaxws-client"
services="import"/>
<module name="org.jboss.ws.spi" />
</dependencies>
</module>
Modified:
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
---
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-03-09
11:16:13 UTC (rev 13872)
+++
stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-03-09
11:17:10 UTC (rev 13873)
@@ -40,6 +40,7 @@
<module name="javax.xml.ws.api" />
<module name="org.picketbox"/>
<module name="org.apache.xerces" services="import"/>
+ <module name="org.apache.xmlsec"/>
<module name="org.apache.ws.commons.policy"/>
<module name="org.javassist" />
<module name="org.jboss.netty" />
Modified:
stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
---
stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-09
11:16:13 UTC (rev 13872)
+++
stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-09
11:17:10 UTC (rev 13873)
@@ -324,6 +324,11 @@
<include name="**/wscommons-policy.jar"/>
</fileset>
</copy>
+ <copy todir="@{targetdir}/org/apache/xmlsec/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/xmlsec.jar"/>
+ </fileset>
+ </copy>
<copy todir="@{targetdir}/org/jboss/ws/common/main"
flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jbossws-common.jar"/>
Modified: stack/native/branches/ropalka/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-09 11:16:13 UTC (rev
13872)
+++ stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-09 11:17:10 UTC (rev
13873)
@@ -775,6 +775,7 @@
<exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2011/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2183/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws2218/**</exclude>