You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/12/23 18:11:47 UTC
[3/3] cxf git commit: Fixing backmerge
Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d704868a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d704868a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d704868a
Branch: refs/heads/3.0.x-fixes
Commit: d704868a70819dd5f7375140f0a44b1c29dd6f39
Parents: 5f597d5
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Dec 23 17:11:32 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Dec 23 17:11:32 2015 +0000
----------------------------------------------------------------------
.../test/resources/org/apache/cxf/systest/ws/fault/client.xml | 6 +++---
.../test/resources/org/apache/cxf/systest/ws/fault/server.xml | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d704868a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml
index 7b8fbe8..d80ac42 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml
@@ -40,9 +40,9 @@
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSoap12MtomPort" createdFromAPI="true">
<jaxws:properties>
- <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
- <entry key="security.encryption.properties" value="bob.properties"/>
- <entry key="security.encryption.username" value="bob"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties" value="bob.properties"/>
+ <entry key="ws-security.encryption.username" value="bob"/>
<entry key="mtom-enabled" value="true"/>
</jaxws:properties>
</jaxws:client>
http://git-wip-us.apache.org/repos/asf/cxf/blob/d704868a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
index e696e9b..eded603 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
@@ -45,8 +45,8 @@
</jaxws:endpoint>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap12Mtom" address="http://localhost:${testutil.ports.fault.Server}/DoubleItSoap12Mtom" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap12MtomPort" implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
<jaxws:properties>
- <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
- <entry key="security.signature.properties" value="bob.properties"/>
+ <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
+ <entry key="ws-security.signature.properties" value="bob.properties"/>
<entry key="mtom-enabled" value="true"/>
</jaxws:properties>
</jaxws:endpoint>