Switching remaining SAML Cfg tags
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0d0bc938 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0d0bc938 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0d0bc938 Branch: refs/heads/master Commit: 0d0bc938103b0ea9311c3b73f6c385aa3e12260c Parents: 9a2c826 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Fri Apr 17 10:43:38 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Fri Apr 17 10:43:38 2015 +0100 ---------------------------------------------------------------------- .../systest/sts/username_actas/cxf-service.xml | 2 +- .../sts/username_onbehalfof/cxf-service.xml | 2 +- .../cxf/systest/ws/rm/sec/server-policy.xml | 2 +- .../cxf/systest/wssec/examples/saml/server.xml | 14 +++--- .../systest/wssec/examples/saml/stax-server.xml | 14 +++--- .../systest/wssec/examples/secconv/server.xml | 2 +- .../wssec/examples/secconv/stax-server.xml | 2 +- .../cxf/systest/wssec/examples/ut/server.xml | 4 +- .../systest/wssec/examples/ut/stax-server.xml | 4 +- .../cxf/systest/wssec/examples/x509/server.xml | 8 ++-- .../systest/wssec/examples/x509/stax-server.xml | 8 ++-- .../apache/cxf/systest/ws/algsuite/server.xml | 12 ++--- .../cxf/systest/ws/algsuite/stax-server.xml | 10 ++--- .../apache/cxf/systest/ws/bindings/server.xml | 42 +++++++++--------- .../cxf/systest/ws/bindings/stax-server.xml | 42 +++++++++--------- .../org/apache/cxf/systest/ws/gcm/server.xml | 6 +-- .../apache/cxf/systest/ws/gcm/stax-server.xml | 6 +-- .../org/apache/cxf/systest/ws/parts/server.xml | 42 +++++++++--------- .../apache/cxf/systest/ws/parts/stax-server.xml | 40 ++++++++--------- .../org/apache/cxf/systest/ws/policy/server.xml | 10 ++--- .../org/apache/cxf/systest/ws/saml/server.xml | 36 +++++++-------- .../apache/cxf/systest/ws/saml/stax-server.xml | 36 +++++++-------- .../cxf/systest/ws/tokens/endorsing-server.xml | 12 ++--- .../org/apache/cxf/systest/ws/tokens/server.xml | 18 ++++---- .../systest/ws/tokens/stax-endorsing-server.xml | 12 ++--- .../cxf/systest/ws/tokens/stax-server.xml | 18 ++++---- .../apache/cxf/systest/ws/ut/server-derived.xml | 6 +-- .../org/apache/cxf/systest/ws/ut/server.xml | 4 +- .../apache/cxf/systest/ws/ut/stax-server.xml | 4 +- .../apache/cxf/systest/ws/wssec10/server.xml | 4 +- .../systest/ws/wssec10/server_restricted.xml | 4 +- .../cxf/systest/ws/wssec10/stax-server.xml | 4 +- .../ws/wssec10/stax-server_restricted.xml | 4 +- .../org/apache/cxf/systest/ws/x509/server.xml | 46 ++++++++++---------- .../apache/cxf/systest/ws/x509/stax-server.xml | 46 ++++++++++---------- 35 files changed, 263 insertions(+), 263 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/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 285d2d3..c30f83a 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 @@ -65,7 +65,7 @@ <bean class="org.apache.cxf.systest.sts.username_actas.ActAsValidator"/> </entry> <entry key="ws-security.is-bsp-compliant" value="false"/> - <entry key="ws-security.validate.audience-restriction" value="false"/> + <entry key="security.validate.audience-restriction" value="false"/> </jaxws:properties> </jaxws:endpoint> <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"> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/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 fa120a7..53e44ae 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 @@ -65,7 +65,7 @@ <bean class="org.apache.cxf.systest.sts.intermediary_transformation.OnBehalfOfValidator"/> </entry> <entry key="ws-security.is-bsp-compliant" value="false"/> - <entry key="ws-security.validate.audience-restriction" value="false"/> + <entry key="security.validate.audience-restriction" value="false"/> </jaxws:properties> </jaxws:endpoint> <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"> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/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 ce45c98..c9c288b 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 @@ -44,7 +44,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.rm.sec.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/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 2342e87..354214f 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 @@ -42,7 +42,7 @@ <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="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="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"> @@ -50,7 +50,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> <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"> @@ -58,7 +58,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> <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"> @@ -66,7 +66,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.saml2.validator" value-ref="allowUnsignedBearerAssertions"/> </jaxws:properties> </jaxws:endpoint> @@ -77,7 +77,7 @@ <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="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSV" address="http://localhost:${testutil.ports.Server}/DoubleItSamlSymmetricSV" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSVPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> @@ -88,7 +88,7 @@ <entry key="security.encryption.properties" value="bob.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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricIssuedToken" address="http://localhost:${testutil.ports.Server}/DoubleItSamlSymmetricIssuedToken" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricIssuedTokenPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> @@ -96,7 +96,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="security.signature.username" value="bob"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> <!-- --> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/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 53b3ce8..984d095 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 @@ -44,7 +44,7 @@ <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="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> @@ -53,7 +53,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> @@ -62,7 +62,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> @@ -71,7 +71,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> <entry key="ws-security.saml2.validator" value-ref="allowUnsignedBearerAssertions"/> </jaxws:properties> @@ -84,7 +84,7 @@ <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="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> @@ -96,7 +96,7 @@ <entry key="security.encryption.properties" value="bob.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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> @@ -105,7 +105,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="security.signature.username" value="bob"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/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 0dcc581..3edcb4d 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 @@ -30,7 +30,7 @@ <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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.*"/> + <entry key="security.subject.cert.constraints.sct" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml index de77fae..eda8d81 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml @@ -30,7 +30,7 @@ <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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.*"/> + <entry key="security.subject.cert.constraints.sct" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml index 37d35fd..748658b 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml @@ -50,7 +50,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricEncrSupporting" address="http://localhost:${testutil.ports.Server}/DoubleItUTAsymmetricEncrSupporting" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncrSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> @@ -63,7 +63,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> <!-- --> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml index d888fab..0cb9e19 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml @@ -54,7 +54,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> @@ -69,7 +69,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml index e4358e4..b30bdaa 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml @@ -30,7 +30,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricProtectTokens" serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> @@ -38,7 +38,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.Server}/DoubleItX509SymmetricSignEncrypt" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> @@ -46,7 +46,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="security.signature.username" value="bob"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricEndorsing" address="http://localhost:${testutil.ports.Server}/DoubleItX509SymmetricEndorsing" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> @@ -57,7 +57,7 @@ <entry key="security.encryption.properties" value="bob.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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml index 65acdb8..c3cf0b2 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml @@ -30,7 +30,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> @@ -39,7 +39,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> @@ -48,7 +48,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="security.signature.username" value="bob"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> @@ -60,7 +60,7 @@ <entry key="security.encryption.properties" value="bob.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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml index 7534e9e..5a12314 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml @@ -29,7 +29,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -41,7 +41,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -53,7 +53,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -65,7 +65,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> <jaxws:features> @@ -78,7 +78,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> <jaxws:features> @@ -91,7 +91,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml index 7d08c22..08e467f 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml @@ -29,7 +29,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -42,7 +42,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -55,7 +55,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -68,7 +68,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> @@ -82,7 +82,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.signature.properties" value="bob.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml index ecfb7d6..f337f23 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml @@ -30,7 +30,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -43,7 +43,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -56,7 +56,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -69,7 +69,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -82,7 +82,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -95,7 +95,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -108,7 +108,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -121,7 +121,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -134,7 +134,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -147,7 +147,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -160,7 +160,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -173,7 +173,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -186,7 +186,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -199,7 +199,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -212,7 +212,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -225,7 +225,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -238,7 +238,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -251,7 +251,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -264,7 +264,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -277,7 +277,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -291,7 +291,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml index 11be458..3dcbfd7 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml @@ -30,7 +30,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -44,7 +44,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -58,7 +58,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -72,7 +72,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -86,7 +86,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -100,7 +100,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -114,7 +114,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -128,7 +128,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -142,7 +142,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -156,7 +156,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -170,7 +170,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -184,7 +184,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -198,7 +198,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -212,7 +212,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -226,7 +226,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -240,7 +240,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -254,7 +254,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -268,7 +268,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -282,7 +282,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -296,7 +296,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> @@ -311,7 +311,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> <jaxws:features> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml index 94cb0cc..3d3d86e 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml @@ -30,7 +30,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="GCM192" address="http://localhost:${testutil.ports.Server}/DoubleItGCM192" serviceName="s:DoubleItService" endpointName="s:DoubleItGCM192Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl"> @@ -38,7 +38,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> </jaxws:endpoint> @@ -47,7 +47,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml index 56c4bf3..0aa6cc7 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml @@ -30,7 +30,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> @@ -39,7 +39,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.is-bsp-compliant" value="false"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -49,7 +49,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/0d0bc938/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml index 2c643b3..bbf4217 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml @@ -30,7 +30,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -43,7 +43,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -56,7 +56,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -69,7 +69,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -82,7 +82,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -95,7 +95,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -108,7 +108,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -121,7 +121,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -134,7 +134,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -148,7 +148,7 @@ <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -162,7 +162,7 @@ <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -176,7 +176,7 @@ <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -190,7 +190,7 @@ <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -204,7 +204,7 @@ <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -218,7 +218,7 @@ <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -232,7 +232,7 @@ <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -246,7 +246,7 @@ <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -264,7 +264,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -282,7 +282,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -300,7 +300,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -318,7 +318,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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="security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies>