http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 8e35601..1b7a160 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 @@ -156,7 +156,7 @@ <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.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> + <entry key="security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -171,7 +171,7 @@ <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.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> + <entry key="security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -186,7 +186,7 @@ <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.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> + <entry key="security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -201,7 +201,7 @@ <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.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> + <entry key="security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -216,7 +216,7 @@ <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.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> + <entry key="security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -231,7 +231,7 @@ <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.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> + <entry key="security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -246,7 +246,7 @@ <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.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> + <entry key="security.encryption.properties" value="alice.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties>
http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 390e6d4..3fd8a06 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 @@ -28,7 +28,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -43,7 +43,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -53,7 +53,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 c9cecf0..873db51 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 @@ -44,20 +44,20 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2SymmetricPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2SymmetricSupportingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -66,7 +66,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricPort2"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -108,7 +108,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSamlInitiatorPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -116,14 +116,14 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2SymmetricSignedElementsPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricSignedEncryptedPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -132,7 +132,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricSignedEncryptedEncryptBeforeSigningPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -141,7 +141,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricEncryptedPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -213,7 +213,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2PEPPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 9947ccd..7b19443 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 @@ -27,35 +27,35 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWASignatureContentPolicyPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWASignatureCompletePolicyPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWAEncryptionPolicyPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWACombinedPolicyPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWACombinedAsymmetricPolicyPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 50930ee..44f9496 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 @@ -78,7 +78,7 @@ <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="ws-security.encryption.properties" value="alice.properties"/> + <entry key="security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 980ba72..9fdf58b 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 @@ -82,7 +82,7 @@ <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="ws-security.encryption.properties" value="alice.properties"/> + <entry key="security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 3a8bb8c..6ac5fdf 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 @@ -28,7 +28,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -44,7 +44,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -60,7 +60,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -76,7 +76,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -92,7 +92,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -108,7 +108,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -124,7 +124,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -140,7 +140,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -156,7 +156,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/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 7a6eecf..1408f8c 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 @@ -28,7 +28,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -43,7 +43,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -58,7 +58,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -73,7 +73,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -88,7 +88,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -103,7 +103,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml index d8d51e6..0d82391 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client-derived.xml @@ -52,7 +52,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> @@ -60,7 +60,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> @@ -68,7 +68,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml index abe2933..52f14b2 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml @@ -34,85 +34,85 @@ <jaxws:properties> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties.sct" value="alice.properties"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}AC_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}ADC_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}ADC-ES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}_A_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}_AD_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}_AD-ES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}XC_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}XDC_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}XDC_IPingService1"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}XDC-ES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}XDC-SEES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}_X_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}_X10_IPingService"; createdFromAPI="true"> @@ -120,70 +120,70 @@ <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties.sct" value="alice.properties"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}_XD_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}_XD-SEES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}_XD-ES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}UXC_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}UXDC_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}UXDC-SEES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}_UX_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}_UXD_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}_UXD-SEES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> + <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <http:conduit name="http://localhost/.*";> http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml index 80813b8..0f42169 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml @@ -57,7 +57,7 @@ <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <!-- --> @@ -68,7 +68,7 @@ <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml index 3348840..31ea18c 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml @@ -57,7 +57,7 @@ <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <!-- --> @@ -68,7 +68,7 @@ <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client.xml index 82a697f..ea860bd 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client.xml @@ -30,122 +30,122 @@ <jaxws:client name="{http://WSSec/wssec11}A_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}A-NoTimestamp_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}AD_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}A-ES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}AD-ES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}UX_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="abcd"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}UX-NoTimestamp_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="abcd"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}UXD_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="abcd"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}UX-SEES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="abcd"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}UXD-SEES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="abcd"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}X_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}X-NoTimestamp_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}X-AES128_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}X-AES256_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}X-TripleDES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}XD_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}XD-ES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}XD-SEES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client_restricted.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client_restricted.xml index 923643f..f806053 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client_restricted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client_restricted.xml @@ -33,122 +33,122 @@ <jaxws:client name="{http://WSSec/wssec11}A_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}A-NoTimestamp_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}AD_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}A-ES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}AD-ES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}UX_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="abcd"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}UX-NoTimestamp_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="abcd"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}UXD_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="abcd"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}UX-SEES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="abcd"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}UXD-SEES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="abcd"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}X_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}X-NoTimestamp_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}X-AES128_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}X-AES192_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}X-TripleDES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}XD_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}XD-ES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}XD-SEES_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> + <entry key="security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> </jaxws:client> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/5577461d/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml index 91de1d1..f8e3eb6 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml @@ -26,55 +26,55 @@ </cxf:bus> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricErrorMessagePort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKeyIdentifierPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKeyIdentifierDerivedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKeyIdentifierEncryptBeforeSigningPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKeyIdentifierEncryptBeforeSigningDerivedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKeyIdentifierPort2"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItIssuerSerialPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItThumbprintPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricThumbprintEndorsingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -83,7 +83,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricEndorsingEncryptedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -92,13 +92,13 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItContentEncryptedElementsPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricIssuerSerialPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -107,7 +107,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricNoInitiatorReferencePort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -116,7 +116,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSP11Port"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -125,7 +125,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricEncryptedPasswordPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob-enc.properties"/> + <entry key="security.encryption.properties" value="bob-enc.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice-enc.properties"/> <entry key="security.signature.username" value="alice"/> @@ -134,7 +134,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSHA256Port"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -144,7 +144,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricThumbprintPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -153,7 +153,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricPKIPathPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -162,7 +162,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricEncryptBeforeSigningPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -171,7 +171,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricEncryptBeforeSigningNoEncPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -180,7 +180,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricEncryptSignaturePort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -189,7 +189,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSignaturePort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="ws-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"/> @@ -197,7 +197,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSignatureSP11Port"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="ws-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"/> @@ -205,7 +205,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricEncryptionPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -213,7 +213,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSignatureEncryptionPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -221,7 +221,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricProtectTokensPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -230,7 +230,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricUsernameTokenPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -240,7 +240,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricEndorsingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -249,7 +249,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricUsernameTokenPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="security.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -257,7 +257,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricProtectTokensPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> @@ -317,7 +317,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSupportingTokenPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -331,7 +331,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSupportingTokenPort2"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -345,7 +345,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportPKISupportingTokenPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -359,7 +359,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportNegativeEndorsingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -373,7 +373,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportNegativeEndorsingPort2"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/> @@ -387,13 +387,13 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSignaturePort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricPropertiesPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.encryption.properties" value="bob.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.username" value="alice"/>
