Moving to use new config
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ed0f2511 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ed0f2511 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ed0f2511 Branch: refs/heads/master Commit: ed0f25116f8620841ff96dd1b751d97c11eb09c3 Parents: 91c7b09 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Fri Aug 28 12:04:59 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Fri Aug 28 13:46:47 2015 +0100 ---------------------------------------------------------------------- .../src/main/resources/wssec-client-stax.xml | 8 ++--- .../sts/src/main/resources/wssec-client.xml | 8 ++--- .../cxf/systest/sts/basic_auth/cxf-service.xml | 4 +-- .../systest/sts/basic_auth/stax-cxf-service.xml | 4 +-- .../sts/binarysecuritytoken/cxf-service.xml | 2 +- .../binarysecuritytoken/stax-cxf-service.xml | 2 +- .../systest/sts/caching/cxf-caching-service.xml | 6 ++-- .../cxf/systest/sts/caching/cxf-client.xml | 12 ++++---- .../cxf/systest/sts/claims/cxf-bad-client.xml | 8 ++--- .../systest/sts/claims/cxf-client-cbhandler.xml | 8 ++--- .../cxf/systest/sts/claims/cxf-client.xml | 14 ++++----- .../cxf/systest/sts/cross_domain/cxf-client.xml | 18 +++++------ .../sts/custom_onbehalfof/cxf-client.xml | 8 ++--- .../sts/custom_onbehalfof/cxf-service.xml | 2 +- .../sts/distributed_caching/cxf-client.xml | 12 ++++---- .../sts/distributed_caching/cxf-service.xml | 6 ++-- .../systest/sts/kerberos/cxf-intermediary.xml | 8 ++--- .../cxf/systest/sts/realms/cxf-client.xml | 32 ++++++++++---------- .../cxf/systest/sts/realms/cxf-service.xml | 32 ++++++++++---------- .../apache/cxf/systest/sts/renew/cxf-client.xml | 26 ++++++++-------- .../cxf/systest/sts/secure_conv/cxf-client.xml | 10 +++--- .../cxf/systest/sts/secure_conv/cxf-service.xml | 6 ++-- .../cxf/systest/sts/soap12/cxf-client.xml | 8 ++--- .../cxf/systest/sts/soap12/cxf-service.xml | 8 ++--- .../cxf/systest/sts/soap12/stax-cxf-service.xml | 8 ++--- .../sts/sts_sender_vouches/cxf-client.xml | 8 ++--- .../systest/sts/transformation/cxf-service.xml | 4 +-- .../systest/sts/usernametoken/cxf-service.xml | 4 +-- .../sts/usernametoken/stax-cxf-service.xml | 2 +- .../cxf/systest/sts/asymmetric/cxf-client.xml | 14 ++++----- .../cxf/systest/sts/bearer/cxf-client.xml | 10 +++--- .../cxf-bad-client.xml | 8 ++--- .../intermediary_transformation/cxf-client.xml | 8 ++--- .../cxf-intermediary-caching.xml | 8 ++--- .../cxf-intermediary.xml | 8 ++--- .../cxf/systest/sts/issuer/cxf-client.xml | 24 +++++++-------- .../apache/cxf/systest/sts/jaas/cxf-service.xml | 4 +-- .../systest/sts/stsclient/cxf-client-name.xml | 6 ++-- .../sts/stsclient/cxf-default-client.xml | 6 ++-- .../cxf/systest/sts/symmetric/cxf-client.xml | 8 ++--- .../systest/sts/transport/cxf-bad-client.xml | 16 +++++----- .../cxf/systest/sts/transport/cxf-client.xml | 20 ++++++------ .../systest/sts/username_actas/cxf-client.xml | 30 +++++++++--------- .../sts/username_onbehalfof/cxf-client.xml | 30 +++++++++--------- .../systest/sts/x509_symmetric/cxf-client.xml | 6 ++-- .../systest/sts/x509_symmetric/cxf-service.xml | 2 +- .../sts/x509_symmetric/cxf-stax-service.xml | 2 +- .../kerberos/wssec/kerberos/sts-client.xml | 8 ++--- .../cxf/systest/wssec/examples/saml/client.xml | 2 +- 49 files changed, 249 insertions(+), 249 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/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 78c28c5..12c9245 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 @@ -31,7 +31,7 @@ <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"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/UT?wsdl"/> @@ -47,11 +47,11 @@ in the WSP WSDL, the client needs to have the STS add its public key to the SAML assertion, as configured in the three lines below. --> - <entry key="ws-security.sts.token.username" value="myclientkey"/> - <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> <!-- If usecert = true, sends entire certificate in an X509Certificate element, else sends cert ID in a KeyValue element --> - <entry key="ws-security.sts.token.usecert" value="true"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/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 35efacd..dba83bf 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 @@ -30,7 +30,7 @@ <entry key="security.callback-handler" value="demo.wssec.client.ClientCallbackHandler"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/UT?wsdl"/> @@ -46,11 +46,11 @@ in the WSP WSDL, the client needs to have the STS add its public key to the SAML assertion, as configured in the three lines below. --> - <entry key="ws-security.sts.token.username" value="myclientkey"/> - <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> <!-- If usecert = true, sends entire certificate in an X509Certificate element, else sends cert ID in a KeyValue element --> - <entry key="ws-security.sts.token.usecert" value="true"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/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 0929432..1d53759 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 @@ -29,7 +29,7 @@ <ref bean="basicAuthValidator"/> </jaxws:inInterceptors> <jaxws:properties> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <ref bean="stsclient"/> </entry> </jaxws:properties> @@ -39,7 +39,7 @@ <ref bean="basicAuthValidator"/> </jaxrs:inInterceptors> <jaxrs:properties> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <ref bean="stsclient"/> </entry> </jaxrs:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/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 6ec36c2..9cfa22b 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 @@ -29,7 +29,7 @@ <ref bean="basicAuthValidator"/> </jaxws:inInterceptors> <jaxws:properties> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <ref bean="stsclient"/> </entry> <entry key="ws-security.enable.streaming" value="true"/> @@ -40,7 +40,7 @@ <ref bean="basicAuthValidator"/> </jaxrs:inInterceptors> <jaxrs:properties> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <ref bean="stsclient"/> </entry> </jaxrs:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/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 9e6373d..05cfa5b 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 @@ -34,7 +34,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/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 cf74535..dcfabb4 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 @@ -35,7 +35,7 @@ <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.enable.streaming" value="true"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.StaxSTSServer}/SecurityTokenService/Transport?wsdl"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/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 b4c1d84..86df044 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 @@ -28,7 +28,7 @@ <constructor-arg value="true"/> </bean> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/> @@ -45,7 +45,7 @@ <entry key="ws-security.ut.validator"> <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/> @@ -66,7 +66,7 @@ <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/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 4ff985b..0124abd 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 @@ -33,25 +33,25 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1Port" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1Port2" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1AlternativePort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTPort" createdFromAPI="true"> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/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 ed8d5fd..3e1a440 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 @@ -26,7 +26,7 @@ </cxf:bus> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1FailingClaimsPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/> @@ -36,9 +36,9 @@ <map> <entry key="security.username" value="bob"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/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 bf99950..d8dce9a 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 @@ -28,7 +28,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2ClaimsPort" createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/> @@ -39,9 +39,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/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 d3b8ea8..678b9ff 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 @@ -33,32 +33,32 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1ClaimsPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1CustomClaimsPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2ClaimsPort" createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="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="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <http:conduit name="https://localhost:.*"> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml index f38573e..a127bdc 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml @@ -26,7 +26,7 @@ </cxf:bus> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItCrossDomainPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.cross_domain.STSServer.2}/SecurityTokenService/a?wsdl"/> @@ -36,9 +36,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> @@ -48,8 +48,8 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItCrossDomainMEXPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.prefer-wsmex" value="true"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.prefer-wsmex" value="true"/> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:30101/SecurityTokenService/a?wsdl"/> @@ -59,9 +59,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> <property name="enableAppliesTo" value="false"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml index 1702c3a..59b7231 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml @@ -27,7 +27,7 @@ <bean id="delegationCallbackHandler" class="org.apache.cxf.ws.security.trust.delegation.WSSUsernameCallbackHandler"/> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportCustomBSTPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.custom_onbehalfof.STSServer}/SecurityTokenService/Transport?wsdl"/> @@ -38,9 +38,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml index 8667c34..26f421b 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml @@ -26,7 +26,7 @@ <entry key="ws-security.bst.validator"> <bean class="org.apache.cxf.systest.sts.custom_onbehalfof.CustomBSTTokenValidator"/> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.custom_onbehalfof.STSServer}/SecurityTokenService/Transport?wsdl"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml index 7d32949..e613d9c 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml @@ -33,25 +33,25 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSCTPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSAMLPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItUsernameTokenPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <http:conduit name="https://localhost:.*"> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml index 3db5898..7fb958f 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml @@ -26,7 +26,7 @@ <entry key="ws-security.sct.validator"> <bean class="org.apache.cxf.systest.sts.distributed_caching.SCTTokenValidator"/> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.distributed_caching.STSServer.2}/SecurityTokenService/Transport?wsdl"/> @@ -45,7 +45,7 @@ <constructor-arg value="true"/> </bean> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.distributed_caching.STSServer.2}/SecurityTokenService/Transport?wsdl"/> @@ -64,7 +64,7 @@ <constructor-arg value="true"/> </bean> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.distributed_caching.STSServer.2}/SecurityTokenService/Transport?wsdl"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml index 6f1b650..aa116c2 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml @@ -58,7 +58,7 @@ <entry key="security.username" value="myclientkey"/> <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Kerberos?wsdl"/> @@ -68,9 +68,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> <entry key="ws-security.kerberos.client" value-ref="kerberosClient"/> </map> </property> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml index d502fe5..eb4b6ac 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml @@ -26,7 +26,7 @@ </cxf:bus> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItRealmAPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer.2}/SecurityTokenService/realmA?wsdl"/> @@ -36,9 +36,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> @@ -47,7 +47,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItDefaultRealmPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer.2}/SecurityTokenService/realmdefault?wsdl"/> @@ -57,9 +57,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> @@ -68,7 +68,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItRealmCPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer.2}/SecurityTokenService/realmC?wsdl"/> @@ -78,9 +78,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> @@ -89,7 +89,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItRealmTransformPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer.2}/SecurityTokenService/realmA?wsdl"/> @@ -99,9 +99,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml index fc4ea1a..3ed4ca7 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml @@ -24,7 +24,7 @@ <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer}/SecurityTokenService/realmB?wsdl"/> @@ -34,9 +34,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> @@ -48,7 +48,7 @@ <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer}/SecurityTokenService/realmB?wsdl"/> @@ -58,9 +58,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> @@ -72,7 +72,7 @@ <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer}/SecurityTokenService/realmB?wsdl"/> @@ -82,9 +82,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> @@ -96,7 +96,7 @@ <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.systest.sts.realms.DifferentRealmValidator"/> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.realms.STSServer}/SecurityTokenService/realmB?wsdl"/> @@ -106,9 +106,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> <property name="tokenType" value="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml index f50cf30..e6821f0 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml @@ -30,7 +30,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.renew.STSServerPOP}/SecurityTokenService/Transport?wsdl"/> @@ -41,9 +41,9 @@ <property name="allowRenewingAfterExpiry" value="true"/> <property name="properties"> <map> - <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> @@ -54,7 +54,7 @@ <jaxws:properties> <entry key="security.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.renew.STSServerPOP}/SecurityTokenService/Transport?wsdl"/> @@ -79,9 +79,9 @@ <property name="allowRenewingAfterExpiry" value="true"/> <property name="properties"> <map> - <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> @@ -92,7 +92,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.sts.client" value-ref="saml2STSClient" /> + <entry key="security.sts.client" value-ref="saml2STSClient" /> </jaxws:properties> </jaxws:client> @@ -106,9 +106,9 @@ <property name="allowRenewingAfterExpiry" value="true"/> <property name="properties"> <map> - <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> @@ -119,7 +119,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.sts.client" value-ref="saml2STSNoRenewClient" /> + <entry key="security.sts.client" value-ref="saml2STSNoRenewClient" /> </jaxws:properties> </jaxws:client> <http:conduit name="https://localhost:.*"> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml index 515ff21..05f4beb 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml @@ -34,24 +34,24 @@ <map> <entry key="security.username" value="alice"/> <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="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> </map> </property> </bean> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSecureConvPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSecureConvPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSupportingPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml index 4158367..6285fe7 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml @@ -26,7 +26,7 @@ <entry key="ws-security.sct.validator"> <bean class="org.apache.cxf.systest.sts.secure_conv.SCTTokenValidator"/> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.secure_conv.STSServer}/SecurityTokenService/TransportSCT?wsdl"/> @@ -44,7 +44,7 @@ <entry key="ws-security.sct.validator"> <bean class="org.apache.cxf.systest.sts.secure_conv.SCTTokenValidator"/> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.secure_conv.STSServer}/SecurityTokenService/TransportSCT?wsdl"/> @@ -62,7 +62,7 @@ <entry key="ws-security.sct.validator"> <bean class="org.apache.cxf.systest.sts.secure_conv.SCTTokenValidator"/> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.secure_conv.STSServer}/SecurityTokenService/TransportSCT?wsdl"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml index 6ea4887..902dbb4 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml @@ -26,7 +26,7 @@ </cxf:bus> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Port" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.deployment.STSServer}/SecurityTokenService/TransportSoap12?wsdl"/> @@ -36,9 +36,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml index dfc4d8d..a8dc806 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml @@ -28,7 +28,7 @@ <constructor-arg value="true"/> </bean> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.deployment.STSServer}/SecurityTokenService/TransportSoap12?wsdl"/> @@ -38,9 +38,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml index 123d76e..e2149b1 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml @@ -29,7 +29,7 @@ </bean> </entry> <entry key="ws-security.enable.streaming" value="true"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.deployment.StaxSTSServer}/SecurityTokenService/TransportSoap12?wsdl"/> @@ -39,9 +39,9 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> <entry key="ws-security.enable.streaming" value="true"/> </map> </property> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/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 5de77bc..53c3368 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 @@ -34,9 +34,9 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="security.encryption.username" value="mystskey"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> @@ -47,7 +47,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml index e1c625d..062e3fa 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml @@ -30,7 +30,7 @@ <entry key="ws-security.ut.validator"> <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/> @@ -58,7 +58,7 @@ <entry key="ws-security.ut.validator"> <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml index 45bd818..14ba9b5 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml @@ -30,7 +30,7 @@ <entry key="ws-security.ut.validator"> <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/> @@ -67,7 +67,7 @@ <property name="useIssueBinding" value="true"/> </bean> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport?wsdl"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml index e7f0cf8..e594b0d 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml @@ -31,7 +31,7 @@ <bean class="org.apache.cxf.ws.security.trust.STSStaxTokenValidator"/> </entry> <entry key="ws-security.enable.streaming" value="true"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:${testutil.ports.StaxSTSServer}/SecurityTokenService/Transport?wsdl"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/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 bb3f7a6..e98ffba 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 @@ -34,9 +34,9 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="security.encryption.username" value="mystskey"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </map> </property> @@ -48,7 +48,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSAML2Port" createdFromAPI="true"> @@ -58,7 +58,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSAML1EncryptedPort" createdFromAPI="true"> @@ -68,7 +68,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/UTEncrypted?wsdl"/> @@ -80,7 +80,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <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="security.sts.token.usecert" value="true"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </map> </property> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml index d3db61f..b4281c9 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml @@ -32,20 +32,20 @@ <map> <entry key="security.username" value="alice"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2BearerPort" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2BearerPort2" createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <http:conduit name="https://localhost.*"> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml index fc5f296..6370756 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-bad-client.xml @@ -28,7 +28,7 @@ <entry key="security.username" value="myclientkey"/> <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:8443/SecurityTokenService/Transport?wsdl"/> @@ -38,9 +38,9 @@ <map> <entry key="security.username" value="eve"/> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml index a0ebbe0..3527b88 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml @@ -28,7 +28,7 @@ <entry key="security.username" value="myclientkey"/> <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="wsdlLocation" value="https://localhost:8443/SecurityTokenService/Transport?wsdl"/> @@ -37,9 +37,9 @@ <property name="properties"> <map> <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"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean>