cxf-commits mailing list archives

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


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

Branch: refs/heads/master
Commit: 9a2c82620001b76a2065960686f9bc8f384c4d58
Parents: 5577461
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Apr 17 10:39:09 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Apr 17 10:39:09 2015 +0100

----------------------------------------------------------------------
 .../src/main/resources/etc/policy-asym.xml      |  4 +-
 .../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 +-
 .../src/main/resources/ServiceConfig.xml        |  2 +-
 .../src/main/resources/ServiceConfigStax.xml    |  2 +-
 .../main/webapp/WEB-INF/cxf-encrypted-ut.xml    |  2 +-
 .../sts-war/src/main/webapp/WEB-INF/cxf-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 |  4 +-
 .../cxf/systest/sts/caching/cxf-client.xml      |  2 +-
 .../cxf/systest/sts/caching/cxf-service.xml     |  4 +-
 .../cxf/systest/sts/claims/cxf-service.xml      | 10 +--
 .../cxf/systest/sts/claims/stax-cxf-service.xml | 10 +--
 .../systest/sts/cross_domain/cxf-service.xml    |  4 +-
 .../systest/sts/cross_domain/cxf-sts-saml2.xml  |  2 +-
 .../sts/custom_onbehalfof/cxf-service.xml       |  2 +-
 .../sts/distributed_caching/cxf-service.xml     |  6 +-
 .../systest/sts/kerberos/cxf-intermediary.xml   |  2 +-
 .../cxf/systest/sts/kerberos/cxf-service.xml    |  2 +-
 .../apache/cxf/systest/sts/renew/cxf-client.xml |  6 +-
 .../cxf/systest/sts/renew/cxf-service.xml       |  8 +-
 .../cxf/systest/sts/secure_conv/cxf-service.xml |  6 +-
 .../cxf/systest/sts/soap12/cxf-service.xml      |  2 +-
 .../cxf/systest/sts/soap12/stax-cxf-service.xml |  2 +-
 .../sts/sts_sender_vouches/cxf-client.xml       |  2 +-
 .../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 +-
 .../cxf/systest/sts/bearer/cxf-service.xml      |  4 +-
 .../cxf/systest/sts/bearer/cxf-stax-service.xml |  4 +-
 .../systest/sts/deployment/cxf-encrypted-ut.xml |  2 +-
 .../systest/sts/deployment/cxf-transport.xml    |  4 +-
 .../cxf/systest/sts/deployment/cxf-ut.xml       |  2 +-
 .../cxf/systest/sts/deployment/cxf-x509.xml     |  2 +-
 .../sts/deployment/stax-cxf-encrypted-ut.xml    |  2 +-
 .../sts/deployment/stax-cxf-transport.xml       |  4 +-
 .../cxf/systest/sts/deployment/stax-cxf-ut.xml  |  2 +-
 .../systest/sts/deployment/stax-cxf-x509.xml    |  2 +-
 .../cxf-bad-client.xml                          |  2 +-
 .../intermediary_transformation/cxf-client.xml  |  2 +-
 .../cxf-intermediary-caching.xml                |  2 +-
 .../cxf-intermediary.xml                        |  2 +-
 .../intermediary_transformation/cxf-service.xml |  2 +-
 .../cxf/systest/sts/issuer/cxf-service.xml      |  6 +-
 .../cxf/systest/sts/stsclient/cxf-service.xml   |  2 +-
 .../cxf/systest/sts/symmetric/cxf-service.xml   |  8 +-
 .../systest/sts/symmetric/cxf-stax-service.xml  |  8 +-
 .../cxf/systest/sts/template/cxf-client.xml     |  4 +-
 .../cxf/systest/sts/template/cxf-service.xml    |  4 +-
 .../systest/sts/template/cxf-stax-service.xml   |  4 +-
 .../systest/sts/transport/cxf-bad-client.xml    |  2 +-
 .../cxf/systest/sts/transport/cxf-client.xml    |  4 +-
 .../cxf/systest/sts/transport/cxf-service.xml   |  8 +-
 .../systest/sts/transport/cxf-stax-service.xml  |  8 +-
 .../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  |  8 +-
 .../sts/x509_symmetric/cxf-stax-service.xml     |  8 +-
 .../systest/kerberos/wssec/kerberos/client.xml  | 10 +--
 .../systest/kerberos/wssec/kerberos/server.xml  | 26 +++---
 .../kerberos/wssec/kerberos/stax-server.xml     | 24 +++---
 .../kerberos/wssec/kerberos/sts-client.xml      |  2 +-
 .../jaxrs/security/oauth2/JAXRSOAuth2Test.java  |  2 +-
 .../systest/jaxrs/security/oauth2/server.xml    |  4 +-
 .../jaxrs/security/saml/JAXRSSamlTest.java      |  2 +-
 .../cxf/systest/jaxrs/security/saml/server.xml  |  6 +-
 .../jaxrs/security/xml/JAXRSXmlSecTest.java     | 18 ++--
 .../cxf/systest/jaxrs/security/xml/server.xml   | 12 +--
 .../systest/jaxrs/security/xml/stax-server.xml  | 12 +--
 .../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  | 14 ++--
 .../cxf/systest/wssec/examples/saml/server.xml  | 14 ++--
 .../systest/wssec/examples/saml/stax-server.xml | 14 ++--
 .../systest/wssec/examples/secconv/client.xml   |  2 +-
 .../systest/wssec/examples/secconv/server.xml   |  2 +-
 .../wssec/examples/secconv/stax-server.xml      |  2 +-
 .../wssec/examples/sts/cxf-symmetric.xml        |  2 +-
 .../cxf/systest/wssec/examples/ut/client.xml    |  2 +-
 .../cxf/systest/wssec/examples/ut/server.xml    |  6 +-
 .../systest/wssec/examples/ut/stax-server.xml   |  6 +-
 .../cxf/systest/wssec/examples/x509/client.xml  |  6 +-
 .../cxf/systest/wssec/examples/x509/server.xml  |  8 +-
 .../systest/wssec/examples/x509/stax-server.xml |  8 +-
 .../ws/policy/handler/HelloServiceImpl.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/server.xml   | 12 +--
 .../cxf/systest/ws/algsuite/stax-server.xml     | 10 +--
 .../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/server.xml  |  4 +-
 .../cxf/systest/ws/fault/client-untrusted.xml   |  2 +-
 .../org/apache/cxf/systest/ws/fault/client.xml  |  2 +-
 .../cxf/systest/ws/fault/modified-server.xml    |  4 +-
 .../org/apache/cxf/systest/ws/fault/server.xml  |  6 +-
 .../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/server.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 | 10 +--
 .../org/apache/cxf/systest/ws/policy/server.xml | 10 +--
 .../org/apache/cxf/systest/ws/saml/client.xml   | 24 +++---
 .../org/apache/cxf/systest/ws/saml/server.xml   | 38 ++++-----
 .../apache/cxf/systest/ws/saml/stax-server.xml  | 38 ++++-----
 .../cxf/systest/ws/saml/subjectconf/server.xml  |  2 +-
 .../systest/ws/saml/subjectconf/stax-server.xml |  2 +-
 .../apache/cxf/systest/ws/swa/policy-client.xml |  2 +-
 .../apache/cxf/systest/ws/swa/policy-server.xml | 10 +--
 .../cxf/systest/ws/swa/stax-policy-server.xml   | 10 +--
 .../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 ++--
 .../org/apache/cxf/systest/ws/ut/client.xml     |  4 +-
 .../apache/cxf/systest/ws/ut/server-derived.xml |  6 +-
 .../org/apache/cxf/systest/ws/ut/server.xml     |  4 +-
 .../apache/cxf/systest/ws/ut/stax-server.xml    |  4 +-
 .../org/apache/cxf/systest/ws/wssc/client.xml   |  4 +-
 .../apache/cxf/systest/ws/wssc/unit-server.xml  |  4 +-
 .../apache/cxf/systest/ws/wssec10/client.xml    |  4 +-
 .../systest/ws/wssec10/client_restricted.xml    |  4 +-
 .../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   | 64 +++++++--------
 .../org/apache/cxf/systest/ws/x509/server.xml   | 86 ++++++++++----------
 .../apache/cxf/systest/ws/x509/stax-server.xml  | 86 ++++++++++----------
 .../org/apache/cxf/systest/ws/xkms/client.xml   |  2 +-
 .../org/apache/cxf/systest/ws/xkms/server.xml   |  4 +-
 .../apache/cxf/systest/ws/xkms/stax-server.xml  |  4 +-
 157 files changed, 696 insertions(+), 696 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml
----------------------------------------------------------------------
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml
index a18e004..8056d89 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml
+++ b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-asym.xml
@@ -22,13 +22,13 @@
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
             <entry key="security.encryption.properties" value="etc/clientKeystore.properties"/>
-            <entry key="ws-security.signature.properties" value="etc/serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="etc/serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
     <jaxws:client name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.signature.properties" value="etc/clientKeystore.properties"/>
+            <entry key="security.signature.properties" value="etc/clientKeystore.properties"/>
             <entry key="security.encryption.properties" value="etc/serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 b76996c..78c28c5 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
@@ -25,7 +25,7 @@
     </cxf:bus>
     <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="security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.signature.username" value="myclientkey"/>
             <entry key="security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
             <entry key="security.encryption.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 5645521..35efacd 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
@@ -25,7 +25,7 @@
     </cxf:bus>
     <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="security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.signature.username" value="myclientkey"/>
             <entry key="security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
             <entry key="security.encryption.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 94cf9f2..78b7b36 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
@@ -27,7 +27,7 @@
         <jaxws:properties>
             <entry key="security.signature.username" value="myservicekey"/>
             <entry key="security.callback-handler" value="demo.wssec.server.ServerCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="security.encryption.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 be91507..dc2192b 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
@@ -27,7 +27,7 @@
         <jaxws:properties>
             <entry key="security.signature.username" value="myservicekey"/>
             <entry key="security.callback-handler" value="demo.wssec.server.ServerCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="security.encryption.properties" value="serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 2b21821..104376f 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
