12:22 p.m.
Author: alessio.soldano(a)jboss.com
Date: 2008-05-29 06:22:54 -0400 (Thu, 29 May 2008)
New Revision: 7205
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2098] Adding required ws-security-related libraries
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2008-05-29 10:16:12 UTC (rev 7204)
+++ stack/cxf/trunk/modules/client/pom.xml 2008-05-29 10:22:54 UTC (rev 7205)
@@ -76,9 +76,17 @@
<artifactId>cxf-rt-ws-policy</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ </dependency>
+ <dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ </dependency>
<!--
useStrictFiltering requires dependency in all included modules
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2008-05-29 10:16:12 UTC (rev 7204)
+++ stack/cxf/trunk/modules/server/pom.xml 2008-05-29 10:22:54 UTC (rev 7205)
@@ -97,6 +97,10 @@
<artifactId>cxf-rt-ws-policy</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxrpc-api</artifactId>
</dependency>
@@ -104,6 +108,10 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ </dependency>
<!-- jboss provided -->
<dependency>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2008-05-29 10:16:12 UTC (rev 7204)
+++ stack/cxf/trunk/pom.xml 2008-05-29 10:22:54 UTC (rev 7205)
@@ -55,6 +55,7 @@
<juddi.service.version>1.2.0.GA</juddi.service.version>
<saaj.api.version>1.3</saaj.api.version>
<fastinfoset.api.version>1.2.2</fastinfoset.api.version>
+ <xmlsec.version>1.3.0</xmlsec.version>
</properties>
<!-- DependencyManagement -->
@@ -169,6 +170,11 @@
<!-- CXF dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
<version>${cxf.version}</version>
</dependency>
@@ -247,6 +253,11 @@
<artifactId>stax-api</artifactId>
<version>${cxf.stax.version}</version>
</dependency>
+ <dependency>
+ <groupId>xml-security</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>${xmlsec.version}</version>
+ </dependency>
<!-- jboss provided -->
<dependency>
Modified: stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-05-29 10:16:12 UTC (rev
7204)
+++ stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-05-29 10:22:54 UTC (rev
7205)
@@ -46,6 +46,7 @@
<include name="**/spring-core.jar"/>
<include name="**/stax-api.jar"/>
<include name="**/wsdl4j.jar"/>
+ <include name="**/wss4j.jar"/>
<include name="**/wstx.jar"/>
<include name="**/xml-resolver.jar"/>
<include name="**/XmlSchema.jar"/>
@@ -84,7 +85,9 @@
<include name="**/spring-context.jar"/>
<include name="**/spring-core.jar"/>
<include name="**/wsdl4j.jar"/>
+ <include name="**/wss4j.jar"/>
<include name="**/xml-resolver.jar"/>
+ <include name="**/xmlsec.jar"/>
<include name="**/XmlSchema.jar"/>
<include name="**/FastInfoset.jar"/>
</patternset>
@@ -380,4 +383,4 @@
</sequential>
</macrodef>
-</project>
\ No newline at end of file
+</project>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 10:16:12 UTC
(rev 7204)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 10:22:54 UTC
(rev 7205)
@@ -85,6 +85,8 @@
<include>*:xml-resolver:jar</include>
<include>*:XmlSchema:jar</include>
<include>*:FastInfoset:jar</include>
+ <include>*:wss4j:jar</include>
+ <include>*:xmlsec:jar</include>
</includes>
</dependencySet>
<dependencySet>