cxf-commits mailing list archives

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


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

Branch: refs/heads/master
Commit: 2a5d201be1b85344585094d0f044e9bf1b605fac
Parents: 93039ab
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Apr 17 10:34:21 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Apr 17 10:34:21 2015 +0100

----------------------------------------------------------------------
 .../src/main/resources/wssec-client-stax.xml    |  4 +-
 .../sts/src/main/resources/wssec-client.xml     |  4 +-
 .../src/main/resources/ClientConfig.xml         |  2 +-
 .../src/main/resources/ClientConfigStax.xml     |  2 +-
 .../src/main/webapp/WEB-INF/cxf-x509.xml        |  2 +-
 .../sts/binarysecuritytoken/cxf-bad-client.xml  |  2 +-
 .../sts/binarysecuritytoken/cxf-client.xml      |  2 +-
 .../sts/binarysecuritytoken/cxf-service.xml     |  2 +-
 .../binarysecuritytoken/stax-cxf-service.xml    |  2 +-
 .../systest/sts/caching/cxf-caching-service.xml |  2 +-
 .../cxf/systest/sts/caching/cxf-client.xml      |  2 +-
 .../sts/sts_sender_vouches/cxf-client.xml       |  4 +-
 .../sts/symmetric/SymmetricBindingTest.java     |  2 +-
 .../cxf/systest/sts/asymmetric/cxf-client.xml   | 10 +--
 .../cxf/systest/sts/deployment/cxf-x509.xml     |  2 +-
 .../systest/sts/deployment/stax-cxf-x509.xml    |  2 +-
 .../cxf/systest/sts/symmetric/cxf-client.xml    |  4 +-
 .../systest/sts/username_actas/cxf-client.xml   | 20 +++---
 .../sts/username_onbehalfof/cxf-client.xml      | 20 +++---
 .../systest/sts/x509_symmetric/cxf-client.xml   |  4 +-
 .../systest/sts/x509_symmetric/cxf-service.xml  |  2 +-
 .../sts/x509_symmetric/cxf-stax-service.xml     |  2 +-
 .../systest/kerberos/wssec/kerberos/client.xml  | 24 +++----
 .../systest/kerberos/wssec/kerberos/server.xml  |  8 +--
 .../kerberos/wssec/kerberos/stax-server.xml     |  8 +--
 .../jaxrs/security/xml/JAXRSXmlSecTest.java     | 18 ++---
 .../cxf/systest/jaxrs/security/xml/server.xml   |  2 +-
 .../systest/jaxrs/security/xml/stax-server.xml  |  2 +-
 .../cxf/systest/ws/rm/sec/client-policy.xml     |  2 +-
 .../cxf/systest/ws/rm/sec/server-policy.xml     |  2 +-
 .../cxf/systest/wssec/examples/saml/client.xml  | 12 ++--
 .../cxf/systest/wssec/examples/saml/server.xml  |  8 +--
 .../systest/wssec/examples/saml/stax-server.xml |  8 +--
 .../systest/wssec/examples/secconv/client.xml   |  2 +-
 .../systest/wssec/examples/secconv/server.xml   |  2 +-
 .../wssec/examples/secconv/stax-server.xml      |  2 +-
 .../cxf/systest/wssec/examples/ut/client.xml    |  6 +-
 .../cxf/systest/wssec/examples/ut/server.xml    |  2 +-
 .../systest/wssec/examples/ut/stax-server.xml   |  2 +-
 .../cxf/systest/wssec/examples/x509/client.xml  |  8 +--
 .../cxf/systest/wssec/examples/x509/server.xml  |  6 +-
 .../systest/wssec/examples/x509/stax-server.xml |  6 +-
 .../apache/cxf/systest/ws/fault/FaultTest.java  |  2 +-
 .../cxf/systest/ws/wssc/WSSCUnitTest.java       |  4 +-
 .../systest/ws/x509/DoubleItPropertiesImpl.java |  2 +-
 .../org/apache/cxf/systest/ws/action/server.xml |  4 +-
 .../apache/cxf/systest/ws/algsuite/client.xml   | 12 ++--
 .../apache/cxf/systest/ws/bindings/client.xml   | 42 ++++++------
 .../apache/cxf/systest/ws/bindings/server.xml   | 42 ++++++------
 .../cxf/systest/ws/bindings/stax-server.xml     | 42 ++++++------
 .../org/apache/cxf/systest/ws/cache/client.xml  |  4 +-
 .../cxf/systest/ws/fault/client-untrusted.xml   |  2 +-
 .../org/apache/cxf/systest/ws/fault/client.xml  |  6 +-
 .../cxf/systest/ws/fault/modified-server.xml    |  4 +-
 .../org/apache/cxf/systest/ws/gcm/client.xml    |  6 +-
 .../org/apache/cxf/systest/ws/gcm/server.xml    |  6 +-
 .../apache/cxf/systest/ws/gcm/stax-server.xml   |  6 +-
 .../apache/cxf/systest/ws/httpget/client.xml    |  2 +-
 .../org/apache/cxf/systest/ws/parts/client.xml  | 42 ++++++------
 .../org/apache/cxf/systest/ws/parts/server.xml  | 42 ++++++------
 .../apache/cxf/systest/ws/parts/stax-server.xml | 40 +++++------
 .../org/apache/cxf/systest/ws/policy/client.xml |  6 +-
 .../org/apache/cxf/systest/ws/policy/server.xml |  6 +-
 .../org/apache/cxf/systest/ws/saml/client.xml   | 20 +++---
 .../org/apache/cxf/systest/ws/saml/server.xml   | 12 ++--
 .../apache/cxf/systest/ws/saml/stax-server.xml  | 12 ++--
 .../apache/cxf/systest/ws/swa/policy-client.xml | 10 +--
 .../apache/cxf/systest/ws/swa/policy-server.xml |  2 +-
 .../cxf/systest/ws/swa/stax-policy-server.xml   |  2 +-
 .../org/apache/cxf/systest/ws/tokens/client.xml | 18 ++---
 .../cxf/systest/ws/tokens/endorsing-client.xml  | 12 ++--
 .../cxf/systest/ws/tokens/endorsing-server.xml  | 12 ++--
 .../org/apache/cxf/systest/ws/tokens/server.xml | 18 ++---
 .../systest/ws/tokens/stax-endorsing-server.xml | 12 ++--
 .../cxf/systest/ws/tokens/stax-server.xml       | 18 ++---
 .../apache/cxf/systest/ws/ut/client-derived.xml |  6 +-
 .../apache/cxf/systest/ws/wssec10/server.xml    |  4 +-
 .../systest/ws/wssec10/server_restricted.xml    |  4 +-
 .../cxf/systest/ws/wssec10/stax-server.xml      |  4 +-
 .../ws/wssec10/stax-server_restricted.xml       |  4 +-
 .../org/apache/cxf/systest/ws/x509/client.xml   | 70 ++++++++++----------
 .../org/apache/cxf/systest/ws/x509/server.xml   | 30 ++++-----
 .../apache/cxf/systest/ws/x509/stax-server.xml  | 30 ++++-----
 .../org/apache/cxf/systest/ws/xkms/client.xml   |  4 +-
 .../org/apache/cxf/systest/ws/xkms/server.xml   |  2 +-
 .../apache/cxf/systest/ws/xkms/stax-server.xml  |  2 +-
 86 files changed, 429 insertions(+), 429 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/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 7ab0920..d7e7a5e 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