@@ -55,7 +55,7 @@
     <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="UTSTS" implementor="#utSTSProviderBean" address="http://localhost:8080/SecurityTokenService/UT" wsdlLocation="wsdl/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:UT_Port">
         <jaxws:properties>
             <entry key="security.callback-handler" value="demo.wssec.sts.STSCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
+            <entry key="security.signature.properties" value="stsKeystore.properties"/>
             <entry key="security.signature.username" value="mystskey"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 331187f..6ddc581 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
@@ -55,7 +55,7 @@
     <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="UTSTS" implementor="#utSTSProviderBean" address="http://localhost:8080/SecurityTokenService/UT" wsdlLocation="wsdl/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:UT_Port">
         <jaxws:properties>
             <entry key="security.callback-handler" value="demo.wssec.sts.STSCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
+            <entry key="security.signature.properties" value="stsKeystore.properties"/>
             <entry key="security.signature.username" value="mystskey"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfig.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfig.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfig.xml
index be2140a..fd095b5 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfig.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfig.xml
@@ -32,7 +32,7 @@
   -->
     <jaxws:endpoint xmlns:s="http://apache.org/hello_world_soap_http" id="server" endpointName="s:SoapPort" serviceName="s:SOAPService" implementor="demo.wssec.server.GreeterImpl" address="http://localhost:9001/SoapContext/SoapPort" wsdlLocation="src/main/resources/hello_world.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.properties" value="etc/Server_Decrypt.properties"/>
+            <entry key="security.signature.properties" value="etc/Server_Decrypt.properties"/>
             <entry key="security.callback-handler" value="demo.wssec.server.UTPasswordCallback"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfigStax.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfigStax.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfigStax.xml
index 4d421dd..6091ee9 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfigStax.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ServiceConfigStax.xml
@@ -32,7 +32,7 @@
   -->
     <jaxws:endpoint xmlns:s="http://apache.org/hello_world_soap_http" id="server" endpointName="s:SoapPort" serviceName="s:SOAPService" implementor="demo.wssec.server.GreeterImpl" address="http://localhost:9001/SoapContext/SoapPort" wsdlLocation="src/main/resources/hello_world.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.signature.properties" value="etc/Server_Decrypt.properties"/>
+            <entry key="security.signature.properties" value="etc/Server_Decrypt.properties"/>
             <entry key="security.callback-handler" value="demo.wssec.server.UTPasswordCallback"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 fb9aa67..ac56be8 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
@@ -51,7 +51,7 @@
     <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="EncryptedUTSTS" implementor="#encryptedUtSTSProviderBean" address="/UTEncrypted" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:UTEncrypted_Port">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
+            <entry key="security.signature.properties" value="stsKeystore.properties"/>
             <entry key="security.signature.username" value="mystskey"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml b/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml
index 7dac6a4..d091733 100644
--- a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml
+++ b/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-ut.xml
@@ -45,7 +45,7 @@
     <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="UTSTS" implementor="#utSTSProviderBean" address="/UT" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:UT_Port">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
+            <entry key="security.signature.properties" value="stsKeystore.properties"/>
             <!-- Below needs to be set to non-default value of false for Metro clients -->
             <entry key="ws-security.is-bsp-compliant" value="false"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 d8531fa..c9c2557 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
@@ -60,7 +60,7 @@
     <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="X509STS" implementor="#x509STSProviderBean" address="/X509" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:X509_Port">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
+            <entry key="security.signature.properties" value="stsKeystore.properties"/>
             <entry key="security.signature.username" value="mystskey"/>
             <entry key="security.encryption.username" value="useReqSigCert"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 325fbac..6dc2cf2 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
@@ -57,7 +57,7 @@
     <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="X509STS" implementor="#x509STSProviderBean" address="http://localhost:${testutil.ports.STSServer}/SecurityTokenService/X509" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:X509_Port">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
+            <entry key="security.signature.properties" value="stsKeystore.properties"/>
             <entry key="security.signature.username" value="mystskey"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 be1fd09..25fca3b 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
@@ -57,7 +57,7 @@
     <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="X509STS" implementor="#x509STSProviderBean" address="http://localhost:${testutil.ports.StaxSTSServer}/SecurityTokenService/X509" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/asymmetric_encr/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:X509_Port">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
+            <entry key="security.signature.properties" value="stsKeystore.properties"/>
             <entry key="security.signature.username" value="mystskey"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 240ebd9..2136e1c 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
@@ -25,7 +25,7 @@
     </cxf:bus>
     <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="security.signature.properties" value="eveKeystore.properties"/>
             <entry key="security.signature.username" value="eve"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="security.encryption.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 c050fb7..38dcb91 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
@@ -25,7 +25,7 @@
     </cxf:bus>
     <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="security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.signature.username" value="myclientkey"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="security.encryption.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 2d9d84a..40cb75e 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
@@ -32,7 +32,7 @@
             </entry>
             <entry key="security.signature.username" value="myservicekey"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="security.encryption.username" value="useReqSigCert"/>
             <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/9a2c8262/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 4882ef9..06ed63c 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
@@ -32,7 +32,7 @@
             </entry>
             <entry key="security.signature.username" value="myservicekey"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.enable.streaming" value="true"/>
             <entry key="ws-security.sts.client">

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 def5d03..84e69df 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
@@ -22,7 +22,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1alternative" implementor="org.apache.cxf.systest.sts.caching.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1AlternativePort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.CachingServer}/doubleit/services/doubleittransportsaml1alternative" wsdlLocation="org/apache/cxf/systest/sts/caching/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml1.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator">
                     <constructor-arg value="true"/>
@@ -63,7 +63,7 @@
                 <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
             </entry>
             <entry key="security.signature.username" value="myservicekey"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="security.encryption.properties" value="serviceKeystore.properties"/>
             <entry key="security.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.sts.client">

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 8782a71..4ff985b 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
@@ -62,7 +62,7 @@
     </jaxws:client>
     <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="security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.signature.username" value="myclientkey"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="security.encryption.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml
index 571233f..58ea81b 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml
@@ -22,7 +22,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1" wsdlLocation="org/apache/cxf/systest/sts/caching/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml1.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
             </entry>
@@ -31,7 +31,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml12" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1Port2" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml12" wsdlLocation="org/apache/cxf/systest/sts/caching/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml1.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
             </entry>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml
index 530420f..11068a5 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml
@@ -22,7 +22,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1claims" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1ClaimsPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1claims" wsdlLocation="org/apache/cxf/systest/sts/claims/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml1.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.ClaimsValidator"/>
             </entry>
@@ -31,7 +31,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1customclaims" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1CustomClaimsPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1customclaims" wsdlLocation="org/apache/cxf/systest/sts/claims/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml1.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.ClaimsValidator"/>
             </entry>
@@ -40,7 +40,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2claims" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2ClaimsPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2claims" wsdlLocation="org/apache/cxf/systest/sts/claims/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.ClaimsValidator"/>
             </entry>
@@ -49,7 +49,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1failingclaims" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1FailingClaimsPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1failingclaims" wsdlLocation="org/apache/cxf/systest/sts/claims/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml1.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.ClaimsValidator"/>
             </entry>
