Return-Path: 
 <commits-return-36327-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E975E10B04
	for <apmail-cxf-commits-archive@www.apache.org>;
 Fri, 17 Apr 2015 10:11:12 +0000 (UTC)
Received: (qmail 62939 invoked by uid 500); 17 Apr 2015 10:11:12 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 62710 invoked by uid 500); 17 Apr 2015 10:11:12 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 62035 invoked by uid 99); 17 Apr 2015 10:11:12 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Apr 2015 10:11:12 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 29E66E0B3F; Fri, 17 Apr 2015 10:11:12 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: coheigea@apache.org
To: commits@cxf.apache.org
Date: Fri, 17 Apr 2015 10:11:17 -0000
Message-Id: <222e72dd57464f39a0115b6b317155aa@git.apache.org>
In-Reply-To: <e362ed2e95324af6a05e78188f7c145b@git.apache.org>
References: <e362ed2e95324af6a05e78188f7c145b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [07/38] cxf git commit: Switching signature username

Switching signature username


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

Branch: refs/heads/master
Commit: 93039ab86bea4f2bdac4e5eec4229d3271f4c7ec
Parents: 354ac95
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Apr 17 10:33:05 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Apr 17 10:33:05 2015 +0100

----------------------------------------------------------------------
 .../src/main/resources/wssec-client-stax.xml    |  2 +-
 .../sts/src/main/resources/wssec-client.xml     |  2 +-
 .../src/main/resources/wssec-server-stax.xml    |  2 +-
 .../sts/src/main/resources/wssec-server.xml     |  2 +-
 .../sts/src/main/resources/wssec-sts-stax.xml   |  2 +-
 .../sts/src/main/resources/wssec-sts.xml        |  2 +-
 .../main/webapp/WEB-INF/cxf-encrypted-ut.xml    |  2 +-
 .../src/main/webapp/WEB-INF/cxf-x509.xml        |  2 +-
 .../cxf/systest/sts/asymmetric_encr/cxf-sts.xml |  2 +-
 .../sts/asymmetric_encr/stax-cxf-sts.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 +-
 .../apache/cxf/systest/sts/renew/cxf-client.xml |  6 +-
 .../sts/sts_sender_vouches/cxf-client.xml       |  2 +-
 .../sts/sts_sender_vouches/cxf-service.xml      |  2 +-
 .../systest/sts/sts_sender_vouches/cxf-sts.xml  |  2 +-
 .../sts/sts_sender_vouches/stax-cxf-sts.xml     |  2 +-
 .../cxf/systest/sts/asymmetric/cxf-client.xml   |  6 +-
 .../cxf/systest/sts/asymmetric/cxf-service.xml  |  6 +-
 .../systest/sts/asymmetric/cxf-stax-service.xml |  6 +-
 .../systest/sts/deployment/cxf-encrypted-ut.xml |  2 +-
 .../cxf/systest/sts/deployment/cxf-x509.xml     |  2 +-
 .../sts/deployment/stax-cxf-encrypted-ut.xml    |  2 +-
 .../systest/sts/deployment/stax-cxf-x509.xml    |  2 +-
 .../systest/sts/username_actas/cxf-client.xml   | 20 +++----
 .../systest/sts/username_actas/cxf-service.xml  | 10 ++--
 .../systest/sts/username_actas/cxf-service2.xml | 10 ++--
 .../sts/username_onbehalfof/cxf-client.xml      | 20 +++----
 .../sts/username_onbehalfof/cxf-service.xml     | 10 ++--
 .../sts/username_onbehalfof/cxf-service2.xml    | 10 ++--
 .../systest/sts/x509_symmetric/cxf-client.xml   |  2 +-
 .../systest/sts/x509_symmetric/cxf-service.xml  |  2 +-
 .../sts/x509_symmetric/cxf-stax-service.xml     |  2 +-
 .../systest/kerberos/wssec/kerberos/client.xml  | 10 ++--
 .../jaxrs/security/oauth2/JAXRSOAuth2Test.java  |  2 +-
 .../jaxrs/security/saml/JAXRSSamlTest.java      |  2 +-
 .../security/saml/SamlCallbackHandler.java      |  2 +-
 .../jaxrs/security/xml/JAXRSXmlSecTest.java     | 14 ++---
 .../cxf/systest/ws/rm/sec/client-policy.xml     |  2 +-
 .../cxf/systest/wssec/examples/saml/client.xml  | 14 ++---
 .../cxf/systest/wssec/examples/saml/server.xml  |  4 +-
 .../systest/wssec/examples/saml/stax-server.xml |  4 +-
 .../systest/wssec/examples/secconv/client.xml   |  2 +-
 .../cxf/systest/wssec/examples/ut/client.xml    |  2 +-
 .../cxf/systest/wssec/examples/x509/client.xml  |  6 +-
 .../cxf/systest/wssec/examples/x509/server.xml  |  4 +-
 .../systest/wssec/examples/x509/stax-server.xml |  4 +-
 .../ws/policy/handler/HelloServiceImpl.java     |  2 +-
 .../apache/cxf/systest/ws/bindings/client.xml   | 42 +++++++-------
 .../cxf/systest/ws/fault/client-untrusted.xml   |  2 +-
 .../org/apache/cxf/systest/ws/fault/client.xml  |  2 +-
 .../org/apache/cxf/systest/ws/gcm/client.xml    |  6 +-
 .../org/apache/cxf/systest/ws/parts/client.xml  | 42 +++++++-------
 .../org/apache/cxf/systest/ws/policy/client.xml | 10 ++--
 .../org/apache/cxf/systest/ws/saml/client.xml   | 24 ++++----
 .../apache/cxf/systest/ws/swa/policy-client.xml |  2 +-
 .../org/apache/cxf/systest/ws/tokens/client.xml | 18 +++---
 .../cxf/systest/ws/tokens/endorsing-client.xml  | 12 ++--
 .../org/apache/cxf/systest/ws/ut/client.xml     |  4 +-
 .../org/apache/cxf/systest/ws/x509/client.xml   | 60 ++++++++++----------
 .../org/apache/cxf/systest/ws/xkms/client.xml   |  2 +-
 65 files changed, 229 insertions(+), 229 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 767dac2..7ab0920 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
