cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [03/38] cxf git commit: Switching username cfg tag
Date Fri, 17 Apr 2015 10:11:13 GMT
Switching username cfg tag


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/eadb92c9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eadb92c9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eadb92c9

Branch: refs/heads/master
Commit: eadb92c9d8af84f8754efe7f08c69fc60b82c9c3
Parents: 6da8e62
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Apr 17 10:29:49 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Apr 17 10:29:49 2015 +0100

----------------------------------------------------------------------
 .../src/main/resources/wssec-client-stax.xml    |  2 +-
 .../sts/src/main/resources/wssec-client.xml     |  2 +-
 .../src/main/resources/ClientConfig.xml         |  2 +-
 .../src/main/resources/ClientConfigStax.xml     |  2 +-
 .../src/main/resources/ClientConfig.xml         |  2 +-
 .../src/main/resources/ClientConfigStax.xml     |  2 +-
 .../delegation/WSSUsernameCallbackHandler.java  |  2 +-
 .../custom_onbehalfof/CustomOnBehalfOfTest.java |  4 +-
 .../cxf/systest/sts/basic_auth/cxf-service.xml  |  2 +-
 .../systest/sts/basic_auth/stax-cxf-service.xml |  2 +-
 .../sts/binarysecuritytoken/cxf-service.xml     |  2 +-
 .../binarysecuritytoken/stax-cxf-service.xml    |  2 +-
 .../cxf/systest/sts/caching/cxf-client.xml      |  4 +-
 .../cxf/systest/sts/claims/cxf-bad-client.xml   |  2 +-
 .../systest/sts/claims/cxf-client-cbhandler.xml |  2 +-
 .../cxf/systest/sts/claims/cxf-client.xml       |  2 +-
 .../cxf/systest/sts/cross_domain/cxf-client.xml |  4 +-
 .../sts/custom_onbehalfof/cxf-client.xml        |  2 +-
 .../sts/custom_onbehalfof/cxf-service.xml       |  2 +-
 .../sts/distributed_caching/cxf-client.xml      |  2 +-
 .../systest/sts/kerberos/cxf-intermediary.xml   |  4 +-
 .../cxf/systest/sts/realms/cxf-client.xml       |  8 ++--
 .../cxf/systest/sts/realms/cxf-service.xml      |  8 ++--
 .../apache/cxf/systest/sts/renew/cxf-client.xml |  8 ++--
 .../cxf/systest/sts/secure_conv/cxf-client.xml  |  2 +-
 .../cxf/systest/sts/soap12/cxf-client.xml       |  2 +-
 .../cxf/systest/sts/soap12/cxf-service.xml      |  2 +-
 .../cxf/systest/sts/soap12/stax-cxf-service.xml |  2 +-
 .../sts/sts_sender_vouches/cxf-client.xml       |  2 +-
 .../systest/sts/transformation/cxf-client.xml   |  4 +-
 .../sts/usernametoken/cxf-bad-client.xml        |  4 +-
 .../systest/sts/usernametoken/cxf-client.xml    |  4 +-
 .../systest/sts/usernametoken/cxf-service.xml   |  4 +-
 .../sts/usernametoken/stax-cxf-service.xml      |  2 +-
 .../sts/symmetric/SymmetricBindingTest.java     |  2 +-
 .../cxf/systest/sts/template/TemplateTest.java  |  2 +-
 .../sts/transport/TransportBindingTest.java     |  6 +--
 .../UsernameActAsCachingTest.java               | 34 ++++++++--------
 .../sts/username_actas/UsernameActAsTest.java   |  6 +--
 .../UsernameOnBehalfOfCachingTest.java          | 34 ++++++++--------
 .../UsernameOnBehalfOfTest.java                 |  6 +--
 .../cxf/systest/sts/asymmetric/cxf-client.xml   |  4 +-
 .../cxf/systest/sts/bearer/cxf-client.xml       |  2 +-
 .../cxf-bad-client.xml                          |  4 +-
 .../intermediary_transformation/cxf-client.xml  |  2 +-
 .../cxf-intermediary-caching.xml                |  2 +-
 .../cxf-intermediary.xml                        |  2 +-
 .../cxf/systest/sts/issuer/cxf-client.xml       |  6 +--
 .../apache/cxf/systest/sts/jaas/cxf-service.xml |  2 +-
 .../systest/sts/sendervouches/cxf-client.xml    |  2 +-
 .../systest/sts/stsclient/cxf-client-name.xml   |  2 +-
 .../sts/stsclient/cxf-default-client.xml        |  2 +-
 .../cxf/systest/sts/symmetric/cxf-client.xml    |  4 +-
 .../cxf/systest/sts/template/cxf-client.xml     |  4 +-
 .../systest/sts/transport/cxf-bad-client.xml    |  6 +--
 .../cxf/systest/sts/transport/cxf-client.xml    |  8 ++--
 .../systest/kerberos/wssec/kerberos/server.xml  |  8 ++--
 .../kerberos/wssec/kerberos/stax-server.xml     |  8 ++--
 .../kerberos/wssec/kerberos/sts-client.xml      |  4 +-
 .../cxf/systest/ws/rm/sec/client-policy.xml     |  2 +-
 .../cxf/systest/wssec/examples/saml/client.xml  |  2 +-
 .../cxf/systest/wssec/examples/ut/client.xml    | 14 +++----
 .../apache/cxf/systest/ws/fault/FaultTest.java  | 12 +++---
 .../apache/cxf/systest/ws/algsuite/client.xml   | 12 +++---
 .../apache/cxf/systest/ws/bindings/client.xml   | 42 ++++++++++----------
 .../org/apache/cxf/systest/ws/parts/client.xml  | 42 ++++++++++----------
 .../org/apache/cxf/systest/ws/policy/client.xml | 10 ++---
 .../org/apache/cxf/systest/ws/saml/server.xml   | 12 +++---
 .../apache/cxf/systest/ws/saml/stax-server.xml  | 12 +++---
 .../org/apache/cxf/systest/ws/tokens/client.xml | 18 ++++-----
 .../cxf/systest/ws/tokens/endorsing-client.xml  | 12 +++---
 .../apache/cxf/systest/ws/ut/client-derived.xml | 14 +++----
 .../org/apache/cxf/systest/ws/ut/client.xml     | 20 +++++-----
 .../apache/cxf/systest/ws/ut/policy-client.xml  | 24 +++++------
 .../org/apache/cxf/systest/ws/wssc/client.xml   | 34 ++++++++--------
 .../apache/cxf/systest/ws/wssec10/client.xml    |  8 ++--
 .../systest/ws/wssec10/client_restricted.xml    |  8 ++--
 .../wssec10/client_restricted_unauthorized.xml  |  4 +-
 .../apache/cxf/systest/ws/wssec10/server.xml    |  8 ++--
 .../systest/ws/wssec10/server_restricted.xml    |  8 ++--
 .../ws/wssec10/server_restricted_authorized.xml |  2 +-
 .../wssec10/server_restricted_authorized_2.xml  |  2 +-
 .../cxf/systest/ws/wssec10/stax-server.xml      |  8 ++--
 .../ws/wssec10/stax-server_restricted.xml       |  8 ++--
 .../apache/cxf/systest/ws/wssec11/client.xml    | 26 ++++++------
 .../systest/ws/wssec11/client_restricted.xml    | 26 ++++++------
 .../org/apache/cxf/systest/ws/x509/client.xml   |  4 +-
 87 files changed, 329 insertions(+), 329 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml
