[jbossws-commits] JBossWS SVN: r16226 - in stack/cxf/trunk: modules/dist/src/main/scripts and 7 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Apr 30 06:24:10 EDT 2012
Author: alessio.soldano at jboss.com
Date: 2012-04-30 06:24:10 -0400 (Mon, 30 Apr 2012)
New Revision: 16226
Modified:
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/cxf/main/module.xml
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/opensaml/main/module.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/modules/jboss710/org/opensaml/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/pom.xml
Log:
[JBWS-3434] Moving back OpenSAML dependency to compile scope, removing joda-time from opensaml module (already available on AS7), fixing other modules' dependencies accordingly
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-04-27 15:58:41 UTC (rev 16225)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-04-30 10:24:10 UTC (rev 16226)
@@ -83,7 +83,6 @@
<include>juddi:juddi:jar</include>
<include>org.opensaml:open*:jar</include>
<include>org.opensaml:xmltooling:jar</include>
- <include>joda-time:joda-time:jar</include>
<include>org.jboss.ws:jbossws-common-tools:jar</include>
<include>org.jboss.ws:jbossws-jboss*:jar</include>
<include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/cxf/main/module.xml 2012-04-27 15:58:41 UTC (rev 16225)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/cxf/main/module.xml 2012-04-30 10:24:10 UTC (rev 16226)
@@ -49,6 +49,8 @@
<module name="org.apache.ws.xmlschema" />
<module name="org.apache.ws.security" />
<module name="org.apache.santuario.xmlsec" />
+ <module name="org.joda.time" />
+ <module name="org.opensaml" />
<module name="org.springframework.spring" optional="true"/>
</dependencies>
</module>
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-27 15:58:41 UTC (rev 16225)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/ws/security/main/module.xml 2012-04-30 10:24:10 UTC (rev 16226)
@@ -34,10 +34,7 @@
<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" />
+ <module name="org.joda.time" />
+ <module name="org.opensaml" />
</dependencies>
</module>
\ No newline at end of file
Modified: 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 2012-04-27 15:58:41 UTC (rev 16225)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss700/org/opensaml/main/module.xml 2012-04-30 10:24:10 UTC (rev 16226)
@@ -32,5 +32,6 @@
<module name="javax.api"/>
<module name="org.slf4j"/>
<module name="org.apache.santuario.xmlsec"/>
+ <module name="org.joda.time"/>
</dependencies>
</module>
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-04-27 15:58:41 UTC (rev 16225)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-04-30 10:24:10 UTC (rev 16226)
@@ -50,6 +50,8 @@
<module name="org.apache.ws.xmlschema" />
<module name="org.apache.ws.security" />
<module name="org.apache.santuario.xmlsec" />
+ <module name="org.joda.time" />
+ <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-04-27 15:58:41 UTC (rev 16225)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml 2012-04-30 10:24:10 UTC (rev 16226)
@@ -34,10 +34,7 @@
<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" />
+ <module name="org.joda.time" />
+ <module name="org.opensaml" />
</dependencies>
</module>
Modified: stack/cxf/trunk/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 2012-04-27 15:58:41 UTC (rev 16225)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/opensaml/main/module.xml 2012-04-30 10:24:10 UTC (rev 16226)
@@ -32,5 +32,6 @@
<module name="javax.api"/>
<module name="org.slf4j"/>
<module name="org.apache.santuario.xmlsec"/>
+ <module name="org.joda.time"/>
</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-04-27 15:58:41 UTC (rev 16225)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-04-30 10:24:10 UTC (rev 16226)
@@ -142,7 +142,6 @@
<fileset dir="@{thirdpartydir}/lib">
<include name="**/opensaml.jar"/>
<include name="**/openws.jar"/>
- <include name="**/joda-time.jar"/>
<include name="**/xmltooling.jar"/>
</fileset>
</copy>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-04-27 15:58:41 UTC (rev 16225)
+++ stack/cxf/trunk/pom.xml 2012-04-30 10:24:10 UTC (rev 16226)
@@ -968,12 +968,6 @@
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
<version>${wss4j.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.opensaml</groupId>
- <artifactId>opensaml</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
@@ -994,7 +988,6 @@
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
<version>${opensaml.version}</version>
- <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>velocity</groupId>
More information about the jbossws-commits
mailing list