cxf-commits mailing list archives

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


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

Branch: refs/heads/master
Commit: ee64acf5f8370cd1e33719e4d9d4e9922e386602
Parents: 2a5d201
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Apr 17 10:35:33 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Apr 17 10:35:33 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 +-
 .../sts/src/main/resources/wssec-sts-stax.xml   |  2 +-
 .../sts/src/main/resources/wssec-sts.xml        |  2 +-
 .../src/main/resources/ClientConfig.xml         |  2 +-
 .../src/main/resources/ClientConfigStax.xml     |  2 +-
 .../src/main/resources/ServiceConfig.xml        |  2 +-
 .../src/main/resources/ServiceConfigStax.xml    |  2 +-
 .../src/main/resources/ClientConfig.xml         |  2 +-
 .../src/main/resources/ClientConfigStax.xml     |  2 +-
 .../src/main/resources/ServiceConfig.xml        |  2 +-
 .../src/main/resources/ServiceConfigStax.xml    |  2 +-
 .../main/webapp/WEB-INF/cxf-encrypted-ut.xml    |  2 +-
 .../src/main/webapp/WEB-INF/cxf-transport.xml   |  2 +-
 .../sts-war/src/main/webapp/WEB-INF/cxf-ut.xml  |  2 +-
 .../src/main/webapp/WEB-INF/cxf-x509.xml        |  2 +-
 .../SecurityContextTokenCancelTest.java         |  2 +-
 .../cxf/systest/sts/asymmetric_encr/cxf-sts.xml |  2 +-
 .../sts/asymmetric_encr/stax-cxf-sts.xml        |  2 +-
 .../cxf/systest/sts/basic_auth/cxf-service.xml  |  2 +-
 .../systest/sts/basic_auth/stax-cxf-service.xml |  2 +-
 .../sts/binarysecuritytoken/cxf-bad-client.xml  |  2 +-
 .../sts/binarysecuritytoken/cxf-client.xml      |  2 +-
 .../sts/binarysecuritytoken/cxf-service.xml     |  6 +-
 .../binarysecuritytoken/stax-cxf-service.xml    |  6 +-
 .../systest/sts/caching/cxf-caching-service.xml |  6 +-
 .../cxf/systest/sts/caching/cxf-client.xml      |  6 +-
 .../cxf/systest/sts/caching/cxf-service.xml     |  4 +-
 .../cxf/systest/sts/claims/cxf-bad-client.xml   |  2 +-
 .../systest/sts/claims/cxf-client-cbhandler.xml |  4 +-
 .../cxf/systest/sts/claims/cxf-client.xml       |  6 +-
 .../cxf/systest/sts/claims/cxf-service.xml      | 10 +--
 .../cxf/systest/sts/claims/stax-cxf-service.xml | 10 +--
 .../cxf/systest/sts/cross_domain/cxf-client.xml |  4 +-
 .../systest/sts/cross_domain/cxf-service.xml    |  4 +-
 .../systest/sts/cross_domain/cxf-sts-saml1.xml  |  2 +-
 .../systest/sts/cross_domain/cxf-sts-saml2.xml  |  2 +-
 .../sts/custom_onbehalfof/cxf-client.xml        |  2 +-
 .../sts/custom_onbehalfof/cxf-service.xml       |  4 +-
 .../sts/distributed_caching/cxf-client.xml      |  2 +-
 .../sts/distributed_caching/cxf-service.xml     |  6 +-
 .../systest/sts/kerberos/cxf-intermediary.xml   |  4 +-
 .../cxf/systest/sts/kerberos/cxf-service.xml    |  2 +-
 .../cxf/systest/sts/realms/cxf-client.xml       |  8 +--
 .../cxf/systest/sts/realms/cxf-service.xml      |  8 +--
 .../cxf/systest/sts/realms/cxf-sts-saml1.xml    |  6 +-
 .../cxf/systest/sts/realms/cxf-sts-saml2.xml    |  2 +-
 .../apache/cxf/systest/sts/renew/cxf-client.xml |  8 +--
 .../cxf/systest/sts/renew/cxf-service.xml       |  8 +--
 .../cxf/systest/sts/secure_conv/cxf-client.xml  |  2 +-
 .../cxf/systest/sts/secure_conv/cxf-service.xml |  6 +-
 .../cxf/systest/sts/soap12/cxf-client.xml       |  2 +-
 .../cxf/systest/sts/soap12/cxf-service.xml      |  4 +-
 .../cxf/systest/sts/soap12/stax-cxf-service.xml |  4 +-
 .../sts/sts_sender_vouches/cxf-client.xml       |  4 +-
 .../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 +-
 .../systest/sts/transformation/cxf-client.xml   |  4 +-
 .../systest/sts/transformation/cxf-service.xml  |  4 +-
 .../systest/sts/usernametoken/cxf-client.xml    |  4 +-
 .../systest/sts/usernametoken/cxf-service.xml   |  8 +--
 .../sts/usernametoken/stax-cxf-service.xml      |  4 +-
 .../sts/symmetric/SymmetricBindingTest.java     |  2 +-
 .../cxf/systest/sts/template/TemplateTest.java  |  2 +-
 .../sts/transport/TransportBindingTest.java     |  2 +-
 .../cxf/systest/sts/asymmetric/cxf-client.xml   | 10 +--
 .../cxf/systest/sts/asymmetric/cxf-service.xml  |  6 +-
 .../systest/sts/asymmetric/cxf-stax-service.xml |  6 +-
 .../cxf/systest/sts/bearer/cxf-client.xml       |  2 +-
 .../cxf/systest/sts/bearer/cxf-service.xml      |  4 +-
 .../cxf/systest/sts/bearer/cxf-stax-service.xml |  4 +-
 .../sts/delegation/cxf-sts-transport.xml        |  4 +-
 .../systest/sts/deployment/cxf-encrypted-ut.xml |  2 +-
 .../systest/sts/deployment/cxf-transport.xml    |  6 +-
 .../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       |  6 +-
 .../cxf/systest/sts/deployment/stax-cxf-ut.xml  |  2 +-
 .../systest/sts/deployment/stax-cxf-x509.xml    |  2 +-
 .../cxf-bad-client.xml                          |  4 +-
 .../intermediary_transformation/cxf-client.xml  |  4 +-
 .../cxf-intermediary-caching.xml                |  4 +-
 .../cxf-intermediary.xml                        |  4 +-
 .../intermediary_transformation/cxf-service.xml |  2 +-
 .../cxf/systest/sts/issuer/cxf-client.xml       |  6 +-
 .../cxf/systest/sts/issuer/cxf-service.xml      |  6 +-
 .../systest/sts/issuer/cxf-sts-transport.xml    |  4 +-
 .../systest/sts/sendervouches/cxf-client.xml    |  2 +-
 .../sts/sendervouches/cxf-intermediary.xml      |  2 +-
 .../systest/sts/sendervouches/cxf-service.xml   |  2 +-
 .../sts/sendervouches/cxf-stax-intermediary.xml |  2 +-
 .../sts/sendervouches/cxf-stax-service.xml      |  2 +-
 .../systest/sts/stsclient/cxf-client-name.xml   |  2 +-
 .../sts/stsclient/cxf-default-client.xml        |  2 +-
 .../cxf/systest/sts/stsclient/cxf-service.xml   |  2 +-
 .../cxf/systest/sts/symmetric/cxf-client.xml    |  4 +-
 .../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    |  6 +-
 .../cxf/systest/sts/transport/cxf-client.xml    |  8 +--
 .../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  | 12 ++--
 .../systest/kerberos/wssec/kerberos/server.xml  | 32 ++++-----
 .../kerberos/wssec/kerberos/stax-server.xml     | 28 ++++----
 .../kerberos/wssec/kerberos/sts-client.xml      |  4 +-
 .../systest/kerberos/wssec/spnego/client.xml    | 14 ++--
 .../systest/kerberos/wssec/spnego/server.xml    | 14 ++--
 .../kerberos/wssec/spnego/stax-server.xml       | 12 ++--
 .../jaxrs/security/oauth2/JAXRSOAuth2Test.java  |  2 +-
 .../jaxrs/security/saml/JAXRSSamlTest.java      |  2 +-
 .../jaxrs/security/xml/JAXRSXmlSecTest.java     | 26 ++++----
 .../cxf/systest/jaxrs/security/xml/server.xml   | 14 ++--
 .../systest/jaxrs/security/xml/stax-server.xml  | 14 ++--
 .../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  | 16 ++---
 .../cxf/systest/wssec/examples/saml/server.xml  | 10 +--
 .../systest/wssec/examples/saml/stax-server.xml | 10 +--
 .../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    | 12 ++--
 .../cxf/systest/wssec/examples/ut/server.xml    | 14 ++--
 .../systest/wssec/examples/ut/stax-server.xml   | 14 ++--
 .../cxf/systest/wssec/examples/x509/client.xml  |  8 +--
 .../cxf/systest/wssec/examples/x509/server.xml  |  8 +--
 .../systest/wssec/examples/x509/stax-server.xml |  8 +--
 .../apache/cxf/systest/ws/fault/FaultTest.java  |  2 +-
 .../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/client.xml   | 12 ++--
 .../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  |  6 +-
 .../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 | 12 ++--
 .../cxf/systest/ws/policy/javafirstserver.xml   | 14 ++--
 .../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 +++++------
 .../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 +++---
 .../apache/cxf/systest/ws/ut/client-derived.xml | 14 ++--
 .../org/apache/cxf/systest/ws/ut/client.xml     | 22 +++----
 .../apache/cxf/systest/ws/ut/policy-client.xml  | 24 +++----
 .../apache/cxf/systest/ws/ut/policy-server.xml  | 24 +++----
 .../apache/cxf/systest/ws/ut/server-derived.xml | 14 ++--
 .../org/apache/cxf/systest/ws/ut/server.xml     | 22 +++----
 .../cxf/systest/ws/ut/stax-policy-server.xml    | 24 +++----
 .../apache/cxf/systest/ws/ut/stax-server.xml    | 22 +++----
 .../org/apache/cxf/systest/ws/wssc/client.xml   | 48 +++++++-------
 .../apache/cxf/systest/ws/wssc/unit-server.xml  |  6 +-
 .../apache/cxf/systest/ws/wssec10/client.xml    |  8 +--
 .../systest/ws/wssec10/client_restricted.xml    |  8 +--
 .../wssec10/client_restricted_unauthorized.xml  |  4 +-
 .../apache/cxf/systest/ws/wssec10/server.xml    |  8 +--
 .../systest/ws/wssec10/server_restricted.xml    |  8 +--
 .../ws/wssec10/server_restricted_authorized.xml |  2 +-
 .../wssec10/server_restricted_authorized_2.xml  |  2 +-
 .../cxf/systest/ws/wssec10/stax-server.xml      |  8 +--
 .../ws/wssec10/stax-server_restricted.xml       |  8 +--
 .../apache/cxf/systest/ws/wssec11/client.xml    | 36 +++++------
 .../systest/ws/wssec11/client_restricted.xml    | 36 +++++------
 .../org/apache/cxf/systest/ws/x509/client.xml   | 68 ++++++++++----------
 .../org/apache/cxf/systest/ws/x509/server.xml   | 62 +++++++++---------
 .../apache/cxf/systest/ws/x509/stax-server.xml  | 62 +++++++++---------
 .../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 +-
 213 files changed, 975 insertions(+), 975 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 9a603df..e0c9460 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
