http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml index f47c15a..00c5862 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml @@ -21,7 +21,7 @@ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2BearerPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml2bearer"; wsdlLocation="org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -29,7 +29,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2bearer2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2BearerPort2" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml2bearer2"; wsdlLocation="org/apache/cxf/systest/sts/bearer/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.enable.streaming" value="true"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml index eb2f175..d18ac2e 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml @@ -117,12 +117,12 @@ </bean> <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="transportSTS" implementor="#transportSTSProviderBean" address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport"; wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/delegation/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port" depends-on="ClientAuthHttpsSettings"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="transportSTSUT" implementor="#transportUTSTSProviderBean" address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/TransportUT"; wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/delegation/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_UT_Port" depends-on="ClientAuthHttpsSettings"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml index 1a17c5b..0ad5310 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml @@ -51,7 +51,7 @@ </bean> <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="EncryptedUTSTS" implementor="#encryptedUtSTSProviderBean" address="http://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/UTEncrypted"; wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:UTEncrypted_Port"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="stsKeystore.properties"/> <entry key="security.signature.username" value="mystskey"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml index 49a1b6d..9292911 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml @@ -137,12 +137,12 @@ <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="transportSTS" implementor="#transportSTSProviderBean" address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport"; wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port" depends-on="ClientAuthHttpsSettings"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="transportSTS-realmB" implementor="#transportSTSProviderBean2" address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/b-issuer/Transport"; wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_SAML_Port" depends-on="ClientAuthHttpsSettings"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="stsKeystore.properties"/> </jaxws:properties> </jaxws:endpoint> @@ -154,7 +154,7 @@ serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port" depends-on="ClientAuthHttpsSettings"> <jaxws:properties> - <entry key="ws-security.callback-handler" + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" /> <entry key="ws-security.signature.properties" value="stsKeystore.properties"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml index 06b8813..71b2fc1 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml @@ -45,7 +45,7 @@ </bean> <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="UTSTS" implementor="#utSTSProviderBean" address="http://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/UT"; wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:UT_Port"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="stsKeystore.properties"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml index b2e18c6..8eb3d16 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml @@ -67,7 +67,7 @@ </bean> <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="X509STS" implementor="#x509STSProviderBean" address="http://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/X509"; wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:X509_Port"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="stsKeystore.properties"/> <entry key="security.signature.username" value="mystskey"/> <entry key="security.encryption.username" value="useReqSigCert"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-encrypted-ut.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-encrypted-ut.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-encrypted-ut.xml index 432ac8d..0132d88 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-encrypted-ut.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-encrypted-ut.xml @@ -51,7 +51,7 @@ </bean> <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="EncryptedUTSTS" implementor="#encryptedUtSTSProviderBean" address="http://localhost:${testutil.ports.StaxSTSServer.2}/SecurityTokenService/UTEncrypted"; wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:UTEncrypted_Port"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="stsKeystore.properties"/> <entry key="security.signature.username" value="mystskey"/> <entry key="ws-security.enable.streaming" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml index a209974..2585cd4 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml @@ -118,13 +118,13 @@ </bean> <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="transportSTS" implementor="#transportSTSProviderBean" address="https://localhost:${testutil.ports.StaxSTSServer}/SecurityTokenService/Transport"; wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port" depends-on="ClientAuthHttpsSettings"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="transportSTS-realmB" implementor="#transportSTSProviderBean2" address="https://localhost:${testutil.ports.StaxSTSServer}/SecurityTokenService/b-issuer/Transport"; wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_SAML_Port" depends-on="ClientAuthHttpsSettings"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="stsKeystore.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -137,7 +137,7 @@ serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port" depends-on="ClientAuthHttpsSettings"> <jaxws:properties> - <entry key="ws-security.callback-handler" + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" /> <entry key="ws-security.signature.properties" value="stsKeystore.properties"/> <entry key="ws-security.enable.streaming" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml index 7c830b4..3c8a308 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml @@ -45,7 +45,7 @@ </bean> <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="UTSTS" implementor="#utSTSProviderBean" address="http://localhost:${testutil.ports.StaxSTSServer.2}/SecurityTokenService/UT"; wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:UT_Port"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="stsKeystore.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml index 2a0fc97..8d3c984 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml @@ -67,7 +67,7 @@ </bean> <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="X509STS" implementor="#x509STSProviderBean" address="http://localhost:${testutil.ports.StaxSTSServer.2}/SecurityTokenService/X509"; wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:X509_Port"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="stsKeystore.properties"/> <entry key="security.signature.username" value="mystskey"/> <entry key="security.encryption.username" value="useReqSigCert"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 0e0e31e..364727c 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 @@ -27,7 +27,7 @@ <jaxws:properties> <entry key="security.username" value="myclientkey"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> @@ -37,7 +37,7 @@ <property name="properties"> <map> <entry key="security.username" value="eve"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.token.username" value="myclientkey"/> <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> <entry key="ws-security.sts.token.usecert" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/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 5955800..1202b02 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 @@ -27,7 +27,7 @@ <jaxws:properties> <entry key="security.username" value="myclientkey"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> @@ -36,7 +36,7 @@ <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/> <property name="properties"> <map> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.token.username" value="myclientkey"/> <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> <entry key="ws-security.sts.token.usecert" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/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 4ce34a9..c9e2c60 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 @@ -26,7 +26,7 @@ </cxf:bus> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml1endorsing" implementor="org.apache.cxf.systest.sts.intermediary_transformation.IntermediaryCachingPortTypeImpl" endpointName="s:DoubleItTransportSAML1EndorsingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Intermediary}/doubleit/services/doubleittransportsaml1endorsing"; wsdlLocation="org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> @@ -55,7 +55,7 @@ <property name="properties"> <map> <entry key="security.username" value="bob"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.token.username" value="myclientkey"/> <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> <entry key="ws-security.sts.token.usecert" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/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 c2dcf9b..5abbc6b 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 @@ -26,7 +26,7 @@ </cxf:bus> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml1endorsing" implementor="org.apache.cxf.systest.sts.intermediary_transformation.IntermediaryPortTypeImpl" endpointName="s:DoubleItTransportSAML1EndorsingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Intermediary}/doubleit/services/doubleittransportsaml1endorsing"; wsdlLocation="org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> @@ -54,7 +54,7 @@ <property name="properties"> <map> <entry key="security.username" value="bob"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.token.username" value="myclientkey"/> <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> <entry key="ws-security.sts.token.usecert" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml index 89d783d..d50a8a0 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml @@ -26,7 +26,7 @@ </cxf:bus> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server.2}/doubleit/services/doubleittransportsaml2"; wsdlLocation="org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.saml2.validator"> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 b3fc758..f82b4e1 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 @@ -26,7 +26,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1Port"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.disable-wsmex-call-using-epr-address" value="true"/> <entry key="ws-security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> @@ -46,7 +46,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Port"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <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"/> @@ -55,7 +55,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Soap12Port"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.token.username" value="myclientkey"/> <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> <entry key="ws-security.sts.token.usecert" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml index 215d77b..77954b9 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml @@ -21,7 +21,7 @@ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1"; wsdlLocation="org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.saml1.validator"> <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/> @@ -31,7 +31,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2"; wsdlLocation="org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/> @@ -40,7 +40,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2soap12" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2Soap12Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2soap12"; wsdlLocation="org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml index 62e5da1..99229cd 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml @@ -118,12 +118,12 @@ </bean> <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="transportSTS" implementor="#transportSTSProviderBean" address="https://localhost:30101/SecurityTokenService/Transport"; wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/issuer/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port" depends-on="ClientAuthHttpsSettings"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="transportSTSSoap12" implementor="#transportSTSProviderBean" address="https://localhost:30101/SecurityTokenService/TransportSoap12"; wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/issuer/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Soap12_Port" depends-on="ClientAuthHttpsSettings"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml index 5e5e09e..c6d3cef 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-client.xml @@ -26,7 +26,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> </jaxws:properties> </jaxws:client> <http:conduit name="https://localhost.*";> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml index 4eb5e4d..0029c32 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml @@ -29,7 +29,7 @@ </bean> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportut" implementor="#doubleItImpl" endpointName="s:DoubleItTransportUTPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Intermediary}/doubleit/services/doubleittransportut"; wsdlLocation="org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> </jaxws:properties> </jaxws:endpoint> <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml index 5fd50df..9736ed0 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml @@ -27,7 +27,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2supporting" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2SupportingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server.2}/doubleit/services/doubleittransportsaml2supporting"; wsdlLocation="org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl"> <jaxws:properties> <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> </jaxws:properties> </jaxws:endpoint> <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml index 34539c5..a4da3e5 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml @@ -29,7 +29,7 @@ </bean> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportut" implementor="#doubleItImpl" endpointName="s:DoubleItTransportUTPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxIntermediary}/doubleit/services/doubleittransportut"; wsdlLocation="org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml index bcbdffe..170e946 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml @@ -27,7 +27,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2supporting" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2SupportingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer.2}/doubleit/services/doubleittransportsaml2supporting"; wsdlLocation="org/apache/cxf/systest/sts/sendervouches/DoubleIt.wsdl"> <jaxws:properties> <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 597a857..9be5b69 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 @@ -37,7 +37,7 @@ <property name="properties"> <map> <entry key="security.username" value="alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.token.username" value="myclientkey"/> <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> <entry key="ws-security.sts.token.usecert" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/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 e13169a..81f0ab1 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 @@ -37,7 +37,7 @@ <property name="properties"> <map> <entry key="security.username" value="alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.token.username" value="myclientkey"/> <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> <entry key="ws-security.sts.token.usecert" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml index e6997cd..26e95c4 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml @@ -21,7 +21,7 @@ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1"; wsdlLocation="org/apache/cxf/systest/sts/stsclient/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 fc00445..73a0ad0 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 @@ -31,7 +31,7 @@ <property name="properties"> <map> <entry key="security.username" value="alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="security.encryption.username" value="mystskey"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> @@ -59,7 +59,7 @@ <property name="properties"> <map> <entry key="security.username" value="alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> <entry key="ws-security.is-bsp-compliant" value="false"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml index e31c684..e8964d8 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-service.xml @@ -21,28 +21,28 @@ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitsymmetricsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML1Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitsymmetricsaml1"; wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitsymmetricsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML2Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitsymmetricsaml2"; wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitsymmetricsaml1encrypted" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML1EncryptedPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitsymmetricsaml1encrypted"; wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitsymmetricsaml2secureconv" implementor="org.apache.cxf.systest.sts.common.DoubleItImpl" endpointName="s:DoubleItSymmetricSAML2SecureConversationPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitsymmetricsaml2SecureConversation"; wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-stax-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-stax-service.xml index 993f153..e957f38 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-stax-service.xml @@ -21,7 +21,7 @@ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitsymmetricsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML1Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleitsymmetricsaml1"; wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -29,7 +29,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitsymmetricsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML2Port" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleitsymmetricsaml2"; wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -37,7 +37,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitsymmetricsaml1encrypted" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML1EncryptedPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleitsymmetricsaml1encrypted"; wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -45,7 +45,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitsymmetricsaml2secureconv" implementor="org.apache.cxf.systest.sts.common.DoubleItImpl" endpointName="s:DoubleItSymmetricSAML2SecureConversationPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleitsymmetricsaml2SecureConversation"; wsdlLocation="org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.enable.streaming" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml index 9cb4e98..c0074ec 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml @@ -27,14 +27,14 @@ <jaxws:properties> <entry key="security.username" value="myclientkey"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2PublicKeyPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="myclientkey"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> </jaxws:properties> </jaxws:client> <http:conduit name="https://localhost.*";> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml index 1830400..8747137 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml @@ -21,14 +21,14 @@ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml1PublicKey" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1PublicKeyPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1publickey"; wsdlLocation="org/apache/cxf/systest/sts/template/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2PublicKey" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2PublicKeyPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2publickey"; wsdlLocation="org/apache/cxf/systest/sts/template/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml index 24a0ed9..ce36814 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml @@ -21,7 +21,7 @@ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml1PublicKey" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1PublicKeyPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml1publickey"; wsdlLocation="org/apache/cxf/systest/sts/template/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -29,7 +29,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2PublicKey" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2PublicKeyPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml2publickey"; wsdlLocation="org/apache/cxf/systest/sts/template/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.enable.streaming" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 b7113b1..59116bf 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 @@ -34,7 +34,7 @@ <property name="properties"> <map> <entry key="security.username" value="alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.token.username" value="eve"/> <entry key="ws-security.sts.token.properties" value="eveKeystore.properties"/> <entry key="ws-security.sts.token.usecert" value="true"/> @@ -48,7 +48,7 @@ <jaxws:properties> <entry key="security.username" value="myclientkey"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> @@ -59,7 +59,7 @@ <property name="properties"> <map> <entry key="security.username" value="alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.token.username" value="myclientkey"/> <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> <entry key="ws-security.sts.token.usecert" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/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 0394c17..ad578c5 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 @@ -31,7 +31,7 @@ <property name="properties"> <map> <entry key="security.username" value="alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.token.username" value="myclientkey"/> <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> <entry key="ws-security.sts.token.usecert" value="true"/> @@ -54,7 +54,7 @@ <property name="properties"> <map> <entry key="security.username" value="alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.token.username" value="myclientkey"/> <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> <entry key="ws-security.sts.token.usecert" value="false"/> @@ -68,7 +68,7 @@ <jaxws:properties> <entry key="security.username" value="myclientkey"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> @@ -76,7 +76,7 @@ <jaxws:properties> <entry key="security.username" value="myclientkey"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.client" value-ref="stsClient"/> </jaxws:properties> </jaxws:client> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml index 3fbf5a2..521390a 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml @@ -21,7 +21,7 @@ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1"; wsdlLocation="org/apache/cxf/systest/sts/transport/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.saml1.validator"> <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/> @@ -31,7 +31,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2"; wsdlLocation="org/apache/cxf/systest/sts/transport/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/> @@ -40,14 +40,14 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml1endorsing" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1EndorsingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1endorsing"; wsdlLocation="org/apache/cxf/systest/sts/transport/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2x509" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2X509EndorsingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2x509endorsing"; wsdlLocation="org/apache/cxf/systest/sts/transport/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="stsKeystore.properties"/> <entry key="ws-security.enable.timestamp.cache" value="false"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml index 6aa03e8..d766aa5 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml @@ -21,7 +21,7 @@ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml1"; wsdlLocation="org/apache/cxf/systest/sts/transport/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.saml1.validator"> <bean class="org.apache.cxf.ws.security.trust.STSStaxTokenValidator"/> @@ -32,7 +32,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml2"; wsdlLocation="org/apache/cxf/systest/sts/transport/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.ws.security.trust.STSStaxTokenValidator"/> @@ -42,7 +42,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml1endorsing" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1EndorsingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml1endorsing"; wsdlLocation="org/apache/cxf/systest/sts/transport/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -50,7 +50,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2x509endorsing" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2X509EndorsingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleittransportsaml2x509endorsing"; wsdlLocation="org/apache/cxf/systest/sts/transport/DoubleIt.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="stsKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.enable.streaming" value="true"/>
