Author: alessio.soldano(a)jboss.com Date: 2012-02-17 11:35:03 -0500 (Fri, 17 Feb 2012) New Revision: 15688 Modified: stack/cxf/trunk/modules/dist/pom.xml 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/modules-deploy.conf stack/cxf/trunk/pom.xml Log: [JBWS-3434] Making OpenSAML maven dependency provided and keeping it just for creating the AS module. Only keep an optional dependency to org.opensaml module in org.apache.ws.security (wss4j) module, as OpenSAML is not going to be shipped in AS7 and is required for WSS4J SAML/WS-Trust functionalities only. Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2012-02-17 14:48:07 UTC (rev 15687) +++ stack/cxf/trunk/modules/dist/pom.xml 2012-02-17 16:35:03 UTC (rev 15688) @@ -129,7 +129,14 @@ <scope>provided</scope> </dependency> + <!-- OpenSAML --> <dependency> + <groupId>org.opensaml</groupId> + <artifactId>opensaml</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss700</artifactId> <scope>provided</scope> 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-17 14:48:07 UTC (rev 15687) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-17 16:35:03 UTC (rev 15688) @@ -47,9 +47,6 @@ <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> @@ -78,6 +75,9 @@ <include>org.jboss.jaxr:juddi-service:sar</include> <include>apache-scout:scout:jar</include> <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-jboss700:jar</include> <include>org.jboss.ws:jbossws-jboss701: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-17 14:48:07 UTC (rev 15687) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-02-17 16:35:03 UTC (rev 15688) @@ -49,7 +49,6 @@ <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-17 14:48:07 UTC (rev 15687) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml 2012-02-17 16:35:03 UTC (rev 15688) @@ -2,7 +2,7 @@ <!-- ~ JBoss, Home of Professional Open Source. - ~ Copyright 2011, Red Hat, Inc., and individual contributors + ~ 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. ~ @@ -34,6 +34,10 @@ <module name="org.apache.commons.logging" /> <module name="org.apache.santuario.xmlsec" /> <module name="org.apache.xalan" /> - <module name="org.opensaml" /> + <!-- + 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> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2012-02-17 14:48:07 UTC (rev 15687) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2012-02-17 16:35:03 UTC (rev 15688) @@ -1 +1 @@ -org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/springframework/spring/** \ No newline at end of file +org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/opensaml/**, org/springframework/spring/** \ No newline at end of file Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-02-17 14:48:07 UTC (rev 15687) +++ stack/cxf/trunk/pom.xml 2012-02-17 16:35:03 UTC (rev 15688) @@ -98,6 +98,7 @@ <log4j.version>1.2.14</log4j.version> <mail.version>1.4.2</mail.version> <neethi.version>3.0.1</neethi.version> + <opensaml.version>2.5.1-1</opensaml.version> <saaj.api.version>1.0.0.Final</saaj.api.version> <stax.api.version>1.0-2</stax.api.version> <jms.api.version>1.0.0.Final</jms.api.version> @@ -966,6 +967,12 @@ <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> @@ -982,6 +989,82 @@ <artifactId>httpserver</artifactId> <version>${httpserver.version}</version> </dependency> + <dependency> + <groupId>org.opensaml</groupId> + <artifactId>opensaml</artifactId> + <version>${opensaml.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + <exclusion> + <groupId>org.owasp.esapi</groupId> + <artifactId>esapi</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jul-to-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-ext-jdk15</artifactId> + </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15</artifactId> + </exclusion> + <exclusion> + <groupId>ca.juliusdavies</groupId> + <artifactId>not-yet-commons-ssl</artifactId> + </exclusion> + <exclusion> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>xml-resolver</groupId> + <artifactId>xml-resolver</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> <!-- Spring --> <dependency> <groupId>org.springframework</groupId>