@@ -20,14 +20,14 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation="           http://www.springframework.org/schema/beans           http://www.springframework.org/schema/beans/spring-beans.xsd           http://cxf.apache.org/jaxws                           http://cxf.apache.org/schemas/jaxws.xsd           http://cxf.apache.org/transports/http/configuration   http://cxf.apache.org/schemas/configuration/http-conf.xsd           http://cxf.apache.org/configuration/security          http://cxf.apache.org/schemas/configuration/security.xsd           http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd           http://cxf.apache.org/policy http://cxf.apache.org/schemas/poli
 cy.xsd">
     <jaxws:endpoint createdFromAPI="true" name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
+            <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="ws-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="ws-security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
+            <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"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 3e90b2c..90d3aa3 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
@@ -20,13 +20,13 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation="           http://www.springframework.org/schema/beans           http://www.springframework.org/schema/beans/spring-beans.xsd           http://cxf.apache.org/jaxws                           http://cxf.apache.org/schemas/jaxws.xsd           http://cxf.apache.org/transports/http/configuration   http://cxf.apache.org/schemas/configuration/http-conf.xsd           http://cxf.apache.org/configuration/security          http://cxf.apache.org/schemas/configuration/security.xsd           http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd           http://cxf.apache.org/policy http://cxf.apache.org/schemas/poli
 cy.xsd">
     <jaxws:endpoint createdFromAPI="true" name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
