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-intermediary-caching.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml index 25d649b..9921276 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml @@ -45,7 +45,7 @@ <bean id="defaultTokenStore" class="org.apache.cxf.ws.security.tokenstore.MemoryTokenStore"/> <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:8443/SecurityTokenService/Transport?wsdl"/> @@ -56,9 +56,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/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml index 305e3b8..03c3d6d 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml @@ -44,7 +44,7 @@ <bean id="delegationCallbackHandler" class="org.apache.cxf.ws.security.trust.delegation.ReceivedTokenCallbackHandler"/> <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:8443/SecurityTokenService/Transport?wsdl"/> @@ -55,9 +55,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/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml index f82b4e1..1eeee80 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml @@ -27,16 +27,16 @@ <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.disable-wsmex-call-using-epr-address" value="true"/> - <entry key="ws-security.sts.client"> + <entry key="security.sts.disable-wsmex-call-using-epr-address" value="true"/> + <entry key="security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> <property name="policy" value="classpath:/org/apache/cxf/systest/sts/issuer/sts-transport-policy.xml"/> <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> @@ -47,19 +47,19 @@ <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.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"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Soap12Port"; createdFromAPI="true"> <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.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="ws-security.sts.client-soap12-binding" 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="security.sts.client-soap12-binding" value="true"/> </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/jaas/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml index d5f60a2..3e9bb09 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml @@ -58,7 +58,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitut" implementor="org.apache.cxf.systest.sts.jaas.DoubleItPortTypeImpl" endpointName="s:DoubleItUTPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.jaas.Server}/doubleit/services/doubleitut"; wsdlLocation="org/apache/cxf/systest/sts/jaas/DoubleIt.wsdl"> <jaxws:properties> <entry key="ws-security.validate.token" value="false"/> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> <jaxws:inInterceptors> <ref bean="authenticationInterceptor"/> @@ -97,7 +97,7 @@ <!-- JAX-RS service --> <jaxrs:server modelRef="classpath:org/apache/cxf/systest/sts/jaas/jaxrs.xml" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.jaas.Server}/doubleit/services/doubleit-rs";> <jaxrs:properties> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxrs:properties> <jaxrs:inInterceptors> <ref bean="authenticationInterceptor"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml index 9be5b69..404f92b 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml @@ -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/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml index 81f0ab1..435ee5c 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml @@ -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/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml index 7aa315f..9762f13 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml @@ -40,17 +40,17 @@ </bean> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML1Port"; 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}DoubleItSymmetricSAML2Port"; 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}DoubleItSymmetricSAML1EncryptedPort"; 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="http://localhost:8080/SecurityTokenService/UTEncrypted?wsdl"/> @@ -71,7 +71,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML2SecureConversationPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.sts.client.sct" value-ref="stsClient"/> + <entry key="security.sts.client.sct" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml index 379b905..0869c8d 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml @@ -25,7 +25,7 @@ </cxf:bus> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1Port"; 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:8443/SecurityTokenService/Transport?wsdl"/> @@ -35,9 +35,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="eve"/> - <entry key="ws-security.sts.token.properties" value="eveKeystore.properties"/> - <entry key="ws-security.sts.token.usecert" value="true"/> + <entry key="security.sts.token.username" value="eve"/> + <entry key="security.sts.token.properties" value="eveKeystore.properties"/> + <entry key="security.sts.token.usecert" value="true"/> </map> </property> </bean> @@ -49,7 +49,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"/> @@ -60,9 +60,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/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml index 4479597..2151d9b 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/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}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}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:8443/SecurityTokenService/Transport?wsdl"/> @@ -55,9 +55,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="false"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.usecert" value="false"/> </map> </property> </bean> @@ -69,7 +69,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" value-ref="stsClient"/> + <entry key="security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2X509EndorsingPort"; createdFromAPI="true"> @@ -77,7 +77,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" 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/username_actas/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml index 3e456a8..62861c3 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-client.xml @@ -31,7 +31,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/X509?wsdl"/> @@ -45,8 +45,8 @@ <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> - <entry key="ws-security.sts.token.username" value="myclientkey"/> - <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> </map> </property> </bean> @@ -60,7 +60,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/X509?wsdl"/> @@ -74,8 +74,8 @@ <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> - <entry key="ws-security.sts.token.username" value="myclientkey"/> - <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> </map> </property> </bean> @@ -89,7 +89,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/X509?wsdl"/> @@ -103,8 +103,8 @@ <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> - <entry key="ws-security.sts.token.username" value="myclientkey"/> - <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> </map> </property> </bean> @@ -118,7 +118,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/X509?wsdl"/> @@ -132,8 +132,8 @@ <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> - <entry key="ws-security.sts.token.username" value="myclientkey"/> - <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> </map> </property> </bean> @@ -147,7 +147,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/X509?wsdl"/> @@ -161,8 +161,8 @@ <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> - <entry key="ws-security.sts.token.username" value="myclientkey"/> - <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> </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/username_onbehalfof/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml index 009c7c1..e2c10fe 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-client.xml @@ -31,7 +31,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/X509?wsdl"/> @@ -45,8 +45,8 @@ <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> - <entry key="ws-security.sts.token.username" value="myclientkey"/> - <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> </map> </property> </bean> @@ -60,7 +60,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/X509?wsdl"/> @@ -74,8 +74,8 @@ <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> - <entry key="ws-security.sts.token.username" value="myclientkey"/> - <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> </map> </property> </bean> @@ -89,7 +89,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/X509?wsdl"/> @@ -103,8 +103,8 @@ <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> - <entry key="ws-security.sts.token.username" value="myclientkey"/> - <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> </map> </property> </bean> @@ -118,7 +118,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/X509?wsdl"/> @@ -132,8 +132,8 @@ <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> - <entry key="ws-security.sts.token.username" value="myclientkey"/> - <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> </map> </property> </bean> @@ -147,7 +147,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/X509?wsdl"/> @@ -161,8 +161,8 @@ <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> - <entry key="ws-security.sts.token.username" value="myclientkey"/> - <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> + <entry key="security.sts.token.username" value="myclientkey"/> + <entry key="security.sts.token.properties" value="clientKeystore.properties"/> </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/x509_symmetric/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml index a2b5740..de025bc 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml @@ -40,19 +40,19 @@ </bean> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML1Port"; 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}DoubleItSymmetricSAML2Port"; 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}DoubleItSymmetricSAML2EndorsingPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> - <entry key="ws-security.sts.client" value-ref="stsClient"/> + <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/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml index a206f67..048932a 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml @@ -62,7 +62,7 @@ <constructor-arg value="true"/> </bean> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <ref bean="stsclient"/> </entry> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml index 8ac8d42..7a711a3 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml @@ -52,7 +52,7 @@ <constructor-arg value="true"/> </bean> </entry> - <entry key="ws-security.sts.client"> + <entry key="security.sts.client"> <ref bean="stsclient"/> </entry> <entry key="ws-security.enable.streaming" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ed0f2511/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml index 22b7c28..a5af7a7 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml @@ -38,7 +38,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.kerberos.common.KeystorePasswordCallback"/> - <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"/> @@ -48,9 +48,9 @@ <map> <entry key="security.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> - <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/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml index fd1dc44..a0dc1d3 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml @@ -102,7 +102,7 @@ <entry key="security.signature.username" value="alice"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <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/Symmetric?wsdl"/>
