http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 557066a..fa120a7 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 @@ -23,7 +23,7 @@ <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/> @@ -35,7 +35,7 @@ <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/> @@ -47,7 +47,7 @@ <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/> @@ -59,7 +59,7 @@ <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/> @@ -72,7 +72,7 @@ <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 73697a8..c488143 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 @@ -23,7 +23,7 @@ <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/> @@ -35,7 +35,7 @@ <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/> @@ -47,7 +47,7 @@ <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/> @@ -59,7 +59,7 @@ <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/> @@ -71,7 +71,7 @@ <jaxws:properties> <entry key="security.signature.username" value="myservicekey"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 5df25cf..a2b5740 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 @@ -32,7 +32,7 @@ <map> <entry key="security.signature.username" value="myclientkey"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> + <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.encryption.properties" value="clientKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> </map> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 0737f82..6d82a88 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 @@ -35,7 +35,7 @@ <map> <entry key="security.signature.username" value="myservicekey"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> </map> @@ -45,7 +45,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="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.saml1.validator"> <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/> @@ -55,7 +55,7 @@ <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="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"> @@ -70,7 +70,7 @@ <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="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 119bf3f..455aced 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 @@ -35,7 +35,7 @@ <map> <entry key="security.signature.username" value="myservicekey"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.properties" value="serviceKeystore.properties"/> <entry key="security.encryption.username" value="mystskey"/> </map> @@ -45,7 +45,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="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.saml1.validator"> <bean class="org.apache.cxf.ws.security.trust.STSStaxTokenValidator"> @@ -61,7 +61,7 @@ <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="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.saml2.validator"> <bean class="org.apache.cxf.ws.security.trust.STSStaxTokenValidator"/> @@ -72,7 +72,7 @@ <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="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 6daba6e..85b79b3 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 @@ -105,7 +105,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="ws-security.kerberos.client"> <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient"> @@ -127,7 +127,7 @@ <property name="callbackHandler" ref="kerberosCallbackHandler"/> </bean> </entry> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -137,7 +137,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="ws-security.kerberos.client"> <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient"> @@ -182,7 +182,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="ws-security.kerberos.client"> <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient"> @@ -199,7 +199,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="ws-security.kerberos.client"> <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient"> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 0c22b4d..1aea3a1 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 @@ -68,21 +68,21 @@ <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="security.callback-handler" value-ref="kerberosCallbackHandler"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="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="security.callback-handler" value-ref="kerberosCallbackHandler"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="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="security.callback-handler" value-ref="kerberosCallbackHandler"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> </jaxws:properties> </jaxws:endpoint> @@ -90,7 +90,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> @@ -108,7 +108,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> @@ -118,14 +118,14 @@ <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="security.callback-handler" value-ref="kerberosCallbackHandler"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="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="security.callback-handler" value-ref="kerberosCallbackHandler"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> </jaxws:properties> </jaxws:endpoint> @@ -133,7 +133,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> @@ -144,7 +144,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value-ref="kerberosCallbackHandler"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> @@ -154,14 +154,14 @@ <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="security.callback-handler" value-ref="kerberosCallbackHandler"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="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="security.callback-handler" value-ref="kerberosCallbackHandler"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> </jaxws:properties> </jaxws:endpoint> @@ -169,7 +169,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="security.callback-handler" value-ref="kerberosCallbackHandler"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.bst.validator" value-ref="kerberosValidator"/> </jaxws:properties> </jaxws:endpoint> @@ -177,7 +177,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="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> + <entry key="security.signature.properties" value="serviceKeystore.properties"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 7fb82fe..83ae26b 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 @@ -59,21 +59,21 @@ <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="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="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="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="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="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> @@ -81,7 +81,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.is-bsp-compliant" value="false"/> @@ -92,7 +92,7 @@ <jaxws:properties> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> @@ -100,7 +100,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.is-bsp-compliant" value="false"/> @@ -110,14 +110,14 @@ <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="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="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="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> @@ -125,7 +125,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.is-bsp-compliant" value="false"/> @@ -136,7 +136,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.is-bsp-compliant" value="false"/> @@ -146,14 +146,14 @@ <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="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="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="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KerberosServicePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 4e8029d..22b7c28 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 @@ -36,7 +36,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Port"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="myclientkey"/> - <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> + <entry key="security.signature.properties" value="clientKeystore.properties"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.kerberos.common.KeystorePasswordCallback"/> <entry key="ws-security.sts.client"> <bean class="org.apache.cxf.ws.security.trust.STSClient"> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java index 2068880..79f4cc1 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java @@ -161,7 +161,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { properties.put("security.saml-callback-handler", "org.apache.cxf.systest.jaxrs.security.oauth2.SamlCallbackHandler2"); properties.put("security.signature.username", "alice"); - properties.put("ws-security.signature.properties", CRYPTO_RESOURCE_PROPERTIES); + properties.put("security.signature.properties", CRYPTO_RESOURCE_PROPERTIES); bean.setProperties(properties); bean.getOutInterceptors().add(new Saml2BearerAuthOutInterceptor()); http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/server.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/server.xml index f3f6fbe..260f4ba 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/server.xml +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/server.xml @@ -81,7 +81,7 @@ under the License. <ref bean="serviceBean"/> </jaxrs:serviceBeans> <jaxrs:properties> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> </jaxrs:properties> </jaxrs:server> <jaxrs:server address="https://localhost:${testutil.ports.jaxrs-oauth2}/oauth2-auth";> @@ -92,7 +92,7 @@ under the License. <ref bean="samlAuthHandler"/> </jaxrs:providers> <jaxrs:properties> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> </jaxrs:properties> </jaxrs:server> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java index c68d552..cb18ea3 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java @@ -221,7 +221,7 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase { properties.put("security.saml-callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.SamlCallbackHandler"); properties.put("security.signature.username", "alice"); - properties.put("ws-security.signature.properties", + properties.put("security.signature.properties", "org/apache/cxf/systest/jaxrs/security/alice.properties"); if (selfSign) { properties.put("ws-security.self-sign-saml-assertion", "true"); http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/server.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/server.xml index 92ffdff..1fe5f58 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/server.xml +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/server.xml @@ -50,7 +50,7 @@ under the License. <ref bean="samlHeaderHandler"/> </jaxrs:providers> <jaxrs:properties> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> </jaxrs:properties> </jaxrs:server> <jaxrs:server address="https://localhost:${testutil.ports.jaxrs-saml}/samlform";> @@ -61,7 +61,7 @@ under the License. <ref bean="samlFormHandler"/> </jaxrs:providers> <jaxrs:properties> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> </jaxrs:properties> </jaxrs:server> <jaxrs:server address="https://localhost:${testutil.ports.jaxrs-saml}/samlxml";> @@ -73,7 +73,7 @@ under the License. <ref bean="samlEnvHandler"/> </jaxrs:providers> <jaxrs:properties> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> </jaxrs:properties> </jaxrs:server> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java index 482b505..b059232 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java @@ -112,7 +112,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { newProperties.put("security.signature.username", "bob"); String cryptoUrl = "org/apache/cxf/systest/jaxrs/security/bob.properties"; - newProperties.put("ws-security.signature.properties", cryptoUrl); + newProperties.put("security.signature.properties", cryptoUrl); doTestSignatureProxy(address, false, null, test.streaming, newProperties); // Constraint validation fails with "alice" @@ -122,7 +122,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { newProperties.put("security.signature.username", "alice"); cryptoUrl = "org/apache/cxf/systest/jaxrs/security/alice.properties"; - newProperties.put("ws-security.signature.properties", cryptoUrl); + newProperties.put("security.signature.properties", cryptoUrl); try { doTestSignatureProxy(address, false, null, test.streaming, newProperties); fail("Failure expected on a failing cert constraint"); @@ -158,7 +158,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { if (cryptoUrlPrefix != null) { cryptoUrl = cryptoUrlPrefix + this.getClass().getResource("/" + cryptoUrl).toURI().getPath(); } - newProperties.put("ws-security.signature.properties", cryptoUrl); + newProperties.put("security.signature.properties", cryptoUrl); } bean.setProperties(newProperties); @@ -229,7 +229,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { properties.put("security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); properties.put("security.signature.username", "alice"); - properties.put("ws-security.signature.properties", + properties.put("security.signature.properties", "org/apache/cxf/systest/jaxrs/security/alice.properties"); bean.setProperties(properties); if (streaming) { @@ -369,7 +369,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { properties.put("security.encryption.properties", "org/apache/cxf/systest/jaxrs/security/bob.properties"); properties.put("security.signature.username", "alice"); - properties.put("ws-security.signature.properties", + properties.put("security.signature.properties", "org/apache/cxf/systest/jaxrs/security/alice.properties"); doTestPostEncryptedBook(address, true, properties, test.streaming); @@ -385,7 +385,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { properties.put("security.encryption.properties", "org/apache/cxf/systest/jaxrs/security/bob.properties"); properties.put("security.signature.username", "alice"); - properties.put("ws-security.signature.properties", + properties.put("security.signature.properties", "org/apache/cxf/systest/jaxrs/security/alice.properties"); EncryptionProperties encryptionProperties = new EncryptionProperties(); @@ -411,7 +411,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { properties.put("security.encryption.properties", "org/apache/cxf/systest/jaxrs/security/bob.properties"); properties.put("security.signature.username", "alice"); - properties.put("ws-security.signature.properties", + properties.put("security.signature.properties", "org/apache/cxf/systest/jaxrs/security/alice.properties"); doTestPostEncryptedBook(address, true, properties, test.streaming); } @@ -543,7 +543,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { properties.put("security.encryption.username", "bob"); properties.put("security.encryption.properties", "org/apache/cxf/systest/jaxrs/security/bob.properties"); - properties.put("ws-security.signature.properties", + properties.put("security.signature.properties", "org/apache/cxf/systest/jaxrs/security/alice.properties"); bean.setProperties(properties); @@ -587,7 +587,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { properties.put("security.encryption.username", "bob"); properties.put("security.encryption.properties", "org/apache/cxf/systest/jaxrs/security/bob.properties"); - properties.put("ws-security.signature.properties", + properties.put("security.signature.properties", "org/apache/cxf/systest/jaxrs/security/alice.properties"); bean.setProperties(properties); http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml index 116f657..6243276 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/server.xml @@ -92,7 +92,7 @@ under the License. </jaxrs:outInterceptors> <jaxrs:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> </jaxrs:properties> </jaxrs:server> @@ -108,7 +108,7 @@ under the License. </jaxrs:outInterceptors> <jaxrs:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> </jaxrs:properties> </jaxrs:server> @@ -124,7 +124,7 @@ under the License. </jaxrs:outInterceptors> <jaxrs:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> </jaxrs:properties> </jaxrs:server> @@ -158,7 +158,7 @@ under the License. <jaxrs:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"/> <entry key="security.encryption.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> </jaxrs:properties> </jaxrs:server> <jaxrs:server address="https://localhost:${testutil.ports.jaxrs-xmlsec}/xmlsec-validate";> @@ -176,7 +176,7 @@ under the License. <jaxrs:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"/> <entry key="security.encryption.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> </jaxrs:properties> </jaxrs:server> <jaxrs:server address="https://localhost:${testutil.ports.jaxrs-xmlsec}/xmlsec-useReqSigCert";> @@ -193,7 +193,7 @@ under the License. </jaxrs:outInterceptors> <jaxrs:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> <entry key="security.encryption.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> </jaxrs:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml index 087634c..c76d060 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/stax-server.xml @@ -112,7 +112,7 @@ under the License. </jaxrs:outInterceptors> <jaxrs:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> </jaxrs:properties> </jaxrs:server> @@ -128,7 +128,7 @@ under the License. </jaxrs:outInterceptors> <jaxrs:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> </jaxrs:properties> </jaxrs:server> @@ -144,7 +144,7 @@ under the License. </jaxrs:outInterceptors> <jaxrs:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> </jaxrs:properties> </jaxrs:server> @@ -176,7 +176,7 @@ under the License. <jaxrs:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"/> <entry key="security.encryption.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> </jaxrs:properties> </jaxrs:server> <jaxrs:server address="https://localhost:${testutil.ports.jaxrs-xmlsec-stax}/xmlsec-validate";> @@ -192,7 +192,7 @@ under the License. <jaxrs:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"/> <entry key="security.encryption.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> </jaxrs:properties> </jaxrs:server> <jaxrs:server address="https://localhost:${testutil.ports.jaxrs-xmlsec-stax}/xmlsec-useReqSigCert";> @@ -207,7 +207,7 @@ under the License. </jaxrs:outInterceptors> <jaxrs:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> + <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/bob.properties"/> <entry key="security.encryption.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> </jaxrs:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml ---------------------------------------------------------------------- diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml index d19a0a9..c4a6083 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml @@ -47,7 +47,7 @@ under the License. <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.rm.sec.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml ---------------------------------------------------------------------- diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml index 7e25a71..ce45c98 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml @@ -42,7 +42,7 @@ <jaxws:endpoint xmlns:s="http://cxf.apache.org/greeter_control"; id="AsymmetricEndpoint" address="http://localhost:${testutil.ports.Server}/RMGreeterAsymmetric"; serviceName="s:GreeterService" endpointName="s:GreeterPort" implementor="org.apache.cxf.systest.ws.rm.GreeterImpl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.rm.sec.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml index 6573035..fd1dc44 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml @@ -38,7 +38,7 @@ <jaxws:properties> <entry key="security.saml-callback-handler" value-ref="saml1HOKHandler"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> </jaxws:client> @@ -46,7 +46,7 @@ <jaxws:properties> <entry key="security.saml-callback-handler" value-ref="saml1SenderVouchesHandler"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> @@ -56,7 +56,7 @@ <jaxws:properties> <entry key="security.saml-callback-handler" value-ref="saml1HOKHandler"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> @@ -66,7 +66,7 @@ <jaxws:properties> <entry key="security.saml-callback-handler" value-ref="saml2BearerHandler"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> @@ -81,7 +81,7 @@ <jaxws:properties> <entry key="security.saml-callback-handler" value-ref="saml2HOKHandler"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> </jaxws:client> @@ -89,7 +89,7 @@ <jaxws:properties> <entry key="security.saml-callback-handler" value-ref="saml1SenderVouchesHandler"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> @@ -98,7 +98,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricIssuedTokenPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml index 113508e..2342e87 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml @@ -41,14 +41,14 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSHOKSignedEndorsing" address="https://localhost:${testutil.ports.Server.2}/DoubleItSamlTLSHOKSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSigned" address="http://localhost:${testutil.ports.Server}/DoubleItSamlAsymmetricSigned"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignedPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -56,7 +56,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricInitiator" address="http://localhost:${testutil.ports.Server}/DoubleItSamlAsymmetricInitiator"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricInitiatorPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -64,7 +64,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSaml2Bearer" address="http://localhost:${testutil.ports.Server}/DoubleItSamlAsymmetricSaml2Bearer"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSaml2BearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.saml2.validator" value-ref="allowUnsignedBearerAssertions"/> @@ -76,7 +76,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSHOKSignedEndorsingSaml2" address="https://localhost:${testutil.ports.Server.2}/DoubleItSamlTLSHOKSignedEndorsingSaml2"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> @@ -86,7 +86,7 @@ <!-- TODO Fix the way these properties are inverted --> <entry key="security.signature.username" value="bob"/> <entry key="security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -95,7 +95,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="security.signature.username" value="bob"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml index fe462eb..53b3ce8 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml @@ -43,7 +43,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSHOKSignedEndorsing" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSamlTLSHOKSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -51,7 +51,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSigned" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSamlAsymmetricSigned"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignedPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -60,7 +60,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricInitiator" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSamlAsymmetricInitiator"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricInitiatorPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -69,7 +69,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSaml2Bearer" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSamlAsymmetricSaml2Bearer"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSaml2BearerPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -83,7 +83,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TLSHOKSignedEndorsingSaml2" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSamlTLSHOKSignedEndorsingSaml2"; serviceName="s:DoubleItService" endpointName="s:DoubleItTLSHOKSignedEndorsingSaml2Port" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -94,7 +94,7 @@ <!-- TODO Fix the way these properties are inverted --> <entry key="security.signature.username" value="bob"/> <entry key="security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -104,7 +104,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="security.signature.username" value="bob"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml index afa1dd6..4d92055 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml @@ -27,7 +27,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSecureConversationPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties.sct" value="alice.properties"/> + <entry key="security.signature.properties.sct" value="alice.properties"/> <entry key="security.signature.username.sct" value="alice"/> <entry key="security.encryption.properties.sct" value="bob.properties"/> <entry key="security.encryption.username.sct" value="bob"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml index 4bc691d..0dcc581 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml @@ -28,7 +28,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SecureConversation" address="http://localhost:${testutil.ports.Server}/DoubleItSecureConversation"; serviceName="s:DoubleItService" endpointName="s:DoubleItSecureConversationPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/secconv/DoubleItSecConv.wsdl"> <jaxws:properties> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties.sct" value="bob.properties"/> + <entry key="security.signature.properties.sct" value="bob.properties"/> <entry key="security.encryption.username.sct" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints.sct" value=".*O=apache.org.*"/> </jaxws:properties>