+            <entry key="security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
             <entry key="ws-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="ws-security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
+            <entry key="security.callback-handler" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
             <entry key="ws-security.encryption.properties" value="etc/serviceKeystore.properties"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 12c6f86..ac17f19 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
@@ -20,13 +20,13 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:p="http://cxf.apache.org/policy" xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation="           http://www.springframework.org/schema/beans           http://www.springframework.org/schema/beans/spring-beans.xsd           http://cxf.apache.org/jaxws                           http://cxf.apache.org/schemas/jaxws.xsd           http://cxf.apache.org/transports/http/configuration   http://cxf.apache.org/schemas/configuration/http-conf.xsd           http://cxf.apache.org/configuration/security          http://cxf.apache.org/schemas/configuration/security.xsd           http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd           http://cxf.apache.org/policy http://cxf.apache.org/schemas/poli
 cy.xsd">
     <jaxws:endpoint createdFromAPI="true" name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
+            <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"/>
         </jaxws:properties>
     </jaxws:endpoint>
     <jaxws:client name="{http://cxf.apache.org/cxf/performance}SoapHttpDocLitPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.performance.complex_type.common.KeystorePasswordCallback"/>
+            <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"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 d7e7a5e..be3297d 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
@@ -27,7 +27,7 @@
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.signature.username" value="myclientkey"/>
-            <entry key="ws-security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
+            <entry key="security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.enable.streaming" value="true"/>
@@ -40,7 +40,7 @@
                     <property name="properties">
                         <map>
                             <entry key="security.username" value="alice"/>
