cxf-commits mailing list archives

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


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

Branch: refs/heads/master
Commit: 5577461dfa57cb8c7c49d788276afbd9253d81c5
Parents: 5d38761
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Apr 17 10:37:45 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Apr 17 10:37:45 2015 +0100

----------------------------------------------------------------------
 .../src/main/resources/etc/policy-asym.xml      |  4 +-
 .../src/main/resources/etc/policy-sym.xml       |  4 +-
 .../src/main/resources/etc/policy-symsc.xml     |  4 +-
 .../src/main/resources/wssec-client-stax.xml    |  4 +-
 .../sts/src/main/resources/wssec-client.xml     |  4 +-
 .../src/main/resources/wssec-server-stax.xml    |  2 +-
 .../sts/src/main/resources/wssec-server.xml     |  2 +-
 .../src/main/resources/ClientConfig.xml         |  2 +-
 .../src/main/resources/ClientConfigStax.xml     |  2 +-
 .../sts/binarysecuritytoken/cxf-bad-client.xml  |  2 +-
 .../sts/binarysecuritytoken/cxf-client.xml      |  2 +-
 .../systest/sts/caching/cxf-caching-service.xml |  2 +-
 .../cxf/systest/sts/caching/cxf-client.xml      |  2 +-
 .../sts/sts_sender_vouches/cxf-client.xml       |  4 +-
 .../sts/sts_sender_vouches/cxf-service.xml      |  2 +-
 .../sts/symmetric/SymmetricBindingTest.java     |  2 +-
 .../cxf/systest/sts/asymmetric/cxf-client.xml   | 10 +--
 .../systest/sts/sendervouches/cxf-service.xml   |  2 +-
 .../sts/sendervouches/cxf-stax-service.xml      |  2 +-
 .../cxf/systest/sts/symmetric/cxf-client.xml    |  4 +-
 .../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   |  4 +-
 .../systest/sts/x509_symmetric/cxf-service.xml  |  2 +-
 .../sts/x509_symmetric/cxf-stax-service.xml     |  2 +-
 .../systest/kerberos/wssec/kerberos/client.xml  | 24 +++----
 .../systest/kerberos/wssec/kerberos/server.xml  |  8 +--
 .../kerberos/wssec/kerberos/stax-server.xml     |  8 +--
 .../jaxrs/security/xml/JAXRSXmlSecTest.java     | 18 ++---
 .../cxf/systest/jaxrs/security/xml/server.xml   |  8 +--
 .../systest/jaxrs/security/xml/stax-server.xml  |  8 +--
 .../cxf/systest/ws/rm/sec/client-policy.xml     |  2 +-
 .../cxf/systest/wssec/examples/saml/client.xml  | 12 ++--
 .../cxf/systest/wssec/examples/saml/server.xml  |  2 +-
 .../systest/wssec/examples/saml/stax-server.xml |  2 +-
 .../systest/wssec/examples/secconv/client.xml   |  2 +-
 .../cxf/systest/wssec/examples/ut/client.xml    |  6 +-
 .../cxf/systest/wssec/examples/x509/client.xml  |  8 +--
 .../cxf/systest/wssec/examples/x509/server.xml  |  2 +-
 .../systest/wssec/examples/x509/stax-server.xml |  2 +-
 .../apache/cxf/systest/ws/fault/FaultTest.java  |  2 +-
 .../cxf/systest/ws/wssc/WSSCUnitTest.java       |  4 +-
 .../systest/ws/x509/DoubleItPropertiesImpl.java |  2 +-
 .../org/apache/cxf/systest/ws/action/server.xml |  4 +-
 .../apache/cxf/systest/ws/algsuite/client.xml   | 12 ++--
 .../apache/cxf/systest/ws/bindings/client.xml   | 42 +++++------
 .../org/apache/cxf/systest/ws/cache/client.xml  |  4 +-
 .../cxf/systest/ws/fault/client-untrusted.xml   |  2 +-
 .../org/apache/cxf/systest/ws/fault/client.xml  |  6 +-
 .../cxf/systest/ws/fault/modified-server.xml    |  4 +-
 .../org/apache/cxf/systest/ws/gcm/client.xml    |  6 +-
 .../apache/cxf/systest/ws/httpget/client.xml    |  2 +-
 .../org/apache/cxf/systest/ws/parts/client.xml  | 42 +++++------
 .../org/apache/cxf/systest/ws/parts/server.xml  | 16 ++---
 .../apache/cxf/systest/ws/parts/stax-server.xml | 14 ++--
 .../org/apache/cxf/systest/ws/policy/client.xml |  6 +-
 .../org/apache/cxf/systest/ws/saml/client.xml   | 20 +++---
 .../apache/cxf/systest/ws/swa/policy-client.xml | 10 +--
 .../apache/cxf/systest/ws/swa/policy-server.xml |  2 +-
 .../cxf/systest/ws/swa/stax-policy-server.xml   |  2 +-
 .../org/apache/cxf/systest/ws/tokens/client.xml | 18 ++---
 .../cxf/systest/ws/tokens/endorsing-client.xml  | 12 ++--
 .../apache/cxf/systest/ws/ut/client-derived.xml |  6 +-
 .../org/apache/cxf/systest/ws/wssc/client.xml   | 46 ++++++------
 .../apache/cxf/systest/ws/wssec10/client.xml    |  4 +-
 .../systest/ws/wssec10/client_restricted.xml    |  4 +-
 .../apache/cxf/systest/ws/wssec11/client.xml    | 36 +++++-----
 .../systest/ws/wssec11/client_restricted.xml    | 36 +++++-----
 .../org/apache/cxf/systest/ws/x509/client.xml   | 74 ++++++++++----------
 .../org/apache/cxf/systest/ws/x509/server.xml   | 14 ++--
 .../apache/cxf/systest/ws/x509/stax-server.xml  | 14 ++--
 .../org/apache/cxf/systest/ws/xkms/client.xml   |  4 +-
 76 files changed, 366 insertions(+), 366 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 e0c9460..a18e004 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
