http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml index 65a787b..f8121c8 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml @@ -33,7 +33,7 @@ <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}X509_Port"/> <property name="properties"> <map> - <entry key="ws-security.signature.username" value="myservicekey"/> + <entry key="security.signature.username" value="myservicekey"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/> <entry key="ws-security.encryption.properties" value="serviceKeystore.properties"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml index a69e8d4..c178a17 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/client.xml @@ -106,7 +106,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.kerberos.client"> <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient"> <constructor-arg ref="cxf"/> @@ -128,7 +128,7 @@ </bean> </entry> <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.kerberos.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -138,7 +138,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.kerberos.client"> <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient"> <constructor-arg ref="cxf"/> @@ -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.kerberos.client"> <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient"> <constructor-arg ref="cxf"/> @@ -200,7 +200,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.kerberos.client"> <bean class="org.apache.cxf.ws.security.kerberos.KerberosClient"> <constructor-arg ref="cxf"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java index 4ea9fec..002ccc7 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/JAXRSOAuth2Test.java @@ -160,7 +160,7 @@ public class JAXRSOAuth2Test extends AbstractBusClientServerTestBase { "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); properties.put("ws-security.saml-callback-handler", "org.apache.cxf.systest.jaxrs.security.oauth2.SamlCallbackHandler2"); - properties.put("ws-security.signature.username", "alice"); + properties.put("security.signature.username", "alice"); properties.put("ws-security.signature.properties", CRYPTO_RESOURCE_PROPERTIES); bean.setProperties(properties); http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java index 36773f8..ac72a72 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java @@ -220,7 +220,7 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase { "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); properties.put("ws-security.saml-callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.SamlCallbackHandler"); - properties.put("ws-security.signature.username", "alice"); + properties.put("security.signature.username", "alice"); properties.put("ws-security.signature.properties", "org/apache/cxf/systest/jaxrs/security/alice.properties"); if (selfSign) { http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java index 9ba1f2c..81e4448 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java @@ -106,7 +106,7 @@ public class SamlCallbackHandler implements CallbackHandler { SecurityConstants.SIGNATURE_PROPERTIES); X509Certificate cert = RSSecurityUtils.getCertificates(crypto, - RSSecurityUtils.getUserName(m, crypto, "ws-security.signature.username"))[0]; + RSSecurityUtils.getUserName(m, crypto, "security.signature.username"))[0]; KeyInfoBean keyInfo = new KeyInfoBean(); keyInfo.setCertificate(cert); http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java index 13aac10..4b6f9da 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/xml/JAXRSXmlSecTest.java @@ -109,7 +109,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { Map<String, Object> newProperties = new HashMap<String, Object>(); newProperties.put("ws-security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); - newProperties.put("ws-security.signature.username", "bob"); + newProperties.put("security.signature.username", "bob"); String cryptoUrl = "org/apache/cxf/systest/jaxrs/security/bob.properties"; newProperties.put("ws-security.signature.properties", cryptoUrl); @@ -119,7 +119,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { newProperties.clear(); newProperties.put("ws-security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); - newProperties.put("ws-security.signature.username", "alice"); + newProperties.put("security.signature.username", "alice"); cryptoUrl = "org/apache/cxf/systest/jaxrs/security/alice.properties"; newProperties.put("ws-security.signature.properties", cryptoUrl); @@ -152,7 +152,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { if (newProperties.isEmpty()) { newProperties.put("ws-security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); - newProperties.put("ws-security.signature.username", "alice"); + newProperties.put("security.signature.username", "alice"); String cryptoUrl = "org/apache/cxf/systest/jaxrs/security/alice.properties"; if (cryptoUrlPrefix != null) { @@ -228,7 +228,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { Map<String, Object> properties = new HashMap<String, Object>(); properties.put("ws-security.callback-handler", "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback"); - properties.put("ws-security.signature.username", "alice"); + properties.put("security.signature.username", "alice"); properties.put("ws-security.signature.properties", "org/apache/cxf/systest/jaxrs/security/alice.properties"); bean.setProperties(properties); @@ -368,7 +368,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { properties.put("ws-security.encryption.username", "bob"); properties.put("ws-security.encryption.properties", "org/apache/cxf/systest/jaxrs/security/bob.properties"); - properties.put("ws-security.signature.username", "alice"); + properties.put("security.signature.username", "alice"); properties.put("ws-security.signature.properties", "org/apache/cxf/systest/jaxrs/security/alice.properties"); doTestPostEncryptedBook(address, true, properties, test.streaming); @@ -384,7 +384,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { properties.put("ws-security.encryption.username", "bob"); properties.put("ws-security.encryption.properties", "org/apache/cxf/systest/jaxrs/security/bob.properties"); - properties.put("ws-security.signature.username", "alice"); + properties.put("security.signature.username", "alice"); properties.put("ws-security.signature.properties", "org/apache/cxf/systest/jaxrs/security/alice.properties"); @@ -410,7 +410,7 @@ public class JAXRSXmlSecTest extends AbstractBusClientServerTestBase { properties.put("ws-security.encryption.username", "bob"); properties.put("ws-security.encryption.properties", "org/apache/cxf/systest/jaxrs/security/bob.properties"); - properties.put("ws-security.signature.username", "alice"); + properties.put("security.signature.username", "alice"); properties.put("ws-security.signature.properties", "org/apache/cxf/systest/jaxrs/security/alice.properties"); doTestPostEncryptedBook(address, true, properties, test.streaming); http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml ---------------------------------------------------------------------- diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml index 6b98bd8..11f60a2 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml @@ -48,7 +48,7 @@ under the License. <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"/> </jaxws:properties> <jaxws:features> <p:policies> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml index 13efa93..412ce0f 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml @@ -39,7 +39,7 @@ <entry key="ws-security.saml-callback-handler" value-ref="saml1HOKHandler"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSignedPort" createdFromAPI="true"> @@ -47,7 +47,7 @@ <entry key="ws-security.saml-callback-handler" value-ref="saml1SenderVouchesHandler"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> </jaxws:properties> @@ -57,7 +57,7 @@ <entry key="ws-security.saml-callback-handler" value-ref="saml1HOKHandler"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> </jaxws:properties> @@ -67,7 +67,7 @@ <entry key="ws-security.saml-callback-handler" value-ref="saml2BearerHandler"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> </jaxws:properties> @@ -82,7 +82,7 @@ <entry key="ws-security.saml-callback-handler" value-ref="saml2HOKHandler"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> + <entry key="security.signature.username" value="alice"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSVPort" createdFromAPI="true"> @@ -90,7 +90,7 @@ <entry key="ws-security.saml-callback-handler" value-ref="saml1SenderVouchesHandler"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> </jaxws:properties> @@ -99,7 +99,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <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.encryption.properties" value="bob.properties"/> <entry key="ws-security.encryption.username" value="bob"/> <entry key="ws-security.sts.client"> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml index 931b6f6..b74e578 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml @@ -84,7 +84,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <!-- TODO Fix the way these properties are inverted --> - <entry key="ws-security.signature.username" value="bob"/> + <entry key="security.signature.username" value="bob"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="ws-security.encryption.username" value="alice"/> @@ -94,7 +94,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricIssuedToken" address="http://localhost:${testutil.ports.Server}/DoubleItSamlSymmetricIssuedToken" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricIssuedTokenPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.username" value="bob"/> + <entry key="security.signature.username" value="bob"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml index 7834864..5186336 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml @@ -92,7 +92,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <!-- TODO Fix the way these properties are inverted --> - <entry key="ws-security.signature.username" value="bob"/> + <entry key="security.signature.username" value="bob"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="ws-security.encryption.username" value="alice"/> @@ -103,7 +103,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricIssuedToken" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSamlSymmetricIssuedToken" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricIssuedTokenPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/saml/DoubleItSaml.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.username" value="bob"/> + <entry key="security.signature.username" value="bob"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml index 985f901..d2b229c 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/client.xml @@ -28,7 +28,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler.sct" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="ws-security.signature.properties.sct" value="alice.properties"/> - <entry key="ws-security.signature.username.sct" value="alice"/> + <entry key="security.signature.username.sct" value="alice"/> <entry key="ws-security.encryption.properties.sct" value="bob.properties"/> <entry key="ws-security.encryption.username.sct" value="bob"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml index 72b74db..bab7120 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/client.xml @@ -54,7 +54,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"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricEncrSupportingPort" createdFromAPI="true"> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/client.xml index e67a274..74ec524 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/client.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/client.xml @@ -30,7 +30,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"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricProtectTokensPort" createdFromAPI="true"> @@ -39,7 +39,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"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSignEncryptPort" createdFromAPI="true"> @@ -55,7 +55,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"/> </jaxws:properties> </jaxws:client> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml index 8ca0266..c8b9d7d 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml @@ -44,7 +44,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.Server}/DoubleItX509SymmetricSignEncrypt" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.username" value="bob"/> + <entry key="security.signature.username" value="bob"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -53,7 +53,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <!-- TODO Fix the way these properties are inverted --> - <entry key="ws-security.signature.username" value="bob"/> + <entry key="security.signature.username" value="bob"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="ws-security.encryption.username" value="alice"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml index ec1cf39..99aa88f 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml @@ -46,7 +46,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="SymmetricSignEncrypt" address="http://localhost:${testutil.ports.StaxServer}/DoubleItX509SymmetricSignEncrypt" serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.username" value="bob"/> + <entry key="security.signature.username" value="bob"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -56,7 +56,7 @@ <jaxws:properties> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <!-- TODO Fix the way these properties are inverted --> - <entry key="ws-security.signature.username" value="bob"/> + <entry key="security.signature.username" value="bob"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="ws-security.signature.properties" value="alice.properties"/> <entry key="ws-security.encryption.username" value="alice"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/HelloServiceImpl.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/HelloServiceImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/HelloServiceImpl.java index c93cbf2..2b1a154 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/HelloServiceImpl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/HelloServiceImpl.java @@ -32,7 +32,7 @@ import org.apache.cxf.annotations.EndpointProperty; value = "org.apache.cxf.systest.ws.policy.handler.CommonPasswordCallback"), @EndpointProperty(key = "ws-security.is-bsp-compliant", value = "false"), @EndpointProperty(key = "ws-security.signature.properties", value = "alice.properties"), - @EndpointProperty(key = "ws-security.signature.username", value = "alice") + @EndpointProperty(key = "security.signature.username", value = "alice") }) @HandlerChain(file = "handlers.xml") public class HelloServiceImpl implements HelloService { http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client.xml index 6ae4299..c1ed421 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client.xml @@ -31,7 +31,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -46,7 +46,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -61,7 +61,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -76,7 +76,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -91,7 +91,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -106,7 +106,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -121,7 +121,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -136,7 +136,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -151,7 +151,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -166,7 +166,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -181,7 +181,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -196,7 +196,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -211,7 +211,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -226,7 +226,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -241,7 +241,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -256,7 +256,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -271,7 +271,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -286,7 +286,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -301,7 +301,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -316,7 +316,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -332,7 +332,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"/> </jaxws:properties> <jaxws:features> <p:policies> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client-untrusted.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client-untrusted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client-untrusted.xml index 9ed4ae4..88bc252 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client-untrusted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client-untrusted.xml @@ -30,7 +30,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="morpit.properties"/> - <entry key="ws-security.signature.username" value="morpit"/> + <entry key="security.signature.username" value="morpit"/> <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/fault/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml index 8011c39..bd93d17 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client.xml @@ -44,7 +44,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> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml index b8dcc30..0f1d710 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client.xml @@ -29,7 +29,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> @@ -38,7 +38,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.is-bsp-compliant" value="false"/> </jaxws:properties> @@ -48,7 +48,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/parts/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml index a235ce1..ac7d934 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml @@ -31,7 +31,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -46,7 +46,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -61,7 +61,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -76,7 +76,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -91,7 +91,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -106,7 +106,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -121,7 +121,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -136,7 +136,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -151,7 +151,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -166,7 +166,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -181,7 +181,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -196,7 +196,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -211,7 +211,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -226,7 +226,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -241,7 +241,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -256,7 +256,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -271,7 +271,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -287,7 +287,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -303,7 +303,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -319,7 +319,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -335,7 +335,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"/> </jaxws:properties> <jaxws:features> <p:policies> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 9259fc2..6a3164a 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 @@ -31,7 +31,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -46,7 +46,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"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItUsernameTokenPort" createdFromAPI="true"> @@ -56,7 +56,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -78,7 +78,7 @@ <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:features> @@ -91,7 +91,7 @@ <jaxws:properties> <entry key="security.username" value="alice"/> <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> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 8f1ff59..533e9ca 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 @@ -60,7 +60,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"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricPort2" createdFromAPI="true"> @@ -69,7 +69,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -80,28 +80,28 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml1SelfSignedTransportPort" createdFromAPI="true"> <jaxws:properties> <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.properties" value="alice.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml1SelfSignedTransportSP11Port" createdFromAPI="true"> <jaxws:properties> <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.properties" value="alice.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2EndorsingTransportPort" createdFromAPI="true"> <jaxws:properties> <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.properties" value="alice.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2EndorsingTransportSP11Port" createdFromAPI="true"> <jaxws:properties> <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.properties" value="alice.properties"/> </jaxws:properties> </jaxws:client> @@ -111,7 +111,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"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2SymmetricSignedElementsPort" createdFromAPI="true"> @@ -126,7 +126,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"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricSignedEncryptedEncryptBeforeSigningPort" createdFromAPI="true"> @@ -135,7 +135,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"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2AsymmetricEncryptedPort" createdFromAPI="true"> @@ -144,20 +144,20 @@ <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"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSaml2EndorsingEncryptedTransportPort" createdFromAPI="true"> <jaxws:properties> <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.properties" value="alice.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItInlinePolicyPort" createdFromAPI="true"> <jaxws:properties> <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.properties" value="alice.properties"/> </jaxws:properties> <jaxws:features> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 24438ab..1839fee 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 @@ -58,7 +58,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/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 334265a..a5b7d36 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 @@ -31,7 +31,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.username-token.always.encrypted" value="false"/> </jaxws:properties> <jaxws:features> @@ -47,7 +47,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.username-token.always.encrypted" value="false"/> </jaxws:properties> <jaxws:features> @@ -63,7 +63,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.username-token.always.encrypted" value="false"/> </jaxws:properties> <jaxws:features> @@ -79,7 +79,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.username-token.always.encrypted" value="false"/> </jaxws:properties> <jaxws:features> @@ -95,7 +95,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.username-token.always.encrypted" value="false"/> </jaxws:properties> <jaxws:features> @@ -111,7 +111,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.username-token.always.encrypted" value="false"/> </jaxws:properties> <jaxws:features> @@ -127,7 +127,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.username-token.always.encrypted" value="false"/> </jaxws:properties> <jaxws:features> @@ -143,7 +143,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.username-token.always.encrypted" value="false"/> </jaxws:properties> <jaxws:features> @@ -159,7 +159,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.username-token.always.encrypted" value="false"/> </jaxws:properties> <jaxws:features> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 55e397f..dc4126d 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 @@ -31,7 +31,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -46,7 +46,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -61,7 +61,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -76,7 +76,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -91,7 +91,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"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -106,7 +106,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"/> </jaxws:properties> <jaxws:features> <p:policies> http://git-wip-us.apache.org/repos/asf/cxf/blob/93039ab8/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 1794581..bf09e3c 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 @@ -65,7 +65,7 @@ <jaxws:properties> <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="security.signature.username" value="alice"/> <entry key="ws-security.signature.properties" value="alice.properties"/> </jaxws:properties> </jaxws:client> @@ -73,7 +73,7 @@ <jaxws:properties> <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="security.signature.username" value="alice"/> <entry key="ws-security.signature.properties" value="alice.properties"/> </jaxws:properties> </jaxws:client>