-                            <entry key="ws-security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
+                            <entry key="security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <!-- Because of the PublicKey requirement in the InitiatorToken element

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 0437736..238d0a9 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
@@ -27,7 +27,7 @@
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.signature.username" value="myclientkey"/>
-            <entry key="ws-security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
+            <entry key="security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
             <entry key="security.encryption.username" value="myservicekey"/>
             <entry key="ws-security.sts.client">
@@ -39,7 +39,7 @@
                     <property name="properties">
                         <map>
                             <entry key="security.username" value="alice"/>
-                            <entry key="ws-security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
+                            <entry key="security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/>
                             <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/>
                             <entry key="security.encryption.username" value="mystskey"/>
                             <!-- Because of the PublicKey requirement in the InitiatorToken element

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 5cdde90..e27fd9b 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
@@ -26,7 +26,7 @@
     <jaxws:endpoint xmlns:s="http://apache.org/hello_world_soap_http" id="server" implementor="demo.wssec.server.GreeterImpl" endpointName="s:SoapPort" serviceName="s:SOAPService" address="http://localhost:9001/SoapContext/SoapPort" wsdlLocation="wsdl/hello_world.wsdl">
         <jaxws:properties>
             <entry key="security.signature.username" value="myservicekey"/>
-            <entry key="ws-security.callback-handler" value="demo.wssec.server.ServerCallbackHandler"/>
+            <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="ws-security.enable.streaming" value="true"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 3b55a4f..c45eca6 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
@@ -26,7 +26,7 @@
     <jaxws:endpoint xmlns:s="http://apache.org/hello_world_soap_http" id="server" implementor="demo.wssec.server.GreeterImpl" endpointName="s:SoapPort" serviceName="s:SOAPService" address="http://localhost:9001/SoapContext/SoapPort" wsdlLocation="wsdl/hello_world.wsdl">
         <jaxws:properties>
             <entry key="security.signature.username" value="myservicekey"/>