@@ -26,7 +26,7 @@
     <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 5115ebf..a55a499 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
@@ -26,7 +26,7 @@
     <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/distribution/src/main/release/samples/sts/src/main/resources/wssec-server-stax.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-server-stax.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-server-stax.xml
index 33d6e44..5cdde90 100644
--- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-server-stax.xml
+++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-server-stax.xml
@@ -25,7 +25,7 @@
     </cxf:bus>
     <jaxws:endpoint xmlns:s="http://apache.org/hello_world_soap_http" id="server" implementor="demo.wssec.server.GreeterImpl" endpointName="s:SoapPort" serviceName="s:SOAPService" address="http://localhost:9001/SoapContext/SoapPort" wsdlLocation="wsdl/hello_world.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <entry key="security.signature.username" value="myservicekey"/>
             <entry key="ws-security.callback-handler" value="demo.wssec.server.ServerCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/distribution/src/main/release/samples/sts/src/main/resources/wssec-server.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-server.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-server.xml
index 2abe847..3b55a4f 100644
--- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-server.xml
+++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-server.xml
@@ -25,7 +25,7 @@
     </cxf:bus>
     <jaxws:endpoint xmlns:s="http://apache.org/hello_world_soap_http" id="server" implementor="demo.wssec.server.GreeterImpl" endpointName="s:SoapPort" serviceName="s:SOAPService" address="http://localhost:9001/SoapContext/SoapPort" wsdlLocation="wsdl/hello_world.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <entry key="security.signature.username" value="myservicekey"/>
             <entry key="ws-security.callback-handler" value="demo.wssec.server.ServerCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml
index e153c38..b759b36 100644
--- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml
+++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts-stax.xml
@@ -56,7 +56,7 @@
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="demo.wssec.sts.STSCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="mystskey"/>
+            <entry key="security.signature.username" value="mystskey"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts.xml b/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts.xml
index ccfc3cf..68b2802 100644
--- a/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts.xml
+++ b/distribution/src/main/release/samples/sts/src/main/resources/wssec-sts.xml
@@ -56,7 +56,7 @@
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="demo.wssec.sts.STSCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="mystskey"/>
+            <entry key="security.signature.username" value="mystskey"/>
         </jaxws:properties>
     </jaxws:endpoint>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml b/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
index 666001b..c513a87 100644
--- a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
+++ b/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
@@ -52,7 +52,7 @@
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="mystskey"/>
+            <entry key="security.signature.username" value="mystskey"/>
         </jaxws:properties>
     </jaxws:endpoint>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 a3df490..303a539 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
@@ -61,7 +61,7 @@
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="mystskey"/>
+            <entry key="security.signature.username" value="mystskey"/>
             <entry key="ws-security.encryption.username" value="useReqSigCert"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml
index 5fb3803..5b34b19 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/cxf-sts.xml
@@ -58,7 +58,7 @@
         <jaxws:properties>
             <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="ws-security.signature.username" value="mystskey"/>
+            <entry key="security.signature.username" value="mystskey"/>
         </jaxws:properties>
     </jaxws:endpoint>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml
index f77dc43..ec80544 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/stax-cxf-sts.xml
@@ -58,7 +58,7 @@
         <jaxws:properties>
             <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="ws-security.signature.username" value="mystskey"/>
