Author: asoldano
Date: 2015-05-13 06:23:20 -0400 (Wed, 13 May 2015)
New Revision: 19747
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml
stack/cxf/trunk/pom.xml
Log:
Synch WSS4J and Santuario with CXF
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml
===================================================================
---
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml 2015-05-12
12:48:31 UTC (rev 19746)
+++
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/jaxws-endpoint-config.xml 2015-05-13
10:23:20 UTC (rev 19747)
@@ -26,6 +26,10 @@
<property-value>true</property-value>
</property>
<property>
+ <property-name>ws-security.return.security.error</property-name>
+ <property-value>true</property-value>
+ </property>
+ <property>
<property-name>ws-security.callback-handler</property-name>
<property-value>org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback</property-value>
</property>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2015-05-12 12:48:31 UTC (rev 19746)
+++ stack/cxf/trunk/pom.xml 2015-05-13 10:23:20 UTC (rev 19747)
@@ -104,8 +104,8 @@
<jms.api.version>1.0.1.Final</jms.api.version>
<velocity.version>1.7</velocity.version>
<xerces.version>2.9.1</xerces.version>
- <xmlsec.version>2.0.3</xmlsec.version>
- <wss4j.version>2.0.3</wss4j.version>
+ <xmlsec.version>2.0.4</xmlsec.version>
+ <wss4j.version>2.0.4</wss4j.version>
<wstx.version>4.4.1</wstx.version>
<spring.version>3.2.8.RELEASE</spring.version>
<shrinkwrap.version>1.1.3</shrinkwrap.version>