-            <entry key="ws-security.callback-handler" value="demo.wssec.server.ServerCallbackHandler"/>
+            <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"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 b759b36..2b21821 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
@@ -54,7 +54,7 @@
     </bean>
     <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="ws-security.callback-handler" value="demo.wssec.sts.STSCallbackHandler"/>
+            <entry key="security.callback-handler" value="demo.wssec.sts.STSCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
             <entry key="security.signature.username" value="mystskey"/>
             <entry key="ws-security.enable.streaming" value="true"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 68b2802..331187f 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
@@ -54,7 +54,7 @@
     </bean>
     <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="ws-security.callback-handler" value="demo.wssec.sts.STSCallbackHandler"/>
+            <entry key="security.callback-handler" value="demo.wssec.sts.STSCallbackHandler"/>
             <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
             <entry key="security.signature.username" value="mystskey"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 24d7ff4..e8d1a9b 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
@@ -29,7 +29,7 @@
     <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="demo.wssec.client.UTPasswordCallback"/>
+            <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.username" value="serverx509v1"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 b14e2c8..58e5359 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
@@ -29,7 +29,7 @@
     <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="security.username" value="Alice"/>
-            <entry key="ws-security.callback-handler" value="demo.wssec.client.UTPasswordCallback"/>
+            <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.username" value="serverx509v1"/>
             <entry key="ws-security.enable.streaming" value="true"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 3e66c72..be2140a 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
@@ -33,7 +33,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="ws-security.callback-handler" value="demo.wssec.server.UTPasswordCallback"/>
+            <entry key="security.callback-handler" value="demo.wssec.server.UTPasswordCallback"/>
         </jaxws:properties>
     </jaxws:endpoint>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 c1654a3..4d421dd 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
@@ -33,7 +33,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="ws-security.callback-handler" value="demo.wssec.server.UTPasswordCallback"/>
+            <entry key="security.callback-handler" value="demo.wssec.server.UTPasswordCallback"/>
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
     </jaxws:endpoint>

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

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

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfig.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfig.xml b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfig.xml
index 0eaa16a..313feb1 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfig.xml
+++ b/distribution/src/main/release/samples/ws_security/ut_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="https://localhost:9001/SoapContext/SoapPort" wsdlLocation="src/main/config/hello_world.wsdl" depends-on="ClientAuthHttpsSettings">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="demo.wssec.server.UTPasswordCallback"/>
+            <entry key="security.callback-handler" value="demo.wssec.server.UTPasswordCallback"/>
             <!--<entry key="passwordCallbackRef">
            <ref bean="myPasswordCallback"/>
         </entry>-->

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfigStax.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfigStax.xml b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfigStax.xml
index c5f7249..2096fbc 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfigStax.xml
+++ b/distribution/src/main/release/samples/ws_security/ut_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="https://localhost:9001/SoapContext/SoapPort" wsdlLocation="src/main/config/hello_world.wsdl" depends-on="ClientAuthHttpsSettings">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="demo.wssec.server.UTPasswordCallback"/>
+            <entry key="security.callback-handler" value="demo.wssec.server.UTPasswordCallback"/>
             <!--<entry key="passwordCallbackRef">
            <ref bean="myPasswordCallback"/>
         </entry>-->

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 c513a87..fb9aa67 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
@@ -50,7 +50,7 @@
     </bean>
     <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="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
+            <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.username" value="mystskey"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml b/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml
index e0d363b..3b8a3ee 100644
--- a/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml
+++ b/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-transport.xml
@@ -49,7 +49,7 @@
     </bean>
     <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="transportSTS" implementor="#transportSTSProviderBean" address="/Transport" wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
