http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml index 1b7a160..0b23b56 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml @@ -28,7 +28,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="RequiredParts" address="http://localhost:${testutil.ports.StaxServer}/DoubleItRequiredParts"; serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -42,7 +42,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="RequiredParts2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItRequiredParts2"; serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -56,7 +56,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="RequiredElements" address="http://localhost:${testutil.ports.StaxServer}/DoubleItRequiredElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -70,7 +70,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="RequiredElements2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItRequiredElements2"; serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -84,7 +84,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedParts" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedParts"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -98,7 +98,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedParts2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedParts2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -112,7 +112,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedParts3" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedParts3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -126,7 +126,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedElements" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -140,7 +140,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedElements2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedElements2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -154,7 +154,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedParts" address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedParts"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <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.*"/> @@ -169,7 +169,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedParts2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedParts2"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <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.*"/> @@ -184,7 +184,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedParts3" address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedParts3"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <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.*"/> @@ -199,7 +199,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedElements" address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <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.*"/> @@ -214,7 +214,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedElements2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedElements2"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <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.*"/> @@ -229,7 +229,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="ContentEncryptedElements" address="http://localhost:${testutil.ports.StaxServer}/DoubleItContentEncryptedElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <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.*"/> @@ -244,7 +244,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="ContentEncryptedElements2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItContentEncryptedElements2"; serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <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.*"/> @@ -264,7 +264,7 @@ wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -283,7 +283,7 @@ wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -302,7 +302,7 @@ wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -321,7 +321,7 @@ wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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.*"/> <entry key="ws-security.enable.streaming" value="true"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml index 3fd8a06..8aa7e94 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client.xml @@ -30,7 +30,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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> @@ -45,7 +45,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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:client> @@ -55,7 +55,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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> @@ -77,7 +77,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSupportingSignedPort"; createdFromAPI="true"> <jaxws:properties> - <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.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -90,7 +90,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportUTSupportingSignedPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="alice"/> - <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.ws.common.KeystorePasswordCallback"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml index c6961cc..615b2e5 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml @@ -42,7 +42,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItAsymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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> @@ -55,7 +55,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="NoSecurityEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItNoSecurity"; serviceName="s:DoubleItService" endpointName="s:DoubleItNoSecurityPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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> @@ -68,7 +68,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="UsernameTokenEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItUsernameToken"; serviceName="s:DoubleItService" endpointName="s:DoubleItUsernameTokenPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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> @@ -90,7 +90,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TransportSupportingSigned" address="https://localhost:${testutil.ports.Server.2}/DoubleItTransportSupportingSigned"; serviceName="s:DoubleItService" endpointName="s:DoubleItTransportSupportingSignedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.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:features> @@ -101,7 +101,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TransportUTSupportingSigned" address="https://localhost:${testutil.ports.Server.2}/DoubleItTransportUTSupportingSigned"; serviceName="s:DoubleItService" endpointName="s:DoubleItTransportUTSupportingSignedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.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="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml index 873db51..26c6b2f 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client.xml @@ -59,7 +59,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.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"/> </jaxws:properties> </jaxws:client> @@ -68,7 +68,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.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"/> </jaxws:properties> <jaxws:features> @@ -81,28 +81,28 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="security.signature.username" value="alice"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml1SelfSignedTransportSP11Port"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="security.signature.username" value="alice"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2EndorsingTransportPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="security.signature.username" value="alice"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2EndorsingTransportSP11Port"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="security.signature.username" value="alice"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSamlInitiatorPort"; createdFromAPI="true"> @@ -110,7 +110,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.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"/> </jaxws:properties> </jaxws:client> @@ -125,7 +125,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.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"/> </jaxws:properties> </jaxws:client> @@ -134,7 +134,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.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"/> </jaxws:properties> </jaxws:client> @@ -143,7 +143,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.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"/> </jaxws:properties> </jaxws:client> @@ -151,14 +151,14 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="security.signature.username" value="alice"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItInlinePolicyPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="security.signature.username" value="alice"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> </jaxws:properties> <jaxws:features> <p:policies> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml index 96b7f53..0b7fd90 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml @@ -58,14 +58,14 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SupportingToken" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml1Supporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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="Saml2TokenOverSymmetric" address="http://localhost:${testutil.ports.Server}/DoubleItSaml2Symmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> </jaxws:properties> </jaxws:endpoint> @@ -73,7 +73,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> @@ -83,7 +83,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> @@ -97,28 +97,28 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SelfSignedTokenOverTransport" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml1SelfSignedTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SelfSignedTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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="Saml1SelfSignedTokenOverTransportSP11" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml1SelfSignedTransportSP11"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SelfSignedTransportSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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="Saml2EndorsingOverTransport" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml2EndorsingTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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="Saml2EndorsingOverTransportSP11" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml2EndorsingTransportSP11"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingTransportSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -126,7 +126,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> @@ -135,7 +135,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetricSignedElements" address="http://localhost:${testutil.ports.Server}/DoubleItSaml2SymmetricSignedElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricSignedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -143,7 +143,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> @@ -153,7 +153,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> @@ -163,7 +163,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -171,14 +171,14 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingEncryptedOverTransport" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml2EndorsingEncryptedTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingEncryptedTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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="InlinePolicy" address="https://localhost:${testutil.ports.Server.2}/DoubleItSamlInlinePolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItInlinePolicyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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:features> @@ -236,7 +236,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetricPEP" address="http://localhost:${testutil.ports.Server}/DoubleItSaml2PEP"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2PEPPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/> </jaxws:properties> <jaxws:inInterceptors> @@ -246,7 +246,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml2Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -254,7 +254,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken2" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml2Transport2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -262,7 +262,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken3" address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml2Transport3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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.validate.audience-restriction" value="false"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml index 28edc19..55e4863 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml @@ -60,7 +60,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SupportingToken" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml1Supporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -68,7 +68,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetric" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSaml2Symmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <!--<entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>--> <entry key="ws-security.enable.streaming" value="true"/> @@ -78,7 +78,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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="security.encryption.username" value="useReqSigCert"/> <!--<entry key="ws-security.saml2.validator" @@ -90,7 +90,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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="security.encryption.username" value="useReqSigCert"/> <!--<entry key="ws-security.saml2.validator" @@ -106,7 +106,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SelfSignedTokenOverTransport" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml1SelfSignedTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SelfSignedTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -114,7 +114,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml1SelfSignedTokenOverTransportSP11" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml1SelfSignedTransportSP11"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml1SelfSignedTransportSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -122,7 +122,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingOverTransport" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml2EndorsingTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -130,7 +130,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingOverTransportSP11" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml2EndorsingTransportSP11"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingTransportSP11Port" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -139,7 +139,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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" @@ -150,7 +150,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetricSignedElements" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSaml2SymmetricSignedElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2SymmetricSignedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -159,7 +159,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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" @@ -171,7 +171,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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" @@ -183,7 +183,7 @@ <jaxws:properties> <entry key="security.username" value="bob"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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"/> @@ -192,7 +192,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2EndorsingEncryptedOverTransport" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml2EndorsingEncryptedTransport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2EndorsingEncryptedTransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -200,7 +200,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="InlinePolicy" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSamlInlinePolicy"; serviceName="s:DoubleItService" endpointName="s:DoubleItInlinePolicyPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -259,7 +259,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverSymmetricPEP" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSaml2PEP"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2PEPPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <!--<entry key="ws-security.saml2.validator" value="org.apache.cxf.systest.ws.saml.CustomSaml2Validator"/>--> <entry key="ws-security.enable.streaming" value="true"/> @@ -271,7 +271,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml2Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -280,7 +280,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken2" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml2Transport2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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> @@ -289,7 +289,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TransportToken3" address="https://localhost:${testutil.ports.StaxServer.2}/DoubleItSaml2Transport3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" depends-on="tls-settings"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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"/> <entry key="ws-security.validate.audience-restriction" value="false"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml index 0473f53..7a025be 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml @@ -45,7 +45,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverTransport" address="https://localhost:${testutil.ports.Server}/DoubleItSaml2Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/subjectconf//DoubleItSamlSubjectConf.wsdl" depends-on="tls-settings"> <jaxws:properties> - <entry key="ws-security.signature.properties" value="morpit.properties"/> + <entry key="security.signature.properties" value="morpit.properties"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml index 8e75f77..15985a8 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml @@ -45,7 +45,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Saml2TokenOverTransport" address="https://localhost:${testutil.ports.StaxServer}/DoubleItSaml2Transport"; serviceName="s:DoubleItService" endpointName="s:DoubleItSaml2TransportPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/saml/subjectconf//DoubleItSamlSubjectConf.wsdl" depends-on="tls-settings"> <jaxws:properties> - <entry key="ws-security.signature.properties" value="morpit.properties"/> + <entry key="security.signature.properties" value="morpit.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/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml index 7b19443..138ac61 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml @@ -57,7 +57,7 @@ <jaxws:properties> <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="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml index 44f9496..2213791 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml @@ -33,7 +33,7 @@ wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> </jaxws:properties> </jaxws:endpoint> @@ -44,7 +44,7 @@ wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> </jaxws:properties> </jaxws:endpoint> @@ -55,7 +55,7 @@ wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> </jaxws:properties> </jaxws:endpoint> @@ -66,7 +66,7 @@ wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> </jaxws:properties> </jaxws:endpoint> @@ -77,7 +77,7 @@ wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml index 9fdf58b..ece0209 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml @@ -33,7 +33,7 @@ wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.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> @@ -45,7 +45,7 @@ wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.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> @@ -57,7 +57,7 @@ wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.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> @@ -69,7 +69,7 @@ wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.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 @@ wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <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.enable.streaming" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml index 6ac5fdf..85ecec9 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client.xml @@ -30,7 +30,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> </jaxws:properties> @@ -46,7 +46,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> </jaxws:properties> @@ -62,7 +62,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> </jaxws:properties> @@ -78,7 +78,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> </jaxws:properties> @@ -94,7 +94,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> </jaxws:properties> @@ -110,7 +110,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> </jaxws:properties> @@ -126,7 +126,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> </jaxws:properties> @@ -142,7 +142,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> </jaxws:properties> @@ -158,7 +158,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml index 1408f8c..185c2dd 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-client.xml @@ -30,7 +30,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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> @@ -45,7 +45,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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> @@ -60,7 +60,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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> @@ -75,7 +75,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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> @@ -90,7 +90,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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> @@ -105,7 +105,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.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>