@@ -21,7 +21,7 @@
     <jaxws:endpoint createdFromAPI="true" name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="etc/clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="etc/clientKeystore.properties"/>
             <entry key="ws-security.signature.properties" value="etc/serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
@@ -29,7 +29,7 @@
         <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="ws-security.encryption.properties" value="etc/serviceKeystore.properties"/>
+            <entry key="security.encryption.properties" value="etc/serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:client>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml
----------------------------------------------------------------------
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml
index 90d3aa3..d5b0df4 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml
+++ b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-sym.xml
@@ -21,13 +21,13 @@
     <jaxws:endpoint createdFromAPI="true" name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="etc/serviceKeystore.properties"/>
+            <entry key="security.encryption.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.encryption.properties" value="etc/serviceKeystore.properties"/>
+            <entry key="security.encryption.properties" value="etc/serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:client>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml
----------------------------------------------------------------------
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml
index ac17f19..042145b 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml
+++ b/benchmark/performance/soap_http_doc_lit/src/main/resources/etc/policy-symsc.xml
@@ -21,13 +21,13 @@
     <jaxws:endpoint createdFromAPI="true" name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort">
         <jaxws:properties>
             <entry key="security.callback-handler.sct" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties.sct" value="etc/serviceKeystore.properties"/>
+            <entry key="security.encryption.properties.sct" 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.sct" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties.sct" value="etc/serviceKeystore.properties"/>
+            <entry key="security.encryption.properties.sct" value="etc/serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:client>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 be3297d..b76996c 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
@@ -28,7 +28,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.enable.streaming" value="true"/>
             <entry key="ws-security.sts.client">
@@ -41,7 +41,7 @@
                         <map>
                             <entry key="security.username" value="alice"/>
                             <entry key="security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
-                            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <!-- Because of the PublicKey requirement in the InitiatorToken element
                                 in the WSP WSDL, the client needs to have the STS add its public

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 238d0a9..5645521 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
@@ -28,7 +28,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -40,7 +40,7 @@
                         <map>
                             <entry key="security.username" value="alice"/>
                             <entry key="security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
-                            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <!-- Because of the PublicKey requirement in the InitiatorToken element
                                 in the WSP WSDL, the client needs to have the STS add its public

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 e27fd9b..94cf9f2 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
@@ -28,7 +28,7 @@
             <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="ws-security.encryption.properties" value="serviceKeystore.properties"/>
+            <entry key="security.encryption.properties" value="serviceKeystore.properties"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 c45eca6..be91507 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
@@ -28,7 +28,7 @@
             <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="ws-security.encryption.properties" value="serviceKeystore.properties"/>
+            <entry key="security.encryption.properties" value="serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml
index e8d1a9b..248ee21 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfig.xml
@@ -30,7 +30,7 @@
         <jaxws:properties>
             <entry key="security.username" value="Alice"/>
             <entry key="security.callback-handler" value="demo.wssec.client.UTPasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="etc/Client_Encrypt.properties"/>
+            <entry key="security.encryption.properties" value="etc/Client_Encrypt.properties"/>
             <entry key="security.encryption.username" value="serverx509v1"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml
index 58e5359..083d84f 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/resources/ClientConfigStax.xml
@@ -30,7 +30,7 @@
         <jaxws:properties>
             <entry key="security.username" value="Alice"/>
             <entry key="security.callback-handler" value="demo.wssec.client.UTPasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="etc/Client_Encrypt.properties"/>
+            <entry key="security.encryption.properties" value="etc/Client_Encrypt.properties"/>
             <entry key="security.encryption.username" value="serverx509v1"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 8e8684b..240ebd9 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
@@ -28,7 +28,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 2050d9f..c050fb7 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
@@ -28,7 +28,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 2783824..def5d03 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
@@ -64,7 +64,7 @@
             </entry>
             <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="security.encryption.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/5577461d/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 9acdd96..8782a71 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
@@ -65,7 +65,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 0886554..a4c699b 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
@@ -33,7 +33,7 @@
                 <entry key="security.username" value="alice"/>
                 <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="security.encryption.username" value="mystskey"/>
-                <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                 <entry key="ws-security.sts.token.username" value="myclientkey"/>
                 <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                 <entry key="ws-security.sts.token.usecert" value="true"/>