@@ -29,7 +29,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.enable.streaming" value="true"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -42,7 +42,7 @@
                             <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"/>
+                            <entry key="security.encryption.username" value="mystskey"/>
                             <!-- Because of the PublicKey requirement in the InitiatorToken element
                                 in the WSP WSDL, the client needs to have the STS add its public
                                 key to the SAML assertion, as configured in the three lines below.  

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/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 a55a499..0437736 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
@@ -29,7 +29,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>
@@ -41,7 +41,7 @@
                             <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"/>
+                            <entry key="security.encryption.username" value="mystskey"/>
                             <!-- Because of the PublicKey requirement in the InitiatorToken element
                                 in the WSP WSDL, the client needs to have the STS add its public
                                 key to the SAML assertion, as configured in the three lines below.  

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/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 85483cc..24d7ff4 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
@@ -31,7 +31,7 @@
             <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"/>
+            <entry key="security.encryption.username" value="serverx509v1"/>
         </jaxws:properties>
     </jaxws:client>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/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 eef54db..b14e2c8 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
@@ -31,7 +31,7 @@
             <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"/>
+            <entry key="security.encryption.username" value="serverx509v1"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml b/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml
index 303a539..b2d9853 100644
--- a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml
+++ b/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-x509.xml
@@ -62,7 +62,7 @@
             <entry key="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
             <entry key="security.signature.username" value="mystskey"/>
