http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml index 3455498..de77fae 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml @@ -28,7 +28,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SecureConversation" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSecureConversation"; serviceName="s:DoubleItService" endpointName="s:DoubleItSecureConversationPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/secconv/DoubleItSecConv.wsdl"> <jaxws:properties> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties.sct" value="bob.properties"/> + <entry key="security.signature.properties.sct" value="bob.properties"/> <entry key="security.encryption.username.sct" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints.sct" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml index b8743cb..61bd8d6 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml @@ -51,7 +51,7 @@ <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="SymmetricSTS" implementor="#symmetricSTSProviderBean" address="http://localhost:${testutil.ports.STSServer}/SecurityTokenService/Symmetric"; wsdlLocation="src/test/resources/org/apache/cxf/systest/wssec/examples/sts/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Symmetric_Port"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="cxfca.properties"/> + <entry key="security.signature.properties" value="cxfca.properties"/> </jaxws:properties> </jaxws:endpoint> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 4828cb2..13d3233 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 @@ -53,7 +53,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> </jaxws:client> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml index fb2f7a3..37d35fd 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml @@ -48,7 +48,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSESupporting" address="http://localhost:${testutil.ports.Server}/DoubleItUTAsymmetricSESupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -56,13 +56,13 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricEncrSupporting" address="http://localhost:${testutil.ports.Server}/DoubleItUTAsymmetricEncrSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncrSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSESupporting" address="http://localhost:${testutil.ports.Server}/DoubleItUTSymmetricSESupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut//DoubleItUt.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml index 2dd8e92..d888fab 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml @@ -52,7 +52,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSESupporting" address="http://localhost:${testutil.ports.StaxServer}/DoubleItUTAsymmetricSESupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -61,14 +61,14 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricEncrSupporting" address="http://localhost:${testutil.ports.StaxServer}/DoubleItUTAsymmetricEncrSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncrSupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut/DoubleItUt.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSESupporting" address="http://localhost:${testutil.ports.StaxServer}/DoubleItUTSymmetricSESupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSESupportingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/ut//DoubleItUt.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 a42ad24..d77ae3a 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 @@ -29,7 +29,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> </jaxws:client> @@ -38,7 +38,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> </jaxws:client> @@ -54,7 +54,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> </jaxws:client> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 de523a5..e4358e4 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 @@ -28,7 +28,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSignEncrypt" address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricSignEncrypt"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -36,7 +36,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricProtectTokens"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -45,7 +45,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="security.signature.username" value="bob"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> </jaxws:endpoint> @@ -55,7 +55,7 @@ <!-- TODO Fix the way these properties are inverted --> <entry key="security.signature.username" value="bob"/> <entry key="security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 51410f4..65acdb8 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 @@ -28,7 +28,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricSignEncrypt" address="http://localhost:${testutil.ports.StaxServer}/DoubleItX509AsymmetricSignEncrypt"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricSignEncryptPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -37,7 +37,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricProtectTokens" address="http://localhost:${testutil.ports.StaxServer}/DoubleItX509AsymmetricProtectTokens"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricProtectTokensPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/wssec/examples/x509/DoubleItX509.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -47,7 +47,7 @@ <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <entry key="security.signature.username" value="bob"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -58,7 +58,7 @@ <!-- TODO Fix the way these properties are inverted --> <entry key="security.signature.username" value="bob"/> <entry key="security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/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 a4a7947..9094ddb 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 @@ -31,7 +31,7 @@ import org.apache.cxf.annotations.EndpointProperty; @EndpointProperty(key = "security.callback-handler", 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 = "security.signature.properties", value = "alice.properties"), @EndpointProperty(key = "security.signature.username", value = "alice") }) @HandlerChain(file = "handlers.xml") http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java index 3bdbaff..3d52467 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java @@ -209,7 +209,7 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase { properties.put("security.encryption.username", "bob"); TokenCallbackHandler callbackHandler = new TokenCallbackHandler(); properties.put("security.callback-handler", callbackHandler); - properties.put("ws-security.signature.properties", "alice.properties"); + properties.put("security.signature.properties", "alice.properties"); properties.put("security.encryption.properties", "bob.properties"); stsClient.setProperties(properties); @@ -244,7 +244,7 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase { properties.put("security.encryption.username", "bob"); TokenCallbackHandler callbackHandler = new TokenCallbackHandler(); properties.put("security.callback-handler", callbackHandler); - properties.put("ws-security.signature.properties", "alice.properties"); + properties.put("security.signature.properties", "alice.properties"); properties.put("security.encryption.properties", "bob.properties"); stsClient.setProperties(properties); http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java index 239658e..7b37a1d 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItPropertiesImpl.java @@ -35,7 +35,7 @@ import org.example.contract.doubleit.DoubleItPortType; @EndpointProperties({ @EndpointProperty(key = "security.encryption.username", value = "alice"), @EndpointProperty(key = "security.encryption.properties", value = "alice.properties"), - @EndpointProperty(key = "ws-security.signature.properties", value = "bob.properties"), + @EndpointProperty(key = "security.signature.properties", value = "bob.properties"), @EndpointProperty(key = "security.callback-handler", value = "org.apache.cxf.systest.ws.common.KeystorePasswordCallback") }) http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml index d7b62ca..9bdb55b 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml @@ -180,7 +180,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Asymmetric" address="http://localhost:${testutil.ports.Server}/DoubleItAsymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> </jaxws:properties> @@ -189,7 +189,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="AsymmetricEncryptBeforeSigning" address="http://localhost:${testutil.ports.Server}/DoubleItAsymmetricEncryptBeforeSigning"; serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricEncryptBeforeSigningPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/action/DoubleItActionPolicy.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml index 8207fbc..7534e9e 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml @@ -28,7 +28,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Symmetric128Endpoint" address="http://localhost:${testutil.ports.Server}/DoubleItSymmetric128"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -40,7 +40,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Symmetric128Endpoint2" address="http://localhost:${testutil.ports.Server}/DoubleItSymmetric128no2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -52,7 +52,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Symmetric128Endpoint3" address="http://localhost:${testutil.ports.Server}/DoubleItSymmetric128no3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> @@ -64,7 +64,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Symmetric128InclusiveEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItSymmetric128Inclusive"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> @@ -77,7 +77,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Symmetric128InclusiveEndpoint2" address="http://localhost:${testutil.ports.Server}/DoubleItSymmetric128Inclusive2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.is-bsp-compliant" value="false"/> </jaxws:properties> @@ -90,7 +90,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricEndpointCombined" address="http://localhost:${testutil.ports.Server}/DoubleItSymmetricCombined"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricCombinedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml index a7b49e5..7d08c22 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml @@ -28,7 +28,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Symmetric128Endpoint" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSymmetric128"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -41,7 +41,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Symmetric128Endpoint2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSymmetric128no2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -54,7 +54,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Symmetric128Endpoint3" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSymmetric128no3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128Port3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> @@ -67,7 +67,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Symmetric128InclusiveEndpoint" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSymmetric128Inclusive"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> <entry key="ws-security.is-bsp-compliant" value="false"/> @@ -81,7 +81,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Symmetric128InclusiveEndpoint2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSymmetric128Inclusive2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetric128InclusivePort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> <entry key="ws-security.enable.streaming" value="true"/> <entry key="ws-security.is-bsp-compliant" value="false"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/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 0849a65..5488620 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 @@ -30,7 +30,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -45,7 +45,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -60,7 +60,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -75,7 +75,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -90,7 +90,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -105,7 +105,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -120,7 +120,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -135,7 +135,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -150,7 +150,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -165,7 +165,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -180,7 +180,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -195,7 +195,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -210,7 +210,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -225,7 +225,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -240,7 +240,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -255,7 +255,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -270,7 +270,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -285,7 +285,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -300,7 +300,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -315,7 +315,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> @@ -331,7 +331,7 @@ <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> </jaxws:properties> <jaxws:features> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml index 46f199b..ecfb7d6 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml @@ -28,7 +28,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="OnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItOnlySign"; serviceName="s:DoubleItService" endpointName="s:DoubleItOnlySignPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -41,7 +41,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="NotOnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItNotOnlySign"; serviceName="s:DoubleItService" endpointName="s:DoubleItNotOnlySignPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -54,7 +54,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptSignatureEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptSignature"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -67,7 +67,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptSignatureEndpoint2" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptSignature2"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptSignaturePort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -80,7 +80,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="IncludeTimestampEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItIncludeTimestamp"; serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -93,7 +93,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="IncludeTimestampEndpoint2" address="http://localhost:${testutil.ports.Server}/DoubleItIncludeTimestamp2"; serviceName="s:DoubleItService" endpointName="s:DoubleItIncludeTimestampPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -106,7 +106,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptBeforeSigningEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptBeforeSigning"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -119,7 +119,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptBeforeSigningEndpoint2" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptBeforeSigning2"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptBeforeSigningPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -132,7 +132,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignBeforeEncryptingEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItSignBeforeEncrypting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -145,7 +145,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignBeforeEncryptingEndpoint2" address="http://localhost:${testutil.ports.Server}/DoubleItSignBeforeEncrypting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignBeforeEncryptingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -158,7 +158,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TimestampFirstEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItTimestampFirst"; serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -171,7 +171,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TimestampFirstEndpoint2" address="http://localhost:${testutil.ports.Server}/DoubleItTimestampFirst2"; serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampFirstPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -184,7 +184,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TimestampLastEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItTimestampLast"; serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -197,7 +197,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TimestampLastEndpoint2" address="http://localhost:${testutil.ports.Server}/DoubleItTimestampLast2"; serviceName="s:DoubleItService" endpointName="s:DoubleItTimestampLastPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -210,7 +210,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="StrictEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItStrict"; serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -223,7 +223,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="StrictEndpoint2" address="http://localhost:${testutil.ports.Server}/DoubleItStrict2"; serviceName="s:DoubleItService" endpointName="s:DoubleItStrictPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -236,7 +236,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TokenProtectionEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItTokenProtection"; serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -249,7 +249,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TokenProtectionEndpoint2" address="http://localhost:${testutil.ports.Server}/DoubleItTokenProtection2"; serviceName="s:DoubleItService" endpointName="s:DoubleItTokenProtectionPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -262,7 +262,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignatureConfirmationEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItSignatureConfirmation"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -275,7 +275,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignatureConfirmationEndpoint2" address="http://localhost:${testutil.ports.Server}/DoubleItSignatureConfirmation2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -289,7 +289,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignatureConfirmationEncBeforeSigningEndpoint" address="http://localhost:${testutil.ports.Server}/DoubleItSignatureConfirmationEncBeforeSigning"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignatureConfirmationEncBeforeSigningPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/bindings/DoubleItBindings.wsdl"> <jaxws:properties> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties>