index 8d020ee..767dac2 100644
--- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml
+++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client-stax.xml
@@ -39,7 +39,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UT_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.encryption.username" value="mystskey"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml
index 0ab136a..5115ebf 100644
--- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml
+++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-client.xml
@@ -38,7 +38,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UT_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.encryption.username" value="mystskey"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml
index 4991612..85483cc 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml
@@ -28,7 +28,7 @@
     </cxf:bus>
     <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="Alice"/>
+            <entry key="security.username" value="Alice"/>
             <entry key="ws-security.callback-handler" value="demo.wssec.client.UTPasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="etc/Client_Encrypt.properties"/>
             <entry key="ws-security.encryption.username" value="serverx509v1"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml
index 29b754f..eef54db 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml
@@ -28,7 +28,7 @@
     </cxf:bus>
     <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="Alice"/>
+            <entry key="security.username" value="Alice"/>
             <entry key="ws-security.callback-handler" value="demo.wssec.client.UTPasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="etc/Client_Encrypt.properties"/>
             <entry key="ws-security.encryption.username" value="serverx509v1"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfig.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfig.xml b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfig.xml
index 6ba062e..b0d06fb 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfig.xml
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfig.xml
@@ -38,7 +38,7 @@
     </http:conduit>
     <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="Alice"/>