@@ -58,7 +58,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2childclaims" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2ChildClaimsPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2childclaims" wsdlLocation="org/apache/cxf/systest/sts/claims/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.ClaimsValidator"/>
             </entry>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml
index 266502e..b1c410c 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml
@@ -22,7 +22,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1claims" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1ClaimsPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml1claims" wsdlLocation="org/apache/cxf/systest/sts/claims/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml1.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.StaxClaimsValidator"/>
             </entry>
@@ -32,7 +32,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1customclaims" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1CustomClaimsPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml1customclaims" wsdlLocation="org/apache/cxf/systest/sts/claims/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml1.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.StaxClaimsValidator"/>
             </entry>
@@ -42,7 +42,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2claims" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2ClaimsPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml2claims" wsdlLocation="org/apache/cxf/systest/sts/claims/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.StaxClaimsValidator"/>
             </entry>
@@ -52,7 +52,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1failingclaims" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1FailingClaimsPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml1failingclaims" wsdlLocation="org/apache/cxf/systest/sts/claims/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml1.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.StaxClaimsValidator"/>
             </entry>
@@ -62,7 +62,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2childclaims" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2ChildClaimsPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml2childclaims" wsdlLocation="org/apache/cxf/systest/sts/claims/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.StaxClaimsValidator"/>
             </entry>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
index 3ff409b..bc820ef 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
@@ -25,7 +25,7 @@
                 <bean class="org.apache.cxf.systest.sts.cross_domain.CrossDomainValidator"/>
             </entry>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitcrossdomainmex" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItCrossDomainMEXPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleitcrossdomainmex" wsdlLocation="org/apache/cxf/systest/sts/cross_domain/DoubleIt.wsdl">
@@ -34,7 +34,7 @@
                 <bean class="org.apache.cxf.systest.sts.cross_domain.CrossDomainValidator"/>
             </entry>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
     

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
index f35c23e..91f2d2c 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
@@ -64,7 +64,7 @@
     <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="BSTS" implementor="#transportSTSProviderBean" address="https://localhost:30102/SecurityTokenService/b" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/cross_domain/sts-b.wsdl" depends-on="ClientAuthHttpsSettings" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_STSB_Port">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
+            <entry key="security.signature.properties" value="stsKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
     <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
index 35f3e8f..e37ac2a 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
@@ -22,7 +22,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportbst" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportCustomBSTPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportcustombst" wsdlLocation="org/apache/cxf/systest/sts/custom_onbehalfof/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.bst.validator">
                 <bean class="org.apache.cxf.systest.sts.custom_onbehalfof.CustomBSTTokenValidator"/>
             </entry>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
index 08cc1b6..6a7e7c0 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
@@ -22,7 +22,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsct" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSCTPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsct" wsdlLocation="org/apache/cxf/systest/sts/distributed_caching/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.sct.validator">
                 <bean class="org.apache.cxf.systest.sts.distributed_caching.SCTTokenValidator"/>
             </entry>
@@ -39,7 +39,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSAMLPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml" wsdlLocation="org/apache/cxf/systest/sts/distributed_caching/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.distributed_caching.SCTTokenValidator">
                     <constructor-arg value="true"/>
@@ -58,7 +58,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportut" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItUsernameTokenPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportut" wsdlLocation="org/apache/cxf/systest/sts/distributed_caching/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.ut.validator">
                 <bean class="org.apache.cxf.systest.sts.distributed_caching.SCTTokenValidator">
                     <constructor-arg value="true"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
index 8abcc90..cdfc7d7 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
@@ -56,7 +56,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Port" createdFromAPI="true">
         <jaxws:properties>
             <entry key="security.username" value="myclientkey"/>
-            <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
+            <entry key="security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml
index b43456b..8c0a9a6 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml
@@ -27,7 +27,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2" implementor="org.apache.cxf.systest.sts.kerberos.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2" wsdlLocation="org/apache/cxf/systest/sts/kerberos/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
     <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 7c0c7cf..b3c6ae0 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
@@ -28,7 +28,7 @@
         <jaxws:properties>
             <entry key="security.username" value="alice"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
+            <entry key="security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.signature.username" value="myclientkey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -90,7 +90,7 @@
         <jaxws:properties>
             <entry key="security.username" value="alice"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