-            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+            <entry key="security.encryption.username" value="useReqSigCert"/>
         </jaxws:properties>
     </jaxws:endpoint>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml
index c22d563..2eef0b9 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-bad-client.xml
@@ -29,7 +29,7 @@
             <entry key="security.signature.username" value="eve"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
         </jaxws:properties>
     </jaxws:client>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-client.xml
index 86aa445..0a5d58e 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-client.xml
@@ -29,7 +29,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
         </jaxws:properties>
     </jaxws:client>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/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 dde0af2..4591d8a 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
@@ -33,7 +33,7 @@
             <entry key="security.signature.username" value="myservicekey"/>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
-            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+            <entry key="security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/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 2fc3f14..2054a50 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
@@ -33,7 +33,7 @@
             <entry key="security.signature.username" value="myservicekey"/>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
-            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+            <entry key="security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.enable.streaming" value="true"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
index cb66b45..e00fa7a 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
@@ -65,7 +65,7 @@
             <entry key="security.signature.username" value="myservicekey"/>
             <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/>
-            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+            <entry key="security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/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 0d9467a..8615f6c 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
@@ -66,7 +66,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
         </jaxws:properties>
     </jaxws:client>
     <http:conduit name="https://localhost:.*">

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/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 7c26752..d8be28c 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
@@ -32,7 +32,7 @@
             <map>
                 <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="security.encryption.username" value="mystskey"/>
                 <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
                 <entry key="ws-security.sts.token.username" value="myclientkey"/>
                 <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -46,7 +46,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client" value-ref="stsClient"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/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 4f09887..f17c61d 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
