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/04/17 12:11:14 UTC
[04/38] cxf git commit: Switching password tag value
Switching password tag value
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/354ac95b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/354ac95b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/354ac95b
Branch: refs/heads/master
Commit: 354ac95b70a98b4f2e8f9f33c534b3e885e9a935
Parents: eadb92c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Apr 17 10:30:59 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Apr 17 10:30:59 2015 +0100
----------------------------------------------------------------------
.../apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml | 4 ++--
.../resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml | 2 +-
.../test/java/org/apache/cxf/systest/ws/fault/FaultTest.java | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/354ac95b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml
index 17ca287..1363d27 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-bad-client.xml
@@ -26,13 +26,13 @@
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTPort" createdFromAPI="true">
<jaxws:properties>
<entry key="security.username" value="alice"/>
- <entry key="ws-security.password" value="trombone"/>
+ <entry key="security.password" value="trombone"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTAuthorizationPort" createdFromAPI="true">
<jaxws:properties>
<entry key="security.username" value="alice"/>
- <entry key="ws-security.password" value="trombone"/>
+ <entry key="security.password" value="trombone"/>
</jaxws:properties>
</jaxws:client>
<http:conduit name="https://localhost.*">
http://git-wip-us.apache.org/repos/asf/cxf/blob/354ac95b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
index 4c9f20a..128de7a 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
@@ -31,7 +31,7 @@
<property name="properties">
<map>
<entry key="security.username" value="bob"/>
- <entry key="ws-security.password" value="trombone"/>
+ <entry key="security.password" value="trombone"/>
</map>
</property>
<property name="claimsCallbackHandler" ref="roleClaimsCallbackHandler"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/354ac95b/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 1d11164..277e7f1 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
@@ -91,7 +91,7 @@ public class FaultTest extends AbstractBusClientServerTestBase {
// Now make an invocation using another username
((BindingProvider)utPort).getRequestContext().put("security.username", "bob");
- ((BindingProvider)utPort).getRequestContext().put("ws-security.password", "password");
+ ((BindingProvider)utPort).getRequestContext().put("security.password", "password");
try {
utPort.doubleIt(25);
fail("Expected failure on bob");
@@ -124,7 +124,7 @@ public class FaultTest extends AbstractBusClientServerTestBase {
// Now make an invocation using another username
((BindingProvider)utPort).getRequestContext().put("security.username", "bob");
- ((BindingProvider)utPort).getRequestContext().put("ws-security.password", "password");
+ ((BindingProvider)utPort).getRequestContext().put("security.password", "password");
try {
utPort.doubleIt(25);
fail("Expected failure on bob");
@@ -179,7 +179,7 @@ public class FaultTest extends AbstractBusClientServerTestBase {
// Now make an invocation using another username
client.getRequestContext().put("security.username", "bob");
- client.getRequestContext().put("ws-security.password", "password");
+ client.getRequestContext().put("security.password", "password");
try {
dispatch.invoke(request);
fail("Expected failure on bob");