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 2016/01/06 13:49:20 UTC
[3/3] cxf git commit: Fixing merge
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/354298c0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/354298c0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/354298c0
Branch: refs/heads/3.0.x-fixes
Commit: 354298c08a363266ae450c31fc2a1a9879e2e144
Parents: 68130cc
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Jan 6 12:49:07 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Jan 6 12:49:07 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/cxf/systest/ws/fault/FaultTest.java | 12 ++++++------
.../org/apache/cxf/systest/ws/fault/client.xml | 6 +++---
.../org/apache/cxf/systest/ws/fault/server.xml | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/354298c0/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
index a19a0f2..3570d32 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
@@ -154,12 +154,12 @@ public class FaultTest extends AbstractBusClientServerTestBase {
updateAddressPort(utPort, PORT);
// Make a successful invocation
- ((BindingProvider)utPort).getRequestContext().put("security.username", "alice");
+ ((BindingProvider)utPort).getRequestContext().put("ws-security.username", "alice");
utPort.doubleIt(25);
// Now make an invocation using another username
- ((BindingProvider)utPort).getRequestContext().put("security.username", "bob");
- ((BindingProvider)utPort).getRequestContext().put("security.password", "password");
+ ((BindingProvider)utPort).getRequestContext().put("ws-security.username", "bob");
+ ((BindingProvider)utPort).getRequestContext().put("ws-security.password", "password");
try {
utPort.doubleIt(25);
fail("Expected failure on bob");
@@ -243,12 +243,12 @@ public class FaultTest extends AbstractBusClientServerTestBase {
updateAddressPort(utPort, PORT);
// Make a successful invocation
- ((BindingProvider)utPort).getRequestContext().put("security.username", "alice");
+ ((BindingProvider)utPort).getRequestContext().put("ws-security.username", "alice");
utPort.doubleIt(25);
// Now make an invocation using another username
- ((BindingProvider)utPort).getRequestContext().put("security.username", "bob");
- ((BindingProvider)utPort).getRequestContext().put("security.password", "password");
+ ((BindingProvider)utPort).getRequestContext().put("ws-security.username", "bob");
+ ((BindingProvider)utPort).getRequestContext().put("ws-security.password", "password");
try {
utPort.doubleIt(25);
fail("Expected failure on bob");
http://git-wip-us.apache.org/repos/asf/cxf/blob/354298c0/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 457451a..010cfee 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
@@ -59,9 +59,9 @@
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSoap11PolicyWithPartsPort" 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"/>
</jaxws:properties>
</jaxws:client>
</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/354298c0/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 e37e7ac..1739cd7 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
@@ -52,8 +52,8 @@
</jaxws:endpoint>
<jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="Soap11PolicyWithParts" address="http://localhost:${testutil.ports.fault.Server}/DoubleItSoap11PolicyWithParts" serviceName="s:DoubleItService" endpointName="s:DoubleItSoap11PolicyWithPartsPort" 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"/>
</jaxws:properties>
</jaxws:endpoint>
</beans>