http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 130d310..4db22da 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 @@ -28,7 +28,7 @@ <jaxws:properties> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> <entry key="ws-security.sts.client"> @@ -41,7 +41,7 @@ <property name="properties"> <map> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> @@ -57,7 +57,7 @@ <jaxws:properties> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> <entry key="ws-security.sts.client"> @@ -70,7 +70,7 @@ <property name="properties"> <map> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> @@ -86,7 +86,7 @@ <jaxws:properties> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> <entry key="ws-security.sts.client"> @@ -99,7 +99,7 @@ <property name="properties"> <map> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> @@ -115,7 +115,7 @@ <jaxws:properties> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> <entry key="ws-security.sts.client"> @@ -128,7 +128,7 @@ <property name="properties"> <map> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> @@ -144,7 +144,7 @@ <jaxws:properties> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> <entry key="ws-security.sts.client"> @@ -157,7 +157,7 @@ <property name="properties"> <map> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml index 27241fe..c2bd6d5 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service.xml @@ -22,7 +22,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearer"; wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -34,7 +34,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort2" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearer2"; wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -46,7 +46,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer3" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort3" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearer3"; wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -58,7 +58,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer4" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort4" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearer4"; wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -71,7 +71,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer5" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort5" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearer5"; wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <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/username_actas/cxf-service2.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service2.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service2.xml index f5656d6..89d27bf 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service2.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/cxf-service2.xml @@ -22,7 +22,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearer"; wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -34,7 +34,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort2" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearer2"; wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -46,7 +46,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer3" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort3" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearer3"; wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -58,7 +58,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer4" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort4" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearer4"; wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -70,7 +70,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer5" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItAsymmetricSAML2BearerPort5" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearer5"; wsdlLocation="org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <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/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 cb90d47..63b0b20 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 @@ -28,7 +28,7 @@ <jaxws:properties> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> <entry key="ws-security.sts.client"> @@ -41,7 +41,7 @@ <property name="properties"> <map> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> @@ -57,7 +57,7 @@ <jaxws:properties> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> <entry key="ws-security.sts.client"> @@ -70,7 +70,7 @@ <property name="properties"> <map> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> @@ -86,7 +86,7 @@ <jaxws:properties> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> <entry key="ws-security.sts.client"> @@ -99,7 +99,7 @@ <property name="properties"> <map> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> @@ -115,7 +115,7 @@ <jaxws:properties> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> <entry key="ws-security.sts.client"> @@ -128,7 +128,7 @@ <property name="properties"> <map> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> @@ -144,7 +144,7 @@ <jaxws:properties> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="myservicekey"/> <entry key="ws-security.sts.client"> @@ -157,7 +157,7 @@ <property name="properties"> <map> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml index 8f862f4..152b1dc 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service.xml @@ -22,7 +22,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearerobo"; wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -34,7 +34,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort2" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearerobo2"; wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -46,7 +46,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer3" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort3" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearerobo3"; wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -58,7 +58,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer4" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort4" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearerobo4"; wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -71,7 +71,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer5" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort5" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitasymmetricsaml2bearerobo5"; wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <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/username_onbehalfof/cxf-service2.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml index a009682..92d9910 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/cxf-service2.xml @@ -22,7 +22,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearerobo"; wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -34,7 +34,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort2" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearerobo2"; wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -46,7 +46,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer3" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort3" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearerobo3"; wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -58,7 +58,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer4" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort4" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearerobo4"; wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> @@ -70,7 +70,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitasymmetricsaml2bearer5" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItOBOAsymmetricSAML2BearerPort5" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server2}/doubleit/services/doubleitasymmetricsaml2bearerobo5"; wsdlLocation="org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl"> <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <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/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 e409ca0..c67b74b 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 @@ -31,7 +31,7 @@ <property name="properties"> <map> <entry key="security.signature.username" value="myclientkey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> <entry key="ws-security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 d993ec0..6037227 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 @@ -34,7 +34,7 @@ <property name="properties"> <map> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> @@ -44,7 +44,7 @@ <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/x509_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.saml1.validator"> @@ -54,7 +54,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.Server}/doubleit/services/doubleitsymmetricsaml2"; wsdlLocation="org/apache/cxf/systest/sts/x509_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.saml2.validator"> @@ -69,7 +69,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitsymmetricsaml2endorsing" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML2EndorsingPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.Server}/doubleit/services/doubleitsymmetricsaml2endorsing"; wsdlLocation="org/apache/cxf/systest/sts/x509_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/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 511f92b..ca58a46 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 @@ -34,7 +34,7 @@ <property name="properties"> <map> <entry key="security.signature.username" value="myservicekey"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> @@ -44,7 +44,7 @@ <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/x509_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.saml1.validator"> @@ -60,7 +60,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/x509_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.saml2.validator"> @@ -71,7 +71,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleitsymmetricsaml2endorsing" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML2EndorsingPort" serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.StaxServer}/doubleit/services/doubleitsymmetricsaml2endorsing"; wsdlLocation="org/apache/cxf/systest/sts/x509_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/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml index e20ce7d..dd9a5b3 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml @@ -55,7 +55,7 @@ <jaxws:properties> <entry key="ws-security.kerberos.jaas.context" value="alice" /> <entry key="ws-security.kerberos.spn" value="b...@service.ws.apache.org" /> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosSymmetricPort"; createdFromAPI="true"> @@ -102,7 +102,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosAsymmetricPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -129,12 +129,12 @@ </entry> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosAsymmetricEndorsingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -179,7 +179,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosAsymmetricSignedEndorsingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -196,7 +196,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKerberosAsymmetricSignedEncryptedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml index 618fcb3..a10aba6 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml @@ -55,33 +55,33 @@ <jaxws:properties> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverTransport2" address="https://localhost:${testutil.ports.Server.2}/DoubleItKerberosTransport2"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort2" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverSymmetric" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverSymmetricSupporting" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSupportingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosSupporting" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSupportingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> </jaxws:properties> @@ -89,7 +89,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverAsymmetric" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosAsymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> <entry key="security.username" value="bob"/> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> @@ -101,13 +101,13 @@ <jaxws:properties> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverAsymmetricEndorsing" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosAsymmetricEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> <entry key="security.username" value="bob"/> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> @@ -117,14 +117,14 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverSymmetricProtection" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricProtection"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricProtectionPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverSymmetricDerivedProtection" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricDerivedProtection"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricDerivedProtectionPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> </jaxws:properties> @@ -132,7 +132,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverAsymmetricSignedEndorsing" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosAsymmetricSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricSignedEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> <entry key="security.username" value="bob"/> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> @@ -143,7 +143,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverAsymmetricSignedEncrypted" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosAsymmetricSignedEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricSignedEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> <entry key="security.username" value="bob"/> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> @@ -153,14 +153,14 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverSymmetricEndorsingEncrypted" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricEndorsingEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricEndorsingEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverSymmetricSignedEndorsingEncrypted" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricSignedEndorsingEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSignedEndorsingEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> </jaxws:properties> @@ -168,7 +168,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverSymmetricSecureConversation" address="http://localhost:${testutil.ports.Server}/DoubleItKerberosSymmetricSecureConversation"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSecureConversationPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> </jaxws:properties> @@ -176,7 +176,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="doubleittransportsaml2" implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="STSClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server.3}/doubleit/services/doubleittransportsaml2"; wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml index 1f37baa..944b7ae 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml @@ -44,35 +44,35 @@ </httpj:engine-factory> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverTransport" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItKerberosTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverTransport2" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItKerberosTransport2"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportPort2" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverSymmetric" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverSymmetricSupporting" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSymmetricSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSupportingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosSupporting" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSupportingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -80,7 +80,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverAsymmetric" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosAsymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> <entry key="security.username" value="bob"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> @@ -91,7 +91,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverTransportEndorsing" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItKerberosTransportEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosTransportEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="ws-security.is-bsp-compliant" value="false"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -99,7 +99,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverAsymmetricEndorsing" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosAsymmetricEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> <entry key="security.username" value="bob"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> @@ -109,14 +109,14 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverSymmetricProtection" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSymmetricProtection"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricProtectionPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverSymmetricDerivedProtection" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSymmetricDerivedProtection"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricDerivedProtectionPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -124,7 +124,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverAsymmetricSignedEndorsing" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosAsymmetricSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricSignedEndorsingPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> <entry key="security.username" value="bob"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> @@ -135,7 +135,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverAsymmetricSignedEncrypted" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosAsymmetricSignedEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosAsymmetricSignedEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> <entry key="security.username" value="bob"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> @@ -145,14 +145,14 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverSymmetricEndorsingEncrypted" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSymmetricEndorsingEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricEndorsingEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="KerberosOverSymmetricSignedEndorsingEncrypted" address="http://localhost:${testutil.ports.StaxServer}/DoubleItKerberosSymmetricSignedEndorsingEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItKerberosSymmetricSignedEndorsingEncryptedPort" implementor="org.apache.cxf.systest.kerberos.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/kerberos/wssec/kerberos/DoubleItKerberos.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 51784fe..4e8029d 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 @@ -37,7 +37,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.kerberos.common.KeystorePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> <entry key="ws-security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> <constructor-arg ref="cxf"/> @@ -47,7 +47,7 @@ <property name="properties"> <map> <entry key="security.username" value="alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> + <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"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml index 39f4e70..1bd7ac5 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/client.xml @@ -33,49 +33,49 @@ <jaxws:properties> <entry key="ws-security.kerberos.jaas.context" value="alice"/> <entry key="ws-security.kerberos.spn" value="b...@service.ws.apache.org"/> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSpnegoSymmetricDerivedPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.kerberos.jaas.context" value="alice"/> <entry key="ws-security.kerberos.spn" value="b...@service.ws.apache.org"/> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSpnegoSymmetricEncryptBeforeSigningPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.kerberos.jaas.context" value="alice"/> <entry key="ws-security.kerberos.spn" value="b...@service.ws.apache.org"/> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSpnegoTransportPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.kerberos.jaas.context" value="alice"/> <entry key="ws-security.kerberos.spn" value="b...@service.ws.apache.org"/> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSpnegoTransportEndorsingPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.kerberos.jaas.context" value="alice"/> <entry key="ws-security.kerberos.spn" value="b...@service.ws.apache.org"/> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSpnegoTransportEndorsingSP11Port"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.kerberos.jaas.context" value="alice"/> <entry key="ws-security.kerberos.spn" value="b...@service.ws.apache.org"/> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSpnegoSymmetricSecureConversationPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.kerberos.jaas.context" value="alice"/> <entry key="ws-security.kerberos.spn" value="b...@service.ws.apache.org"/> - <entry key="ws-security.callback-handler" value-ref="kerberosCallbackHandler"/> + <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> </jaxws:properties> </jaxws:client>
