Repository: cxf Updated Branches: refs/heads/master 6da8e6298 -> 0d0bc9381
http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/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 5048afb..334265a 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 @@ -26,7 +26,7 @@ </cxf:bus> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedSupportingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -42,7 +42,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedSupportingPort2"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -58,7 +58,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedSupportingPort3"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -74,7 +74,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedSupportingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -90,7 +90,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedSupportingPort2"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -106,7 +106,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedSupportingPort3"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -122,7 +122,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedEncryptedSupportingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -138,7 +138,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedEncryptedSupportingPort2"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -154,7 +154,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedEncryptedSupportingPort3"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/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 e64ff54..55e397f 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 @@ -26,7 +26,7 @@ </cxf:bus> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEndorsingSupportingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -41,7 +41,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEndorsingSupportingPort2"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -56,7 +56,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEndorsingSupportingPort3"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -71,7 +71,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedEndorsingSupportingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -86,7 +86,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedEndorsingSupportingPort2"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -101,7 +101,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedEndorsingSupportingPort3"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/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 e9ee9d3..8e855e2 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 @@ -26,31 +26,31 @@ </cxf:bus> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricProtectionSigPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricProtectionSigDKPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricProtectionEncPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSignedEndorsingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -58,7 +58,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricEndorsingEncryptedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> @@ -66,7 +66,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSignedEndorsingEncryptedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml index 763c001..1794581 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml @@ -33,37 +33,37 @@ </http:conduit> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItPlaintextPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItPlaintextCreatedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItPlaintextSupportingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItHashedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItNoPasswordPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedEndorsingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.username" value="alice"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -71,7 +71,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedEncryptedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.username" value="alice"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -79,13 +79,13 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItInlinePolicyPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -137,7 +137,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItDigestNoBindingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> <jaxws:features> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml index 5c75a62..bcfa843 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-client.xml @@ -33,7 +33,7 @@ </http:conduit> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSupportingTokenPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -44,7 +44,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSupportingTokenPort2"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -55,7 +55,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItPlaintextPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -66,7 +66,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItPlaintextPort2"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -77,7 +77,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItPlaintextPort3"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -88,7 +88,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItHashPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -99,7 +99,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItHashPort2"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -110,7 +110,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItHashPort3"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -121,7 +121,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItCreatedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -132,7 +132,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItCreatedPort2"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -143,7 +143,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItNoncePort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> <jaxws:features> @@ -154,7 +154,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItNoncePort2"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> <jaxws:features> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/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 2402763..3dc17d3 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 @@ -26,7 +26,7 @@ </cxf:bus> <jaxws:client name="{http://WSSec/wssc}SecureConversation_UserNameOverTransport_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username.sct" value="Alice"/> + <entry key="security.username.sct" value="Alice"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -75,49 +75,49 @@ </jaxws:client> <jaxws:client name="{http://WSSec/wssc}XC_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssc}_X10_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-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"/> @@ -125,63 +125,63 @@ </jaxws:client> <jaxws:client name="{http://WSSec/wssc}_XD_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username.sct" value="abcd"/> + <entry key="security.username.sct" value="abcd"/> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/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 690cd37..5068512 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 @@ -29,13 +29,13 @@ <!-- --> <jaxws:client name="{http://WSSec/wssec10}UserNameOverTransport_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec10}UserName_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -54,7 +54,7 @@ <!-- --> <jaxws:client name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-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"/> @@ -65,7 +65,7 @@ <!-- --> <jaxws:client name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-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"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/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 e153858..011cf20 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 @@ -29,13 +29,13 @@ <!-- --> <jaxws:client name="{http://WSSec/wssec10}UserNameOverTransport_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec10}UserName_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -54,7 +54,7 @@ <!-- --> <jaxws:client name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-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"/> @@ -65,7 +65,7 @@ <!-- --> <jaxws:client name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-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"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml index 49ee2d8..f0f85cd 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted_unauthorized.xml @@ -26,13 +26,13 @@ </cxf:bus> <jaxws:client name="{http://WSSec/wssec10}UserName_IPingService_hashed"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Frank"/> + <entry key="security.username" value="Frank"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec10}UserNameOverTransport_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Frank"/> + <entry key="security.username" value="Frank"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:client> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml index 90ca29f..fd09417 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml @@ -49,13 +49,13 @@ <!-- --> <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.Server.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransport" depends-on="tls-settings"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint id="UserName" address="http://localhost:${testutil.ports.Server}/UserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransport"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> @@ -64,7 +64,7 @@ <!-- --> <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.Server}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncrypt"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -76,7 +76,7 @@ <!-- --> <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.Server}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDes"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml index 71b52a5..11427a5 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml @@ -49,13 +49,13 @@ <!-- --> <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.Server.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted" depends-on="tls-settings"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint id="UserName" address="http://localhost:${testutil.ports.Server}/UserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> </jaxws:properties> </jaxws:endpoint> @@ -64,7 +64,7 @@ <!-- --> <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.Server}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRestricted"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -76,7 +76,7 @@ <!-- --> <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.Server}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDesRestricted"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml index a5116e3..68a3711 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized.xml @@ -71,7 +71,7 @@ <!-- --> <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.AuthorizedServer.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted" depends-on="tls-settings"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <!-- new property --> <entry key="ws-security.validate.token" value="false"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized_2.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized_2.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized_2.xml index b86b1fa..fe40eac 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized_2.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted_authorized_2.xml @@ -57,7 +57,7 @@ <!-- --> <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.AuthorizedServer2.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted" depends-on="tls-settings"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <!-- new property --> <entry key="ws-security.validate.token" value="false"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml index d19ae84..6aa134a 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml @@ -49,14 +49,14 @@ <!-- --> <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.StaxServer.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransport" depends-on="tls-settings"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint id="UserName" address="http://localhost:${testutil.ports.StaxServer}/UserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransport"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -66,7 +66,7 @@ <!-- --> <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.StaxServer}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncrypt"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -79,7 +79,7 @@ <!-- --> <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.StaxServer}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDes"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml index ed13e88..fb5bab8 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml @@ -49,14 +49,14 @@ <!-- --> <jaxws:endpoint id="UserNameOverTransport" address="https://localhost:${testutil.ports.StaxServer.1}/UserNameOverTransport"; serviceName="interop:PingService" endpointName="interop:UserNameOverTransport_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted" depends-on="tls-settings"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint id="UserName" address="http://localhost:${testutil.ports.StaxServer}/UserName"; serviceName="interop:PingService" endpointName="interop:UserName_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -66,7 +66,7 @@ <!-- --> <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.StaxServer}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRestricted"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -79,7 +79,7 @@ <!-- --> <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.StaxServer}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDesRestricted"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/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 fedc4c3..5715f09 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 @@ -59,91 +59,91 @@ </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}UX_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="abcd"/> + <entry key="security.username" value="abcd"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="abcd"/> + <entry key="security.username" value="abcd"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}UXD_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="abcd"/> + <entry key="security.username" value="abcd"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="abcd"/> + <entry key="security.username" value="abcd"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="abcd"/> + <entry key="security.username" value="abcd"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}X_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}XD_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/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 835fe9f..5e73adf 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 @@ -62,91 +62,91 @@ </jaxws:client> <jaxws:client name="{http://WSSec/wssec11}UX_IPingService"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.username" value="abcd"/> + <entry key="security.username" value="abcd"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="abcd"/> + <entry key="security.username" value="abcd"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="abcd"/> + <entry key="security.username" value="abcd"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="abcd"/> + <entry key="security.username" value="abcd"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="abcd"/> + <entry key="security.username" value="abcd"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-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="ws-security.username" value="Alice"/> + <entry key="security.username" value="Alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.encryption.properties" value="restricted/bob.properties"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/eadb92c9/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 fccc71c..2bd53d4 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 @@ -234,7 +234,7 @@ <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="ws-security.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> </jaxws:client> @@ -251,7 +251,7 @@ <jaxws:properties> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.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> </jaxws:client>