+            <entry key="security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.signature.username" value="myclientkey"/>
             <entry key="ws-security.sts.client" value-ref="saml2STSClient" />
         </jaxws:properties>
@@ -117,7 +117,7 @@
         <jaxws:properties>
             <entry key="security.username" value="alice"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
+            <entry key="security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.signature.username" value="myclientkey"/>
             <entry key="ws-security.sts.client" value-ref="saml2STSNoRenewClient" />
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
index 959604d..7a3eee8 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
@@ -27,25 +27,25 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSaml1Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1" wsdlLocation="org/apache/cxf/systest/sts/renew/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSaml1BearerPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1bearer" wsdlLocation="org/apache/cxf/systest/sts/renew/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSaml2Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2" wsdlLocation="org/apache/cxf/systest/sts/renew/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2norenew" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSaml2NoRenewPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2norenew" wsdlLocation="org/apache/cxf/systest/sts/renew/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
     <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
index 7f41dcf..ee65308 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
@@ -22,7 +22,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsecureconv" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSecureConvPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsecureconv" wsdlLocation="org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.sct.validator">
                 <bean class="org.apache.cxf.systest.sts.secure_conv.SCTTokenValidator"/>
             </entry>
@@ -40,7 +40,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsecureconv" implementor="org.apache.cxf.systest.sts.secure_conv.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSecureConvPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server.2}/doubleit/services/doubleitsymmetricsecureconv" wsdlLocation="org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.sct.validator">
                 <bean class="org.apache.cxf.systest.sts.secure_conv.SCTTokenValidator"/>
             </entry>
@@ -58,7 +58,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsupporting" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSupportingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsupporting" wsdlLocation="org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.sct.validator">
                 <bean class="org.apache.cxf.systest.sts.secure_conv.SCTTokenValidator"/>
             </entry>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
index b3bb968..71281a9 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
@@ -22,7 +22,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2" wsdlLocation="org/apache/cxf/systest/sts/soap12/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator">
                     <constructor-arg value="true"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
index e5ba1a0..86c2a6c 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
@@ -22,7 +22,7 @@
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml2" wsdlLocation="org/apache/cxf/systest/sts/soap12/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSStaxTokenValidator">
                     <constructor-arg value="true"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 a4c699b..5de77bc 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
@@ -42,7 +42,7 @@
     </bean>
     <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="security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.signature.username" value="myclientkey"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="security.encryption.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 c1de616..6f84508 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
@@ -23,7 +23,7 @@
         <jaxws:properties>
             <entry key="security.signature.username" value="myservicekey"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="security.encryption.properties" value="clientKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 b31c8cc..652848b 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
@@ -55,7 +55,7 @@
     <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="UTSTS" implementor="#utSTSProviderBean" address="http://localhost:${testutil.ports.STSServer}/SecurityTokenService/UT" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:UT_Port">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
+            <entry key="security.signature.properties" value="stsKeystore.properties"/>
             <entry key="security.signature.username" value="mystskey"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 16f8e69..a7fd9a3 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
@@ -55,7 +55,7 @@
     <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="UTSTS" implementor="#utSTSProviderBean" address="http://localhost:${testutil.ports.StaxSTSServer}/SecurityTokenService/UT" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/sts_sender_vouches/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:UT_Port">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
+            <entry key="security.signature.properties" value="stsKeystore.properties"/>
             <entry key="security.signature.username" value="mystskey"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 90eb77a..bb3f7a6 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
@@ -43,7 +43,7 @@
     </bean>
     <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="security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.signature.username" value="myclientkey"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="security.encryption.properties" value="clientKeystore.properties"/>
@@ -53,7 +53,7 @@
     </jaxws:client>
     <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="security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.signature.username" value="myclientkey"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="security.encryption.properties" value="clientKeystore.properties"/>
@@ -63,7 +63,7 @@
     </jaxws:client>
     <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="security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.signature.username" value="myclientkey"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="security.encryption.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 64bf7b9..69fb76b 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
@@ -23,7 +23,7 @@
         <jaxws:properties>
             <entry key="security.signature.username" value="myservicekey"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
         </jaxws:properties>
     </jaxws:endpoint>
@@ -31,14 +31,14 @@
         <jaxws:properties>
             <entry key="security.signature.username" value="myservicekey"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="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="security.signature.username" value="myservicekey"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
         </jaxws:properties>
     </jaxws:endpoint>


Mime
View raw message