http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 3adf162..7fa1b6d 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 @@ -27,7 +27,7 @@ </cxf:bus> <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="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> + <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.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -36,7 +36,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> + <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.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -45,7 +45,7 @@ </jaxws:endpoint> <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="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="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -54,7 +54,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricEndorsing" address="http://localhost:${testutil.ports.StaxServer}/DoubleItX509SymmetricEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingPort" implementor="org.apache.cxf.systest.wssec.examples.common.DoubleItPortTypeImpl" 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="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> <!-- TODO Fix the way these properties are inverted --> <entry key="security.signature.username" value="bob"/> <entry key="ws-security.encryption.properties" value="bob.properties"/>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java index 2f7a1e5..7f07445 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java @@ -161,7 +161,7 @@ public class FaultTest extends AbstractBusClientServerTestBase { // Add WS-Security configuration Client client = ((DispatchImpl<DOMSource>) dispatch).getClient(); client.getRequestContext().put( - "ws-security.callback-handler", + "security.callback-handler", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback" ); client.getRequestContext().put( http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 2b1a154..a4a7947 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 @@ -28,7 +28,7 @@ import org.apache.cxf.annotations.EndpointProperty; @WebService(name = "HelloPolicyService", serviceName = "HelloPolicyService") @EndpointProperties(value = { - @EndpointProperty(key = "ws-security.callback-handler", + @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"), http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 de949dc..80e964e 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 @@ -208,7 +208,7 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase { Map<String, Object> properties = new HashMap<String, Object>(); properties.put("security.encryption.username", "bob"); TokenCallbackHandler callbackHandler = new TokenCallbackHandler(); - properties.put("ws-security.callback-handler", callbackHandler); + properties.put("security.callback-handler", callbackHandler); properties.put("ws-security.signature.properties", "alice.properties"); properties.put("ws-security.encryption.properties", "bob.properties"); stsClient.setProperties(properties); @@ -243,7 +243,7 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase { Map<String, Object> properties = new HashMap<String, Object>(); properties.put("security.encryption.username", "bob"); TokenCallbackHandler callbackHandler = new TokenCallbackHandler(); - properties.put("ws-security.callback-handler", callbackHandler); + properties.put("security.callback-handler", callbackHandler); properties.put("ws-security.signature.properties", "alice.properties"); properties.put("ws-security.encryption.properties", "bob.properties"); stsClient.setProperties(properties); http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 ef8f230..46ec421 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 @@ -36,7 +36,7 @@ import org.example.contract.doubleit.DoubleItPortType; @EndpointProperty(key = "security.encryption.username", value = "alice"), @EndpointProperty(key = "ws-security.encryption.properties", value = "alice.properties"), @EndpointProperty(key = "ws-security.signature.properties", value = "bob.properties"), - @EndpointProperty(key = "ws-security.callback-handler", + @EndpointProperty(key = "security.callback-handler", value = "org.apache.cxf.systest.ws.common.KeystorePasswordCallback") }) public class DoubleItPropertiesImpl implements DoubleItPortType { http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 670222c..efbb971 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 @@ -179,7 +179,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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> @@ -188,7 +188,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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.encryption.properties" value="alice.properties"/> <entry key="security.encryption.username" value="alice"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml index dfc5c5f..df01b9f 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml @@ -27,7 +27,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetric128Port"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> @@ -40,7 +40,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetric128Port2"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> @@ -53,7 +53,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetric128Port3"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> @@ -66,7 +66,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetric128InclusivePort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.is-bsp-compliant" value="false"/> @@ -80,7 +80,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetric128InclusivePort2"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.is-bsp-compliant" value="false"/> @@ -94,7 +94,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricCombinedPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> </jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 a8f7e27..8207fbc 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 @@ -27,7 +27,7 @@ </cxf:bus> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -39,7 +39,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -51,7 +51,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> @@ -63,7 +63,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-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"/> @@ -76,7 +76,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-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"/> @@ -89,7 +89,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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/ee64acf5/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 271d1fc..a7b49e5 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 @@ -27,7 +27,7 @@ </cxf:bus> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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"/> @@ -40,7 +40,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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"/> @@ -53,7 +53,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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"/> @@ -66,7 +66,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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"/> @@ -80,7 +80,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <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/ee64acf5/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 076d45d..9cd7756 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 @@ -27,7 +27,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItOnlySignPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -42,7 +42,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItNotOnlySignPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -57,7 +57,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptSignaturePort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -72,7 +72,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptSignaturePort2"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -87,7 +87,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItIncludeTimestampPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -102,7 +102,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItIncludeTimestampPort2"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -117,7 +117,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptBeforeSigningPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -132,7 +132,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptBeforeSigningPort2"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -147,7 +147,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignBeforeEncryptingPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -162,7 +162,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignBeforeEncryptingPort2"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -177,7 +177,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTimestampFirstPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -192,7 +192,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTimestampFirstPort2"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -207,7 +207,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTimestampLastPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -222,7 +222,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTimestampLastPort2"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -237,7 +237,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItStrictPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -252,7 +252,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItStrictPort2"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -267,7 +267,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTokenProtectionPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -282,7 +282,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTokenProtectionPort2"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -297,7 +297,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignatureConfirmationPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -312,7 +312,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignatureConfirmationPort2"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> @@ -328,7 +328,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignatureConfirmationEncBeforeSigningPort"; createdFromAPI="true"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.encryption.properties" value="bob.properties"/> <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="alice.properties"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 dc0fe9f..46f199b 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 @@ -27,7 +27,7 @@ </cxf:bus> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -40,7 +40,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -53,7 +53,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -66,7 +66,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -79,7 +79,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -92,7 +92,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -105,7 +105,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -118,7 +118,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -131,7 +131,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -144,7 +144,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -157,7 +157,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -170,7 +170,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -183,7 +183,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -196,7 +196,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -209,7 +209,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -222,7 +222,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -235,7 +235,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -248,7 +248,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -261,7 +261,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -274,7 +274,7 @@ </jaxws:endpoint> <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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -288,7 +288,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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml index 4e47c11..9877e68 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml @@ -27,7 +27,7 @@ </cxf:bus> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="OnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -41,7 +41,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="NotOnlySignEntireHeadersAndBodyEndpoint" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -55,7 +55,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptSignatureEndpoint" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -69,7 +69,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptSignatureEndpoint2" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -83,7 +83,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="IncludeTimestampEndpoint" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -97,7 +97,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="IncludeTimestampEndpoint2" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -111,7 +111,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptBeforeSigningEndpoint" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -125,7 +125,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptBeforeSigningEndpoint2" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -139,7 +139,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignBeforeEncryptingEndpoint" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -153,7 +153,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignBeforeEncryptingEndpoint2" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -167,7 +167,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TimestampFirstEndpoint" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -181,7 +181,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TimestampFirstEndpoint2" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -195,7 +195,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TimestampLastEndpoint" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -209,7 +209,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TimestampLastEndpoint2" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -223,7 +223,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="StrictEndpoint" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -237,7 +237,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="StrictEndpoint2" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -251,7 +251,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TokenProtectionEndpoint" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -265,7 +265,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="TokenProtectionEndpoint2" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -279,7 +279,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignatureConfirmationEndpoint" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -293,7 +293,7 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignatureConfirmationEndpoint2" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> @@ -308,7 +308,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignatureConfirmationEncBeforeSigningEndpoint" address="http://localhost:${testutil.ports.StaxServer}/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="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="security.encryption.username" value="useReqSigCert"/> <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml index 1a3a27e..7c92176 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml @@ -28,14 +28,14 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="CacheSymmetric" address="http://localhost:${testutil.ports.Server}/DoubleItCacheSymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItCacheSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/cache/DoubleItCache.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.crypto" value="bob.properties"/> </jaxws:properties> </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="CachePerProxySymmetric" address="http://localhost:${testutil.ports.Server}/DoubleItCachePerProxySymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItCacheSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/cache/DoubleItCache.wsdl"> <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.signature.crypto" value="bob.properties"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/ee64acf5/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 cb4eea5..a23e413 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 @@ -31,7 +31,7 @@ <entry key="security.encryption.username" value="bob"/> <entry key="ws-security.signature.properties" value="morpit.properties"/> <entry key="security.signature.username" value="morpit"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> + <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> </beans>