+            <entry key="security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
         </jaxws:properties>
     </jaxws:endpoint>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 7707cbd..7dac6a4 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
@@ -44,7 +44,7 @@
     </bean>
     <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="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
+            <entry key="security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
             <entry key="ws-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"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 b2d9853..d8531fa 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
@@ -59,7 +59,7 @@
     </bean>
     <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="ws-security.callback-handler" value="org.apache.cxf.sts.war.PasswordCallbackHandler"/>
+            <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.username" value="mystskey"/>
             <entry key="security.encryption.username" value="useReqSigCert"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java
index d2b74bf..7e73b53 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenCancelTest.java
@@ -97,7 +97,7 @@ public class SecurityContextTokenCancelTest extends AbstractBusClientServerTestB
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put(SecurityConstants.USERNAME, "alice");
         properties.put(
-            "ws-security.callback-handler", 
+            "security.callback-handler", 
             "org.apache.cxf.systest.sts.common.CommonCallbackHandler"
         );
         properties.put("ws-security.sts.token.properties", "serviceKeystore.properties");

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 5b34b19..325fbac 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
@@ -56,7 +56,7 @@
     </bean>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.username" value="mystskey"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 ec80544..be1fd09 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
@@ -56,7 +56,7 @@
     </bean>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.username" value="mystskey"/>
             <entry key="ws-security.enable.streaming" value="true"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
index 99e049b..4d92518 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
@@ -59,7 +59,7 @@
         <property name="properties">
             <map>
                 <entry key="security.username" value="bob"/>
-                <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+                <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             </map>
         </property>
     </bean>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
index 5c415ac..6f193a1 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
@@ -60,7 +60,7 @@
         <property name="properties">
             <map>
                 <entry key="security.username" value="bob"/>
-                <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+                <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="ws-security.enable.streaming" value="true"/>
             </map>
         </property>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 2eef0b9..8e8684b 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
@@ -27,7 +27,7 @@
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="eveKeystore.properties"/>
             <entry key="security.signature.username" value="eve"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.username" value="myservicekey"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 0a5d58e..2050d9f 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
@@ -27,7 +27,7 @@
         <jaxws:properties>
             <entry key="ws-security.signature.properties" value="clientKeystore.properties"/>
             <entry key="security.signature.username" value="myclientkey"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.username" value="myservicekey"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 4591d8a..2d9d84a 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
@@ -26,12 +26,12 @@
     </cxf:bus>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricbst" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricBSTPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricbst" wsdlLocation="org/apache/cxf/systest/sts/binarysecuritytoken/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="common.CommonCallbackHandler"/>
+            <entry key="security.callback-handler" value="common.CommonCallbackHandler"/>
             <entry key="ws-security.bst.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
             </entry>
             <entry key="security.signature.username" value="myservicekey"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.sts.client">
@@ -43,7 +43,7 @@
                     <property name="properties">
                         <map>
                             <entry key="security.username" value="bob"/>
-                            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+                            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                         </map>
                     </property>
                 </bean>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 2054a50..4882ef9 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
@@ -26,12 +26,12 @@
     </cxf:bus>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricbst" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricBSTPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleitasymmetricbst" wsdlLocation="org/apache/cxf/systest/sts/binarysecuritytoken/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="common.CommonCallbackHandler"/>
+            <entry key="security.callback-handler" value="common.CommonCallbackHandler"/>
             <entry key="ws-security.bst.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSStaxTokenValidator"/>
             </entry>
             <entry key="security.signature.username" value="myservicekey"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.encryption.username" value="useReqSigCert"/>
             <entry key="ws-security.enable.streaming" value="true"/>
@@ -44,7 +44,7 @@
                     <property name="properties">
                         <map>
                             <entry key="security.username" value="bob"/>
-                            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+                            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.enable.streaming" value="true"/>
                         </map>
                     </property>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 e00fa7a..2783824 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
@@ -21,7 +21,7 @@
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.saml1.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator">
@@ -41,7 +41,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportut" implementor="org.apache.cxf.systest.sts.caching.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportUTPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.CachingServer}/doubleit/services/doubleittransportut" wsdlLocation="org/apache/cxf/systest/sts/caching/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.ut.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
             </entry>