+            <entry key="security.signature.username" value="mystskey"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 2e3480b..c22d563 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
@@ -26,7 +26,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricBSTPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="eveKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="eve"/>
+            <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"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 78c6caf..86aa445 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
@@ -26,7 +26,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricBSTPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 f2e8db4..dde0af2 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
@@ -30,7 +30,7 @@
             <entry key="ws-security.bst.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
             </entry>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 506741e..2fc3f14 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
@@ -30,7 +30,7 @@
             <entry key="ws-security.bst.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSStaxTokenValidator"/>
             </entry>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 aa9ed5c..cb66b45 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
@@ -62,7 +62,7 @@
             <entry key="ws-security.bst.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
             </entry>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 9ae6bdf..0d9467a 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
@@ -63,7 +63,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricBSTPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 f997ceb..9f5bc4b 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
@@ -29,7 +29,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.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <entry key="security.signature.username" value="myclientkey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
                     <constructor-arg ref="cxf"/>
@@ -91,7 +91,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.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <entry key="security.signature.username" value="myclientkey"/>
             <entry key="ws-security.sts.client" value-ref="saml2STSClient" />
         </jaxws:properties>
     </jaxws:client>
@@ -118,7 +118,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.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <entry key="security.signature.username" value="myclientkey"/>
             <entry key="ws-security.sts.client" value-ref="saml2STSNoRenewClient" />
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 bfe636d..7c26752 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
@@ -43,7 +43,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSAML2Port" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-service.xml
index 4a451d9..7880d1f 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-service.xml
@@ -21,7 +21,7 @@
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2" wsdlLocation="org/apache/cxf/systest/sts/sts_sender_vouches/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml
index e8c3728..acb33ec 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/cxf-sts.xml
@@ -56,7 +56,7 @@
         <jaxws:properties>
             <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="ws-security.signature.username" value="mystskey"/>
+            <entry key="security.signature.username" value="mystskey"/>
         </jaxws:properties>
     </jaxws:endpoint>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml
index 7975d7b..75f3971 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/stax-cxf-sts.xml
@@ -56,7 +56,7 @@
         <jaxws:properties>
             <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="ws-security.signature.username" value="mystskey"/>
+            <entry key="security.signature.username" value="mystskey"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 908da53..88ad908 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
@@ -44,7 +44,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSAML1Port" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>
@@ -54,7 +54,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSAML2Port" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>
@@ -64,7 +64,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSAML1EncryptedPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml
index 473ad2c..e45558c 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-service.xml
@@ -21,7 +21,7 @@
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML1Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml1" wsdlLocation="org/apache/cxf/systest/sts/asymmetric/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.is-bsp-compliant" value="false"/>
@@ -29,14 +29,14 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2" wsdlLocation="org/apache/cxf/systest/sts/asymmetric/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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"/>
         </jaxws:properties>
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml1encrypted" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML1EncryptedPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml1encrypted" wsdlLocation="org/apache/cxf/systest/sts/asymmetric/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.is-bsp-compliant" value="false"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml
index 76741a6..fa215a6 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/cxf-stax-service.xml
@@ -21,7 +21,7 @@
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML1Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleitasymmetricsaml1" wsdlLocation="org/apache/cxf/systest/sts/asymmetric/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.is-bsp-compliant" value="false"/>
@@ -30,7 +30,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleitasymmetricsaml2" wsdlLocation="org/apache/cxf/systest/sts/asymmetric/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.enable.streaming" value="true"/>
@@ -38,7 +38,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml1encrypted" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML1EncryptedPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleitasymmetricsaml1encrypted" wsdlLocation="org/apache/cxf/systest/sts/asymmetric/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.is-bsp-compliant" value="false"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
index 25b04da..1a17c5b 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
@@ -53,7 +53,7 @@
         <jaxws:properties>
             <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="ws-security.signature.username" value="mystskey"/>
+            <entry key="security.signature.username" value="mystskey"/>
         </jaxws:properties>
     </jaxws:endpoint>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 43f22e1..6f177e6 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
@@ -69,7 +69,7 @@
         <jaxws:properties>
             <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="ws-security.signature.username" value="mystskey"/>
+            <entry key="security.signature.username" value="mystskey"/>
             <entry key="ws-security.encryption.username" value="useReqSigCert"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-encrypted-ut.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-encrypted-ut.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-encrypted-ut.xml
index 49934d6..432ac8d 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-encrypted-ut.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-encrypted-ut.xml
@@ -53,7 +53,7 @@
         <jaxws:properties>
             <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="ws-security.signature.username" value="mystskey"/>
+            <entry key="security.signature.username" value="mystskey"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 d93945d..9106cfa 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
@@ -69,7 +69,7 @@
         <jaxws:properties>
             <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="ws-security.signature.username" value="mystskey"/>
+            <entry key="security.signature.username" value="mystskey"/>
             <entry key="ws-security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 aa8b335..205a2e9 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