@@ -45,7 +45,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client" value-ref="stsClient"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 580788b..c1de616 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
@@ -24,7 +24,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
index 5b13232..f2e308f 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
@@ -354,7 +354,7 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase {
         properties.put("security.callback-handler",
                        "org.apache.cxf.systest.sts.common.CommonCallbackHandler");
         properties.put("security.encryption.username", "mystskey");
-        properties.put("ws-security.encryption.properties", "clientKeystore.properties");
+        properties.put("security.encryption.properties", "clientKeystore.properties");
         properties.put("ws-security.is-bsp-compliant", "false");
         stsClient.setProperties(properties);
         

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 b9a1510..90eb77a 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
@@ -33,7 +33,7 @@
                 <entry key="security.username" value="alice"/>
                 <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="security.encryption.username" value="mystskey"/>
-                <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                 <entry key="ws-security.sts.token.username" value="myclientkey"/>
                 <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                 <entry key="ws-security.sts.token.usecert" value="true"/>
@@ -46,7 +46,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client" value-ref="stsClient"/>
         </jaxws:properties>
@@ -56,7 +56,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client" value-ref="stsClient"/>
         </jaxws:properties>
@@ -66,7 +66,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -78,7 +78,7 @@
                         <map>
                             <entry key="security.username" value="alice"/>
                             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-                            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.usecert" value="true"/>
                             <entry key="ws-security.is-bsp-compliant" value="false"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml
index 9736ed0..f5ef7b0 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml
@@ -26,7 +26,7 @@
     </cxf:bus>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2supporting" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2SupportingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server.2}/doubleit/services/doubleittransportsaml2supporting" wsdlLocation="org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/>
+            <entry key="security.encryption.properties" value="serviceKeystore.properties"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
         </jaxws:properties>
     </jaxws:endpoint>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml
index 170e946..828e7fd 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml
@@ -26,7 +26,7 @@
     </cxf:bus>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2supporting" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2SupportingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer.2}/doubleit/services/doubleittransportsaml2supporting" wsdlLocation="org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/>
+            <entry key="security.encryption.properties" value="serviceKeystore.properties"/>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
index 73a0ad0..7aa315f 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
@@ -33,7 +33,7 @@
                 <entry key="security.username" value="alice"/>
                 <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="security.encryption.username" value="mystskey"/>
-                <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                 <entry key="ws-security.is-bsp-compliant" value="false"/>
             </map>
         </property>
@@ -60,7 +60,7 @@
                         <map>
                             <entry key="security.username" value="alice"/>
                             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-                            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.is-bsp-compliant" value="false"/>
                         </map>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 4db22da..a9f529e 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
@@ -29,7 +29,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -43,7 +43,7 @@
                             <entry key="security.signature.username" value="myclientkey"/>
                             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -58,7 +58,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -72,7 +72,7 @@
                             <entry key="security.signature.username" value="myclientkey"/>
                             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -87,7 +87,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -101,7 +101,7 @@
                             <entry key="security.signature.username" value="myclientkey"/>
                             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -116,7 +116,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -130,7 +130,7 @@
                             <entry key="security.signature.username" value="myclientkey"/>
                             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -145,7 +145,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -159,7 +159,7 @@
                             <entry key="security.signature.username" value="myclientkey"/>
                             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 c2bd6d5..0238e67 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
@@ -24,7 +24,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.username_actas.ActAsValidator"/>
             </entry>
@@ -36,7 +36,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.username_actas.ActAsValidator"/>
             </entry>
@@ -48,7 +48,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.username_actas.ActAsValidator"/>
             </entry>
@@ -60,7 +60,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.username_actas.ActAsValidator"/>
             </entry>
@@ -73,7 +73,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.username_actas.ActAsValidator"/>
             </entry>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 89d27bf..d501f29 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
@@ -24,7 +24,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.username_actas.ActAsValidator"/>
             </entry>
@@ -36,7 +36,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.username_actas.ActAsValidator"/>
             </entry>
@@ -48,7 +48,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.username_actas.ActAsValidator"/>
             </entry>
@@ -60,7 +60,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.username_actas.ActAsValidator"/>
             </entry>
@@ -72,7 +72,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.username_actas.ActAsValidator"/>
             </entry>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 63b0b20..082cc01 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
@@ -29,7 +29,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -43,7 +43,7 @@
                             <entry key="security.signature.username" value="myclientkey"/>
                             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -58,7 +58,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -72,7 +72,7 @@
                             <entry key="security.signature.username" value="myclientkey"/>
                             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -87,7 +87,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -101,7 +101,7 @@
                             <entry key="security.signature.username" value="myclientkey"/>
                             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -116,7 +116,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -130,7 +130,7 @@
                             <entry key="security.signature.username" value="myclientkey"/>
                             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
@@ -145,7 +145,7 @@
             <entry key="ws-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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
                 <bean class="org.apache.cxf.ws.security.trust.STSClient">
@@ -159,7 +159,7 @@
                             <entry key="security.signature.username" value="myclientkey"/>
                             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-                            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 152b1dc..557066a 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
@@ -24,7 +24,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/>
             </entry>
@@ -36,7 +36,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/>
             </entry>
@@ -48,7 +48,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/>
             </entry>
@@ -60,7 +60,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/>
             </entry>
@@ -73,7 +73,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/>
             </entry>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 92d9910..73697a8 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
@@ -24,7 +24,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/>
             </entry>
@@ -36,7 +36,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/>
             </entry>
@@ -48,7 +48,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/>
             </entry>
@@ -60,7 +60,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/>
             </entry>
@@ -72,7 +72,7 @@
             <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="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="ws-security.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/>
             </entry>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 c67b74b..5df25cf 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
@@ -33,7 +33,7 @@
                 <entry key="security.signature.username" value="myclientkey"/>
                 <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
-                <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+                <entry key="security.encryption.properties" value="clientKeystore.properties"/>
                 <entry key="security.encryption.username" value="mystskey"/>
             </map>
         </property>
@@ -50,7 +50,7 @@
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML2EndorsingPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
+            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client" value-ref="stsClient"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 6037227..0737f82 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
@@ -36,7 +36,7 @@
                 <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="ws-security.encryption.properties" value="serviceKeystore.properties"/>
+                <entry key="security.encryption.properties" value="serviceKeystore.properties"/>
                 <entry key="security.encryption.username" value="mystskey"/>
             </map>
         </property>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
index ca58a46..119bf3f 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
@@ -36,7 +36,7 @@
                 <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="ws-security.encryption.properties" value="serviceKeystore.properties"/>
+                <entry key="security.encryption.properties" value="serviceKeystore.properties"/>
                 <entry key="security.encryption.username" value="mystskey"/>
             </map>
         </property>

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
index dd9a5b3..6daba6e 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml
@@ -60,7 +60,7 @@
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="bob.properties"/>
+            <entry key="security.encryption.properties" value="bob.properties"/>
             <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -74,7 +74,7 @@
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricSupportingPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="bob.properties"/>
+            <entry key="security.encryption.properties" value="bob.properties"/>
             <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -88,7 +88,7 @@
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSupportingPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="bob.properties"/>
+            <entry key="security.encryption.properties" value="bob.properties"/>
             <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -103,7 +103,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosAsymmetricPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="bob.properties"/>
+            <entry key="security.encryption.properties" value="bob.properties"/>
             <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.signature.properties" value="alice.properties"/>
             <entry key="security.signature.username" value="alice"/>
@@ -135,7 +135,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosAsymmetricEndorsingPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="bob.properties"/>
+            <entry key="security.encryption.properties" value="bob.properties"/>
             <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.signature.properties" value="alice.properties"/>
             <entry key="security.signature.username" value="alice"/>
@@ -151,7 +151,7 @@
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricProtectionPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="bob.properties"/>
+            <entry key="security.encryption.properties" value="bob.properties"/>
             <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -165,7 +165,7 @@
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricDerivedProtectionPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="bob.properties"/>
+            <entry key="security.encryption.properties" value="bob.properties"/>
             <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -180,7 +180,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosAsymmetricSignedEndorsingPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="bob.properties"/>
+            <entry key="security.encryption.properties" value="bob.properties"/>
             <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.signature.properties" value="alice.properties"/>
             <entry key="security.signature.username" value="alice"/>
@@ -197,7 +197,7 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosAsymmetricSignedEncryptedPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/>
-            <entry key="ws-security.encryption.properties" value="bob.properties"/>
+            <entry key="security.encryption.properties" value="bob.properties"/>
             <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.signature.properties" value="alice.properties"/>
             <entry key="security.signature.username" value="alice"/>
@@ -213,7 +213,7 @@
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricEndorsingEncryptedPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="bob.properties"/>
+            <entry key="security.encryption.properties" value="bob.properties"/>
             <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -227,7 +227,7 @@
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricSignedEndorsingEncryptedPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="bob.properties"/>
+            <entry key="security.encryption.properties" value="bob.properties"/>
             <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">
@@ -241,7 +241,7 @@
     </jaxws:client>
    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricSecureConversationPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.encryption.properties" value="bob.properties"/>
+            <entry key="security.encryption.properties" value="bob.properties"/>
             <entry key="security.encryption.username" value="bob"/>
             <entry key="ws-security.kerberos.client">
                 <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient">

http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
index a10aba6..0c22b4d 100644
--- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
+++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml
@@ -91,7 +91,7 @@
             <entry key="security.username" value="bob"/>
             <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.properties" value="alice.properties"/>
+            <entry key="security.encryption.properties" value="alice.properties"/>
             <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
@@ -109,7 +109,7 @@
             <entry key="security.username" value="bob"/>
             <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.properties" value="alice.properties"/>
+            <entry key="security.encryption.properties" value="alice.properties"/>
             <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
@@ -134,7 +134,7 @@
             <entry key="security.username" value="bob"/>
             <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.properties" value="alice.properties"/>
+            <entry key="security.encryption.properties" value="alice.properties"/>
             <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
@@ -145,7 +145,7 @@
             <entry key="security.username" value="bob"/>
             <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="bob.properties"/>
-            <entry key="ws-security.encryption.properties" value="alice.properties"/>
+            <entry key="security.encryption.properties" value="alice.properties"/>
             <entry key="security.encryption.username" value="alice"/>
             <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>


Mime
View raw message