+            <entry key="security.username" value="Alice"/>
             <entry key="ws-security.callback-handler" value="demo.wssec.client.UTPasswordCallback"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfigStax.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfigStax.xml b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfigStax.xml
index b3ff026..70e5237 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfigStax.xml
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfigStax.xml
@@ -38,7 +38,7 @@
     </http:conduit>
     <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="Alice"/>
+            <entry key="security.username" value="Alice"/>
             <entry key="ws-security.callback-handler" value="demo.wssec.client.UTPasswordCallback"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java
index a7c0559..698b2b0 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/delegation/WSSUsernameCallbackHandler.java
@@ -35,7 +35,7 @@ import org.apache.wss4j.dom.message.token.UsernameToken;
 
 /**
  * This CallbackHandler implementation obtains a username via the jaxws property 
- * "ws-security.username", as defined in SecurityConstants, and creates a wss UsernameToken 
+ * "security.username", as defined in SecurityConstants, and creates a wss UsernameToken 
  * (with no password) to be used as the delegation token.
  */
 public class WSSUsernameCallbackHandler implements CallbackHandler {

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
index 7ec2c0d..543878c 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/CustomOnBehalfOfTest.java
@@ -35,7 +35,7 @@ import org.junit.BeforeClass;
 /**
  * In this test case, a CXF client requests a Security Token from an STS, passing a username that
  * it has obtained from an unknown client as an "OnBehalfOf" element. This username is obtained
- * by parsing the "ws-security.username" property. The client then invokes on the service 
+ * by parsing the "security.username" property. The client then invokes on the service 
  * provider using the returned (custom BinarySecurityToken) token from the STS. The service
  * provider dispatches the received BinarySecurityToken to the STS for validation, and receives
  * a transformed SAML Token in response.
@@ -89,7 +89,7 @@ public class CustomOnBehalfOfTest extends AbstractBusClientServerTestBase {
 
         // Transport port
         ((BindingProvider)transportPort).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         doubleIt(transportPort, 25);
         

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
index e2adbae..99e049b 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
@@ -58,7 +58,7 @@
         <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
         <property name="properties">
             <map>
-                <entry key="ws-security.username" value="bob"/>
+                <entry key="security.username" value="bob"/>
                 <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             </map>
         </property>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
index 24e44b9..5c415ac 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
@@ -59,7 +59,7 @@
         <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
         <property name="properties">
             <map>
-                <entry key="ws-security.username" value="bob"/>
+                <entry key="security.username" value="bob"/>
                 <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="ws-security.enable.streaming" value="true"/>
             </map>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml
index a62ebcd..f2e8db4 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml
@@ -42,7 +42,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="bob"/>
+                            <entry key="security.username" value="bob"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                         </map>
                     </property>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml
index bca3ecf..506741e 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml
@@ -43,7 +43,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="bob"/>
+                            <entry key="security.username" value="bob"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.enable.streaming" value="true"/>
                         </map>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
index 7d2a222..9ae6bdf 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml
@@ -31,7 +31,7 @@
         <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
         <property name="properties">
             <map>
-                <entry key="ws-security.username" value="alice"/>
+                <entry key="security.username" value="alice"/>
                 <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="ws-security.sts.token.username" value="myclientkey"/>
                 <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -56,7 +56,7 @@
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="alice"/>
+            <entry key="security.username" value="alice"/>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
index 55e0eb8..71be96a 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
@@ -34,7 +34,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="bob"/>
+                            <entry key="security.username" value="bob"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
index 1448ab1..e9dca2c 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
@@ -37,7 +37,7 @@
                     <property name="claimsCallbackHandler" ref="roleClaimsCallbackHandler"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
index 3e8b093..ad6fc37 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
@@ -31,7 +31,7 @@
         <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
         <property name="properties">
             <map>
-                <entry key="ws-security.username" value="alice"/>
+                <entry key="security.username" value="alice"/>
                 <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="ws-security.sts.token.username" value="myclientkey"/>
                 <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
index 26b9fe0..5c470a3 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml
@@ -34,7 +34,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -57,7 +57,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml
index b89bcaa..bc43411 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml
@@ -36,7 +36,7 @@
                     <property name="onBehalfOf" ref="delegationCallbackHandler"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
index f8a3bf4..5c1e337 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
@@ -35,7 +35,7 @@
                     <property name="tokenType" value="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="bob"/>
+                            <entry key="security.username" value="bob"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                         </map>
                     </property>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
index c133b0f..665a323 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml
@@ -31,7 +31,7 @@
         <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
         <property name="properties">
             <map>
-                <entry key="ws-security.username" value="alice"/>
+                <entry key="security.username" value="alice"/>
                 <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="ws-security.sts.token.username" value="myclientkey"/>
                 <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
index 53ede43..cff2eab 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
@@ -55,7 +55,7 @@
     
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Port" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="myclientkey"/>
+            <entry key="security.username" value="myclientkey"/>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.sts.client">
@@ -66,7 +66,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Kerberos_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml
index adb01e7..4598ef5 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml
@@ -34,7 +34,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -55,7 +55,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -76,7 +76,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -97,7 +97,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
index d3a1c4f..8c44949 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
@@ -32,7 +32,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -56,7 +56,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -80,7 +80,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -104,7 +104,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
index 482e80e..f997ceb 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml
@@ -26,7 +26,7 @@
     </cxf:bus>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSaml1Port" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="alice"/>
+            <entry key="security.username" value="alice"/>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.signature.username" value="myclientkey"/>
@@ -52,7 +52,7 @@
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSaml1BearerPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="alice"/>
+            <entry key="security.username" value="alice"/>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -88,7 +88,7 @@
                 
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSaml2Port" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="alice"/>
+            <entry key="security.username" value="alice"/>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.signature.username" value="myclientkey"/>
@@ -115,7 +115,7 @@
     
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSaml2NoRenewPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="alice"/>
+            <entry key="security.username" value="alice"/>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.signature.username" value="myclientkey"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
index 2349fb9..0a74300 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml
@@ -32,7 +32,7 @@
         <property name="keySize" value="128"/>
         <property name="properties">
             <map>
-                <entry key="ws-security.username" value="alice"/>
+                <entry key="security.username" value="alice"/>
                 <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="ws-security.sts.token.username" value="myclientkey"/>
                 <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml
index 0e2f71c..8db094c 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml
@@ -34,7 +34,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Soap12_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
index 425342e..5ca7c6e 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
@@ -36,7 +36,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Soap12_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
index 183acd3..de02acb 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
@@ -37,7 +37,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Soap12_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml
index 4c85f67..bfe636d 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-client.xml
@@ -30,7 +30,7 @@
         <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UT_Port"/>
         <property name="properties">
             <map>
-                <entry key="ws-security.username" value="alice"/>
+                <entry key="security.username" value="alice"/>
                 <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="ws-security.encryption.username" value="mystskey"/>
                 <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml
index 5ae4f5b..b06d8d2 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-client.xml
@@ -25,13 +25,13 @@
     </cxf:bus>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="alice"/>
+            <entry key="security.username" value="alice"/>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTClaimsPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="alice"/>
+            <entry key="security.username" value="alice"/>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/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 211f76b..17ca287 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
@@ -25,13 +25,13 @@
     </cxf:bus>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="alice"/>
+            <entry key="security.username" value="alice"/>
             <entry key="ws-security.password" value="trombone"/>
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTAuthorizationPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="alice"/>
+            <entry key="security.username" value="alice"/>
             <entry key="ws-security.password" value="trombone"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml
index 48ab701..048011b 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-client.xml
@@ -25,13 +25,13 @@
     </cxf:bus>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="alice"/>
+            <entry key="security.username" value="alice"/>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTAuthorizationPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="alice"/>
+            <entry key="security.username" value="alice"/>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
index 9ba4d80..fb88dfb 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
@@ -38,7 +38,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="bob"/>
+                            <entry key="security.username" value="bob"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                         </map>
                     </property>
@@ -75,7 +75,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="bob"/>
+                            <entry key="security.username" value="bob"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                         </map>
                     </property>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
index 81fc786..1f89492 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
@@ -39,7 +39,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="bob"/>
+                            <entry key="security.username" value="bob"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.enable.streaming" value="true"/>
                         </map>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
index 3359cc9..4f09887 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
@@ -350,7 +350,7 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase {
         stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UT_Port");
         
         Map<String, Object> properties = new HashMap<String, Object>();
-        properties.put("ws-security.username", "alice");
+        properties.put("security.username", "alice");
         properties.put("ws-security.callback-handler",
                        "org.apache.cxf.systest.sts.common.CommonCallbackHandler");
         properties.put("ws-security.encryption.username", "mystskey");

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
index 2fe7ea5..e545cb4 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java
@@ -353,7 +353,7 @@ public class TemplateTest extends AbstractBusClientServerTestBase {
         stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port");
         
         Map<String, Object> properties = new HashMap<String, Object>();
-        properties.put("ws-security.username", "alice");
+        properties.put("security.username", "alice");
         properties.put("ws-security.callback-handler",
                        "org.apache.cxf.systest.sts.common.CommonCallbackHandler");
         properties.put("ws-security.sts.token.username", "myclientkey");

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
index 6a91247..f28a90f 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
@@ -321,7 +321,7 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
         
         // Make a successful request
         Client client = ((DispatchImpl<DOMSource>) dispatch).getClient();
-        client.getRequestContext().put("ws-security.username", "alice");
+        client.getRequestContext().put("security.username", "alice");
         client.getRequestContext().put("ws-security.sts.client", stsClient);
         
         if (test.isStreaming()) {
@@ -364,7 +364,7 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
         
         // Make a successful request
         Client client = ((DispatchImpl<DOMSource>) dispatch).getClient();
-        client.getRequestContext().put("ws-security.username", "alice");
+        client.getRequestContext().put("security.username", "alice");
         client.getRequestContext().put("ws-security.sts.client", stsClient);
         
         if (test.isStreaming()) {
@@ -432,7 +432,7 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
         stsClient.setEndpointName("{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port");
         
         Map<String, Object> properties = new HashMap<String, Object>();
-        properties.put("ws-security.username", "alice");
+        properties.put("security.username", "alice");
         properties.put("ws-security.callback-handler",
                        "org.apache.cxf.systest.sts.common.CommonCallbackHandler");
         properties.put("ws-security.sts.token.username", "myclientkey");

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
index 8d83c56..94260c7 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java
@@ -44,7 +44,7 @@ import org.junit.BeforeClass;
 /**
  * In this test case, a CXF client requests a Security Token from an STS, passing a username that
  * it has obtained from an unknown client as an "ActAs" element. This username is obtained
- * by parsing the "ws-security.username" property. The client then invokes on the service 
+ * by parsing the "security.username" property. The client then invokes on the service 
  * provider using the returned token from the STS.
  */
 public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
@@ -112,7 +112,7 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
 
         // Make a successful invocation
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         doubleIt(port, 25);
         
@@ -148,7 +148,7 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
         p.getRequestContext().put(TokenStore.class.getName(), tokenStore);
         
         // Make another invocation - this should succeed as the token is cached
-        p.getRequestContext().put("ws-security.username", "alice");
+        p.getRequestContext().put("security.username", "alice");
         doubleIt(port2, 40);
         
         // Reset the cache - this invocation should fail
@@ -195,17 +195,17 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
         
         // Make a successful invocation
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         doubleIt(port, 25);
         
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "bob"
+            "security.username", "bob"
         );
         doubleIt(port, 30);
         
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "eve"
+            "security.username", "eve"
         );
         try {
             doubleIt(port, 30);
@@ -220,17 +220,17 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
         
         // Make a successful invocation
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         doubleIt(port, 25);
         
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "bob"
+            "security.username", "bob"
         );
         doubleIt(port, 30);
         
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "eve2"
+            "security.username", "eve2"
         );
         try {
             doubleIt(port, 30);
@@ -242,7 +242,7 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
         // Reset the cache - this invocation should fail
         p.getRequestContext().put(TokenStore.class.getName(), new MemoryTokenStore());
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         try {
             doubleIt(port, 30);
@@ -285,7 +285,7 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
         
         // Make a successful invocation
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         BindingProvider p = (BindingProvider)port;
         p.getRequestContext().put(
@@ -296,7 +296,7 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
         
         // Make a successful invocation
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "bob"
+            "security.username", "bob"
         );
         p.getRequestContext().put(
             SecurityConstants.STS_APPLIES_TO, 
@@ -309,7 +309,7 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
         
         // Make a successful invocation - should work as token is cached
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         p.getRequestContext().put(
             SecurityConstants.STS_APPLIES_TO, 
@@ -319,7 +319,7 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
         
         // Make a successful invocation - should work as token is cached
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "bob"
+            "security.username", "bob"
         );
         p.getRequestContext().put(
             SecurityConstants.STS_APPLIES_TO, 
@@ -329,7 +329,7 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
         
         // Change appliesTo - should fail
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         p.getRequestContext().put(
             SecurityConstants.STS_APPLIES_TO, 
@@ -376,7 +376,7 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
         
         // Make a successful invocation
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         // Disable appliesTo
         BindingProvider p = (BindingProvider)port;
@@ -392,7 +392,7 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase {
         
         // Bob should fail
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "bob"
+            "security.username", "bob"
         );
         try {
             doubleIt(port, 30);

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
index 0fbfe2e..2a429ba 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java
@@ -43,7 +43,7 @@ import org.junit.runners.Parameterized.Parameters;
 /**
  * In this test case, a CXF client requests a Security Token from an STS, passing a username that
  * it has obtained from an unknown client as an "ActAs" element. This username is obtained
- * by parsing the "ws-security.username" property. The client then invokes on the service 
+ * by parsing the "security.username" property. The client then invokes on the service 
  * provider using the returned token from the STS.
  */
 @RunWith(value = org.junit.runners.Parameterized.class)
@@ -131,7 +131,7 @@ public class UsernameActAsTest extends AbstractBusClientServerTestBase {
         
         // Transport port
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         doubleIt(port, 25);
         
@@ -149,7 +149,7 @@ public class UsernameActAsTest extends AbstractBusClientServerTestBase {
         }
         
         ((BindingProvider)port2).getRequestContext().put(
-            "ws-security.username", "eve"
+            "security.username", "eve"
         );
         // This time we expect a failure as the server validator doesn't accept "eve".
         try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
index 3786a14..644f348 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java
@@ -43,7 +43,7 @@ import org.junit.BeforeClass;
 /**
  * In this test case, a CXF client requests a Security Token from an STS, passing a username that
  * it has obtained from an unknown client as an "OnBehalfOf" element. This username is obtained
- * by parsing the "ws-security.username" property. The client then invokes on the service 
+ * by parsing the "security.username" property. The client then invokes on the service 
  * provider using the returned token from the STS. 
  */
 public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBase {
@@ -111,7 +111,7 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
 
         // Make a successful invocation
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         doubleIt(port, 25);
         
@@ -148,7 +148,7 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
         p.getRequestContext().put(TokenStore.class.getName(), tokenStore);
         
         // Make another invocation - this should succeed as the token is cached
-        p.getRequestContext().put("ws-security.username", "alice");
+        p.getRequestContext().put("security.username", "alice");
         doubleIt(port2, 40);
         
         // Reset the cache - this invocation should fail
@@ -195,17 +195,17 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
         
         // Make a successful invocation
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         doubleIt(port, 25);
         
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "bob"
+            "security.username", "bob"
         );
         doubleIt(port, 30);
         
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "eve"
+            "security.username", "eve"
         );
         try {
             doubleIt(port, 30);
@@ -220,17 +220,17 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
         
         // Make a successful invocation
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         doubleIt(port, 25);
         
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "bob"
+            "security.username", "bob"
         );
         doubleIt(port, 30);
         
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "eve2"
+            "security.username", "eve2"
         );
         try {
             doubleIt(port, 30);
@@ -242,7 +242,7 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
         // Reset the cache - this invocation should fail
         p.getRequestContext().put(TokenStore.class.getName(), new MemoryTokenStore());
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         try {
             doubleIt(port, 30);
@@ -285,7 +285,7 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
         
         // Make a successful invocation
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         BindingProvider p = (BindingProvider)port;
         p.getRequestContext().put(
@@ -296,7 +296,7 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
         
         // Make a successful invocation
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "bob"
+            "security.username", "bob"
         );
         p.getRequestContext().put(
             SecurityConstants.STS_APPLIES_TO, 
@@ -309,7 +309,7 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
         
         // Make a successful invocation - should work as token is cached
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         p.getRequestContext().put(
             SecurityConstants.STS_APPLIES_TO, 
@@ -319,7 +319,7 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
         
         // Make a successful invocation - should work as token is cached
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "bob"
+            "security.username", "bob"
         );
         p.getRequestContext().put(
             SecurityConstants.STS_APPLIES_TO, 
@@ -329,7 +329,7 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
         
         // Change appliesTo - should fail
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         p.getRequestContext().put(
             SecurityConstants.STS_APPLIES_TO, 
@@ -376,7 +376,7 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
         
         // Make a successful invocation
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         // Disable appliesTo
         BindingProvider p = (BindingProvider)port;
@@ -392,7 +392,7 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa
         
         // Bob should fail
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "bob"
+            "security.username", "bob"
         );
         try {
             doubleIt(port, 30);

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
index 4bb3859..3e5f0ef 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java
@@ -42,7 +42,7 @@ import org.junit.runners.Parameterized.Parameters;
 /**
  * In this test case, a CXF client requests a Security Token from an STS, passing a username that
  * it has obtained from an unknown client as an "OnBehalfOf" element. This username is obtained
- * by parsing the "ws-security.username" property. The client then invokes on the service 
+ * by parsing the "security.username" property. The client then invokes on the service 
  * provider using the returned token from the STS. 
  */
 @RunWith(value = org.junit.runners.Parameterized.class)
@@ -129,7 +129,7 @@ public class UsernameOnBehalfOfTest extends AbstractBusClientServerTestBase {
 
         // Transport port
         ((BindingProvider)port).getRequestContext().put(
-            "ws-security.username", "alice"
+            "security.username", "alice"
         );
         doubleIt(port, 25);
         
@@ -147,7 +147,7 @@ public class UsernameOnBehalfOfTest extends AbstractBusClientServerTestBase {
         }
         
         ((BindingProvider)port2).getRequestContext().put(
-            "ws-security.username", "eve"
+            "security.username", "eve"
         );
         // This time we expect a failure as the server validator doesn't accept "eve".
         try {

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
index d8cb163..908da53 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-client.xml
@@ -30,7 +30,7 @@
         <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UT_Port"/>
         <property name="properties">
             <map>
-                <entry key="ws-security.username" value="alice"/>
+                <entry key="security.username" value="alice"/>
                 <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="ws-security.encryption.username" value="mystskey"/>
                 <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
@@ -76,7 +76,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}UTEncrypted_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="alice"/>
+                            <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.encryption.username" value="mystskey"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml
index 6577813..ee72cd2 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml
@@ -30,7 +30,7 @@
         <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
         <property name="properties">
             <map>
-                <entry key="ws-security.username" value="alice"/>
+                <entry key="security.username" value="alice"/>
                 <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="ws-security.sts.token.username" value="myclientkey"/>
                 <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml
index 676688c..0e0e31e 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml
@@ -25,7 +25,7 @@
     </cxf:bus>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1EndorsingPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.username" value="myclientkey"/>
+            <entry key="security.username" value="myclientkey"/>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.sts.client">
@@ -36,7 +36,7 @@
                     <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.username" value="eve"/>
+                            <entry key="security.username" value="eve"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>


Mime
View raw message