@@ -27,7 +27,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSAML2BearerPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>
@@ -40,7 +40,7 @@
                     <property name="actAs" ref="delegationCallbackHandler"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.signature.username" value="myclientkey"/>
+                            <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.signature.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
@@ -56,7 +56,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSAML2BearerPort2" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>
@@ -69,7 +69,7 @@
                     <property name="actAs" ref="delegationCallbackHandler"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.signature.username" value="myclientkey"/>
+                            <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.signature.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
@@ -85,7 +85,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSAML2BearerPort3" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>
@@ -98,7 +98,7 @@
                     <property name="actAs" ref="delegationCallbackHandler"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.signature.username" value="myclientkey"/>
+                            <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.signature.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
@@ -114,7 +114,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSAML2BearerPort4" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>
@@ -127,7 +127,7 @@
                     <property name="actAs" ref="delegationCallbackHandler"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.signature.username" value="myclientkey"/>
+                            <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.signature.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
@@ -143,7 +143,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSAML2BearerPort5" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>
@@ -156,7 +156,7 @@
                     <property name="actAs" ref="delegationCallbackHandler"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.signature.username" value="myclientkey"/>
+                            <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.signature.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
index cb76c26..27241fe 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml
@@ -21,7 +21,7 @@
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearer" wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -33,7 +33,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort2" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearer2" wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -45,7 +45,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer3" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort3" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearer3" wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -57,7 +57,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer4" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort4" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearer4" wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -70,7 +70,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer5" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort5" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearer5" wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service2.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service2.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service2.xml
index c26e1d1..f5656d6 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service2.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service2.xml
@@ -21,7 +21,7 @@
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearer" wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -33,7 +33,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort2" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearer2" wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -45,7 +45,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer3" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort3" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearer3" wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -57,7 +57,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer4" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort4" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearer4" wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -69,7 +69,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer5" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort5" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearer5" wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 c5479b6..aedf99d 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
@@ -27,7 +27,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItOBOAsymmetricSAML2BearerPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>
@@ -40,7 +40,7 @@
                     <property name="onBehalfOf" ref="delegationCallbackHandler"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.signature.username" value="myclientkey"/>
+                            <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.signature.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
@@ -56,7 +56,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItOBOAsymmetricSAML2BearerPort2" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>
@@ -69,7 +69,7 @@
                     <property name="onBehalfOf" ref="delegationCallbackHandler"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.signature.username" value="myclientkey"/>
+                            <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.signature.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
@@ -85,7 +85,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItOBOAsymmetricSAML2BearerPort3" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>
@@ -98,7 +98,7 @@
                     <property name="onBehalfOf" ref="delegationCallbackHandler"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.signature.username" value="myclientkey"/>
+                            <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.signature.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
@@ -114,7 +114,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItOBOAsymmetricSAML2BearerPort4" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>
@@ -127,7 +127,7 @@
                     <property name="onBehalfOf" ref="delegationCallbackHandler"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.signature.username" value="myclientkey"/>
+                            <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.signature.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
@@ -143,7 +143,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItOBOAsymmetricSAML2BearerPort5" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.signature.username" value="myclientkey"/>
+            <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"/>
@@ -156,7 +156,7 @@
                     <property name="onBehalfOf" ref="delegationCallbackHandler"/>
                     <property name="properties">
                         <map>
-                            <entry key="ws-security.signature.username" value="myclientkey"/>
+                            <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.signature.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
index d3965d0..8f862f4 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml
@@ -21,7 +21,7 @@
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearerobo" wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -33,7 +33,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort2" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearerobo2" wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -45,7 +45,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer3" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort3" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearerobo3" wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -57,7 +57,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer4" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort4" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearerobo4" wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -70,7 +70,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer5" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort5" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearerobo5" wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml
index e07a273..a009682 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml
@@ -21,7 +21,7 @@
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearerobo" wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -33,7 +33,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort2" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearerobo2" wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -45,7 +45,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer3" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort3" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearerobo3" wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -57,7 +57,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer4" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort4" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearerobo4" wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>
@@ -69,7 +69,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricsaml2bearer5" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort5" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearerobo5" wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.username" value="myservicekey"/>
+            <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.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 cef6329..7edcd4e 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
@@ -30,7 +30,7 @@
         <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}X509_Port"/>
         <property name="properties">
             <map>
-                <entry key="ws-security.signature.username" value="myclientkey"/>
+                <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.signature.properties" value="clientKeystore.properties"/>
                 <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 c091d53..e17b499 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
@@ -33,7 +33,7 @@
         <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}X509_Port"/>
         <property name="properties">
             <map>
-                <entry key="ws-security.signature.username" value="myservicekey"/>
+                <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.properties" value="serviceKeystore.properties"/>