@@ -58,7 +58,7 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitasymmetricbst" implementor="org.apache.cxf.systest.sts.caching.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricBSTPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.CachingServer.2}/doubleit/services/doubleitasymmetricbst" wsdlLocation="org/apache/cxf/systest/sts/caching/DoubleIt.wsdl">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.bst.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
             </entry>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 8615f6c..9acdd96 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
@@ -32,7 +32,7 @@
         <property name="properties">
             <map>
                 <entry key="security.username" value="alice"/>
-                <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+                <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="ws-security.sts.token.username" value="myclientkey"/>
                 <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                 <entry key="ws-security.sts.token.usecert" value="true"/>
@@ -57,14 +57,14 @@
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTPort" createdFromAPI="true">
         <jaxws:properties>
             <entry key="security.username" value="alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
         </jaxws:properties>
     </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.username" value="myclientkey"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.username" value="myservicekey"/>
         </jaxws:properties>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 a10626b..571233f 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
@@ -21,7 +21,7 @@
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.saml1.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
@@ -30,7 +30,7 @@
     </jaxws:endpoint>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.saml1.validator">
                 <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
index 71be96a..ed8d5fd 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml
@@ -35,7 +35,7 @@
                     <property name="properties">
                         <map>
                             <entry key="security.username" value="bob"/>
-                            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+                            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.sts.token.usecert" value="true"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
index e9dca2c..bf99950 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml
@@ -27,7 +27,7 @@
     <bean id="roleClaimsCallbackHandler" class="org.apache.cxf.systest.sts.claims.ClaimsCallbackHandler"/>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2ClaimsPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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">
                     <constructor-arg ref="cxf"/>
@@ -38,7 +38,7 @@
                     <property name="properties">
                         <map>
                             <entry key="security.username" value="alice"/>
-                            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+                            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                             <entry key="ws-security.sts.token.username" value="myclientkey"/>
                             <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                             <entry key="ws-security.sts.token.usecert" value="true"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
index ad6fc37..d3b8ea8 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml
@@ -32,7 +32,7 @@
         <property name="properties">
             <map>
                 <entry key="security.username" value="alice"/>
-                <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+                <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
                 <entry key="ws-security.sts.token.username" value="myclientkey"/>
                 <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
                 <entry key="ws-security.sts.token.usecert" value="true"/>
@@ -51,13 +51,13 @@
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2ClaimsPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.sts.client" value-ref="stsClient"/>
         </jaxws:properties>
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2ChildClaimsPort" createdFromAPI="true">
         <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="ws-security.sts.client" value-ref="stsClient"/>
         </jaxws:properties>
     </jaxws:client>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 125e99e..530420f 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
@@ -21,7 +21,7 @@
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.saml1.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.ClaimsValidator"/>
@@ -30,7 +30,7 @@
     </jaxws:endpoint>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.saml1.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.ClaimsValidator"/>
@@ -39,7 +39,7 @@
     </jaxws:endpoint>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.ClaimsValidator"/>
@@ -48,7 +48,7 @@
     </jaxws:endpoint>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.saml1.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.ClaimsValidator"/>
@@ -57,7 +57,7 @@
     </jaxws:endpoint>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.ClaimsValidator"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 e048e37..266502e 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
@@ -21,7 +21,7 @@
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.saml1.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.StaxClaimsValidator"/>
@@ -31,7 +31,7 @@
     </jaxws:endpoint>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.saml1.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.StaxClaimsValidator"/>
@@ -41,7 +41,7 @@
     </jaxws:endpoint>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.StaxClaimsValidator"/>
@@ -51,7 +51,7 @@
     </jaxws:endpoint>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.saml1.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.StaxClaimsValidator"/>
@@ -61,7 +61,7 @@
     </jaxws:endpoint>
     <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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <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.saml2.validator">
                 <bean class="org.apache.cxf.systest.sts.claims.StaxClaimsValidator"/>


Mime
View raw message