@@ -353,7 +353,7 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase {
         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");
+        properties.put("security.encryption.username", "mystskey");
         properties.put("ws-security.encryption.properties", "clientKeystore.properties");
         properties.put("ws-security.is-bsp-compliant", "false");
         stsClient.setProperties(properties);

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/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 88ad908..a5b4e5b 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
@@ -32,7 +32,7 @@
             <map>
                 <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="security.encryption.username" value="mystskey"/>
                 <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
                 <entry key="ws-security.sts.token.username" value="myclientkey"/>
                 <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -47,7 +47,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client" value-ref="stsClient"/>
         </jaxws:properties>
     </jaxws:client>
@@ -57,7 +57,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client" value-ref="stsClient"/>
         </jaxws:properties>
     </jaxws:client>
@@ -67,7 +67,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>
@@ -79,7 +79,7 @@
                             <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"/>
+                            <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.usecert" value="true"/>
                             <entry key="ws-security.is-bsp-compliant" value="false"/>
                         </map>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml
index 6f177e6..b2e18c6 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml
@@ -70,7 +70,7 @@
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
             <entry key="security.signature.username" value="mystskey"/>
-            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+            <entry key="security.encryption.username" value="useReqSigCert"/>
         </jaxws:properties>
     </jaxws:endpoint>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml
index 9106cfa..2a0fc97 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml
@@ -70,7 +70,7 @@
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
             <entry key="security.signature.username" value="mystskey"/>
-            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+            <entry key="security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
index 21c0880..fc00445 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
@@ -32,7 +32,7 @@
             <map>
                 <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="security.encryption.username" value="mystskey"/>
                 <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
                 <entry key="ws-security.is-bsp-compliant" value="false"/>
             </map>
@@ -61,7 +61,7 @@
                             <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"/>
+                            <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.is-bsp-compliant" value="false"/>
                         </map>
                     </property>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
index 205a2e9..130d310 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml
@@ -30,7 +30,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>
@@ -44,7 +44,7 @@
                             <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.encryption.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.username" value="mystskey"/>
+                            <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                         </map>
@@ -59,7 +59,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>
@@ -73,7 +73,7 @@
                             <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.encryption.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.username" value="mystskey"/>
+                            <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                         </map>
@@ -88,7 +88,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>
@@ -102,7 +102,7 @@
                             <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.encryption.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.username" value="mystskey"/>
+                            <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                         </map>
@@ -117,7 +117,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>
@@ -131,7 +131,7 @@
                             <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.encryption.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.username" value="mystskey"/>
+                            <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                         </map>
@@ -146,7 +146,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>
@@ -160,7 +160,7 @@
                             <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.encryption.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.username" value="mystskey"/>
+                            <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                         </map>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml
index aedf99d..cb90d47 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml
@@ -30,7 +30,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>
@@ -44,7 +44,7 @@
                             <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.encryption.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.username" value="mystskey"/>
+                            <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                         </map>
@@ -59,7 +59,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>
@@ -73,7 +73,7 @@
                             <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.encryption.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.username" value="mystskey"/>
+                            <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                         </map>
@@ -88,7 +88,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>
@@ -102,7 +102,7 @@
                             <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.encryption.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.username" value="mystskey"/>
+                            <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                         </map>
@@ -117,7 +117,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>
@@ -131,7 +131,7 @@
                             <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.encryption.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.username" value="mystskey"/>
+                            <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                         </map>
@@ -146,7 +146,7 @@
             <entry key="security.signature.username" value="myclientkey"/>
             <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="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>
@@ -160,7 +160,7 @@
                             <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.encryption.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.username" value="mystskey"/>
+                            <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                         </map>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
index 7edcd4e..e409ca0 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
@@ -34,7 +34,7 @@
                 <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.encryption.properties" value="clientKeystore.properties"/>
-                <entry key="ws-security.encryption.username" value="mystskey"/>
+                <entry key="security.encryption.username" value="mystskey"/>
             </map>
         </property>
     </bean>
@@ -51,7 +51,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML2EndorsingPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.encryption.username" value="myservicekey"/>
+            <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client" value-ref="stsClient"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
index e17b499..d993ec0 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
@@ -37,7 +37,7 @@
                 <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
                 <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/>
-                <entry key="ws-security.encryption.username" value="mystskey"/>
+                <entry key="security.encryption.username" value="mystskey"/>
             </map>
         </property>
     </bean>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
index f8121c8..511f92b 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
@@ -37,7 +37,7 @@
                 <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
                 <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/>
-                <entry key="ws-security.encryption.username" value="mystskey"/>
+                <entry key="security.encryption.username" value="mystskey"/>
             </map>
         </property>
     </bean>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
index c178a17..e20ce7d 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
@@ -61,7 +61,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
                     <constructor-arg ref="cxf"/>
@@ -75,7 +75,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricSupportingPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
                     <constructor-arg ref="cxf"/>
@@ -89,7 +89,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSupportingPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
                     <constructor-arg ref="cxf"/>
@@ -104,7 +104,7 @@
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.signature.properties" value="alice.properties"/>
             <entry key="security.signature.username" value="alice"/>
             <entry key="ws-security.kerberos.client">
@@ -136,7 +136,7 @@
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.signature.properties" value="alice.properties"/>
             <entry key="security.signature.username" value="alice"/>
             <entry key="ws-security.kerberos.client">
@@ -152,7 +152,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricProtectionPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
                     <constructor-arg ref="cxf"/>
@@ -166,7 +166,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricDerivedProtectionPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
                     <constructor-arg ref="cxf"/>
@@ -181,7 +181,7 @@
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.signature.properties" value="alice.properties"/>
             <entry key="security.signature.username" value="alice"/>
             <entry key="ws-security.kerberos.client">
@@ -198,7 +198,7 @@
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.signature.properties" value="alice.properties"/>
             <entry key="security.signature.username" value="alice"/>
             <entry key="ws-security.kerberos.client">
@@ -214,7 +214,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricEndorsingEncryptedPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
                     <constructor-arg ref="cxf"/>
@@ -228,7 +228,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricSignedEndorsingEncryptedPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
                     <constructor-arg ref="cxf"/>
@@ -242,7 +242,7 @@
    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricSecureConversationPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
                     <constructor-arg ref="cxf"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
index c2b2ac0..618fcb3 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
@@ -92,7 +92,7 @@
             <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
             <entry key="ws-security.encryption.properties" value="alice.properties"/>
-            <entry key="ws-security.encryption.username" value="alice"/>
+            <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
         </jaxws:properties>
@@ -110,7 +110,7 @@
             <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
             <entry key="ws-security.encryption.properties" value="alice.properties"/>
-            <entry key="ws-security.encryption.username" value="alice"/>
+            <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
         </jaxws:properties>
@@ -135,7 +135,7 @@
             <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
             <entry key="ws-security.encryption.properties" value="alice.properties"/>
-            <entry key="ws-security.encryption.username" value="alice"/>
+            <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
         </jaxws:properties>
@@ -146,7 +146,7 @@
             <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
             <entry key="ws-security.encryption.properties" value="alice.properties"/>
-            <entry key="ws-security.encryption.username" value="alice"/>
+            <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
index 2dd2e10..1f37baa 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml
@@ -83,7 +83,7 @@
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
             <entry key="ws-security.encryption.properties" value="alice.properties"/>
-            <entry key="ws-security.encryption.username" value="alice"/>
+            <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
@@ -102,7 +102,7 @@
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
             <entry key="ws-security.encryption.properties" value="alice.properties"/>
-            <entry key="ws-security.encryption.username" value="alice"/>
+            <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
@@ -127,7 +127,7 @@
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
             <entry key="ws-security.encryption.properties" value="alice.properties"/>
-            <entry key="ws-security.encryption.username" value="alice"/>
+            <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
@@ -138,7 +138,7 @@
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
             <entry key="ws-security.encryption.properties" value="alice.properties"/>
-            <entry key="ws-security.encryption.username" value="alice"/>
+            <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
index 4b6f9da..02f38ed 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java
@@ -284,7 +284,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase {
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put("ws-security.callback-handler", 
                        "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
-        properties.put("ws-security.encryption.username", "bob");
+        properties.put("security.encryption.username", "bob");
         properties.put("ws-security.encryption.properties", 
                        "org/apache/cxf/systest/jaxrs/security/bob.properties");
         doTestPostEncryptedBook(address, false, properties, test.streaming);
@@ -308,7 +308,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase {
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put("ws-security.callback-handler", 
                        "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
-        properties.put("ws-security.encryption.username", "bob");
+        properties.put("security.encryption.username", "bob");
         properties.put("ws-security.encryption.properties", 
                        "org/apache/cxf/systest/jaxrs/security/bob.properties");
         
@@ -326,7 +326,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase {
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put("ws-security.callback-handler", 
                        "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
-        properties.put("ws-security.encryption.username", "bob");
+        properties.put("security.encryption.username", "bob");
         properties.put("ws-security.encryption.properties", 
                        "org/apache/cxf/systest/jaxrs/security/bob.properties");
         
@@ -346,7 +346,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase {
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put("ws-security.callback-handler", 
                        "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
-        properties.put("ws-security.encryption.username", "bob");
+        properties.put("security.encryption.username", "bob");
         properties.put("ws-security.encryption.properties", 
                        "org/apache/cxf/systest/jaxrs/security/bob.properties");
         
@@ -365,7 +365,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase {
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put("ws-security.callback-handler", 
                        "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
-        properties.put("ws-security.encryption.username", "bob");
+        properties.put("security.encryption.username", "bob");
         properties.put("ws-security.encryption.properties", 
                        "org/apache/cxf/systest/jaxrs/security/bob.properties");
         properties.put("security.signature.username", "alice");
@@ -381,7 +381,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase {
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put("ws-security.callback-handler", 
                        "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
-        properties.put("ws-security.encryption.username", "bob");
+        properties.put("security.encryption.username", "bob");
         properties.put("ws-security.encryption.properties", 
                        "org/apache/cxf/systest/jaxrs/security/bob.properties");
         properties.put("security.signature.username", "alice");
@@ -407,7 +407,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase {
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put("ws-security.callback-handler", 
                        "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
-        properties.put("ws-security.encryption.username", "bob");
+        properties.put("security.encryption.username", "bob");
         properties.put("ws-security.encryption.properties", 
                        "org/apache/cxf/systest/jaxrs/security/bob.properties");
         properties.put("security.signature.username", "alice");
@@ -540,7 +540,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase {
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put("ws-security.callback-handler", 
                        "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
-        properties.put("ws-security.encryption.username", "bob");
+        properties.put("security.encryption.username", "bob");
         properties.put("ws-security.encryption.properties", 
                        "org/apache/cxf/systest/jaxrs/security/bob.properties");
         properties.put("ws-security.signature.properties", 
@@ -584,7 +584,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase {
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put("ws-security.callback-handler", 
                        "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
-        properties.put("ws-security.encryption.username", "bob");
+        properties.put("security.encryption.username", "bob");
         properties.put("ws-security.encryption.properties", 
                        "org/apache/cxf/systest/jaxrs/security/bob.properties");
         properties.put("ws-security.signature.properties", 

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml
index 48ee949..85bd485 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml
@@ -195,7 +195,7 @@ under the License.
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/>
-            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+            <entry key="security.encryption.username" value="useReqSigCert"/>
         </jaxrs:properties>
     </jaxrs:server>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml
index 0164e2d..9bc224b 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml
@@ -209,7 +209,7 @@ under the License.
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/>
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/>
-            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+            <entry key="security.encryption.username" value="useReqSigCert"/>
         </jaxrs:properties>
     </jaxrs:server>
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml
index 11f60a2..e1ed29d 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml
@@ -46,7 +46,7 @@ under the License.
       <entry key="security.username" value="Alice"/>
       <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.rm.sec.UTPasswordCallback"/>
       <entry key="ws-security.encryption.properties" value="bob.properties"/>
-      <entry key="ws-security.encryption.username" value="bob"/>
+      <entry key="security.encryption.username" value="bob"/>
       <entry key="ws-security.signature.properties" value="alice.properties"/>
       <entry key="security.signature.username" value="alice"/>
     </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml
index dd3d5c9..4ebf1a5 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml
@@ -43,7 +43,7 @@
     <jaxws:properties>
       <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.rm.sec.UTPasswordCallback"/>
       <entry key="ws-security.signature.properties" value="bob.properties"/>
-      <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+      <entry key="security.encryption.username" value="useReqSigCert"/>
       <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
     </jaxws:properties>
     <jaxws:features>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
index 412ce0f..f4ae5af 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
@@ -49,7 +49,7 @@
             <entry key="ws-security.signature.properties" value="alice.properties"/>
             <entry key="security.signature.username" value="alice"/>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricInitiatorPort" createdFromAPI="true">
@@ -59,7 +59,7 @@
             <entry key="ws-security.signature.properties" value="alice.properties"/>
             <entry key="security.signature.username" value="alice"/>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSaml2BearerPort" createdFromAPI="true">
@@ -69,7 +69,7 @@
             <entry key="ws-security.signature.properties" value="alice.properties"/>
             <entry key="security.signature.username" value="alice"/>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTLSSenderVouchesSaml2Port" createdFromAPI="true">
@@ -92,7 +92,7 @@
             <entry key="ws-security.signature.properties" value="alice.properties"/>
             <entry key="security.signature.username" value="alice"/>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricIssuedTokenPort" createdFromAPI="true">
@@ -101,7 +101,7 @@
             <entry key="ws-security.signature.properties" value="alice.properties"/>
             <entry key="security.signature.username" value="alice"/>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="bob"/>
+            <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>
@@ -113,7 +113,7 @@
                             <entry key="security.username" value="alice"/>
                             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
                             <entry key="ws-security.encryption.properties" value="alice.properties"/>
-                            <entry key="ws-security.encryption.username" value="cxfca"/>
+                            <entry key="security.encryption.username" value="cxfca"/>
                         </map>
                     </property>
                 </bean>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml
index b74e578..53b4e16 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml
@@ -49,7 +49,7 @@
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+            <entry key="security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
         </jaxws:properties>
     </jaxws:endpoint>
@@ -57,7 +57,7 @@
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+            <entry key="security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
         </jaxws:properties>
     </jaxws:endpoint>
@@ -65,7 +65,7 @@
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+            <entry key="security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
             <entry key="ws-security.saml2.validator" value-ref="allowUnsignedBearerAssertions"/>
         </jaxws:properties>
@@ -87,7 +87,7 @@
             <entry key="security.signature.username" value="bob"/>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
             <entry key="ws-security.signature.properties" value="alice.properties"/>
-            <entry key="ws-security.encryption.username" value="alice"/>
+            <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/2a5d201b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml
index 5186336..8da40ff 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml
@@ -52,7 +52,7 @@
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+            <entry key="security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
@@ -61,7 +61,7 @@
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+            <entry key="security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
@@ -70,7 +70,7 @@
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.username" value="useReqSigCert"/>
+            <entry key="security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
             <entry key="ws-security.enable.streaming" value="true"/>
             <entry key="ws-security.saml2.validator" value-ref="allowUnsignedBearerAssertions"/>
@@ -95,7 +95,7 @@
             <entry key="security.signature.username" value="bob"/>
             <entry key="ws-security.encryption.properties" value="bob.properties"/>
             <entry key="ws-security.signature.properties" value="alice.properties"/>
-            <entry key="ws-security.encryption.username" value="alice"/>
+            <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>


Mime
View raw message