http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 2bd53d4..a60a1e2 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 @@ -77,7 +77,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -86,7 +86,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -101,7 +101,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -110,7 +110,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -119,7 +119,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -128,7 +128,7 @@ <entry key="ws-security.encryption.properties" value="bob-enc.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice-enc.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -137,7 +137,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.asymmetric.signature.algorithm" value="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/> </jaxws:properties> @@ -147,7 +147,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -156,7 +156,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -165,7 +165,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -174,7 +174,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -183,7 +183,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -191,7 +191,7 @@ <jaxws:properties> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -199,7 +199,7 @@ <jaxws:properties> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -224,7 +224,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -233,7 +233,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="security.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -243,7 +243,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -264,42 +264,42 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingSP11Port"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSignedEndorsingPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingEncryptedPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSignedEndorsingEncryptedPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </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="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -311,7 +311,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportKVTPort"; createdFromAPI="true"> <jaxws:properties> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -320,7 +320,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -334,7 +334,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -348,7 +348,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -362,7 +362,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -376,7 +376,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -396,7 +396,7 @@ <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client>
http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml index b5e4a64..dd68008 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml @@ -78,7 +78,7 @@ <entry key="ws-security.encryption.crypto" value-ref="xkmsAsymmetricCrypto"/> <entry key="ws-security.encryption.username" value="CN=bob, OU=eng, O=apache.org"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> <entry key="ws-security.signature.crypto" value-ref="xkmsAsymmetricCrypto"/> </jaxws:properties> </jaxws:client>
