http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml index 114c116..c5cc585 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml @@ -28,7 +28,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EndorsingSupportingTokens" address="http://localhost:${testutil.ports.EndorsingServer}/DoubleItEndorsingSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItEndorsingSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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="EndorsingSupportingTokens2" address="http://localhost:${testutil.ports.EndorsingServer}/DoubleItEndorsingSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItEndorsingSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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="EndorsingSupportingTokens3" address="http://localhost:${testutil.ports.EndorsingServer}/DoubleItEndorsingSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItEndorsingSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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="SignedEndorsingSupportingTokens" address="http://localhost:${testutil.ports.EndorsingServer}/DoubleItSignedEndorsingSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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="SignedEndorsingSupportingTokens2" address="http://localhost:${testutil.ports.EndorsingServer}/DoubleItSignedEndorsingSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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="SignedEndorsingSupportingTokens3" address="http://localhost:${testutil.ports.EndorsingServer}/DoubleItSignedEndorsingSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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>
http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml index 36234bf..e64cb84 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml @@ -28,7 +28,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens" address="http://localhost:${testutil.ports.Server}/DoubleItSignedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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="SignedSupportingTokens2" address="http://localhost:${testutil.ports.Server}/DoubleItSignedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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="SignedSupportingTokens3" address="http://localhost:${testutil.ports.Server}/DoubleItSignedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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="EncryptedSupportingTokens" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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="EncryptedSupportingTokens2" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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="EncryptedSupportingTokens3" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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="SignedEncryptedSupportingTokens" address="http://localhost:${testutil.ports.Server}/DoubleItSignedEncryptedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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="SignedEncryptedSupportingTokens2" address="http://localhost:${testutil.ports.Server}/DoubleItSignedEncryptedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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="SignedEncryptedSupportingTokens3" address="http://localhost:${testutil.ports.Server}/DoubleItSignedEncryptedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml index bed9f67..65a65be 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-endorsing-server.xml @@ -28,7 +28,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EndorsingSupportingTokens" address="http://localhost:${testutil.ports.StaxEndorsingServer}/DoubleItEndorsingSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItEndorsingSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -42,7 +42,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EndorsingSupportingTokens2" address="http://localhost:${testutil.ports.StaxEndorsingServer}/DoubleItEndorsingSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItEndorsingSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -56,7 +56,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EndorsingSupportingTokens3" address="http://localhost:${testutil.ports.StaxEndorsingServer}/DoubleItEndorsingSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItEndorsingSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -70,7 +70,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEndorsingSupportingTokens" address="http://localhost:${testutil.ports.StaxEndorsingServer}/DoubleItSignedEndorsingSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -84,7 +84,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEndorsingSupportingTokens2" address="http://localhost:${testutil.ports.StaxEndorsingServer}/DoubleItSignedEndorsingSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -98,7 +98,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEndorsingSupportingTokens3" address="http://localhost:${testutil.ports.StaxEndorsingServer}/DoubleItSignedEndorsingSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml index db6356d..b268452 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml @@ -28,7 +28,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -42,7 +42,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -56,7 +56,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedSupportingTokens3" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -70,7 +70,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens" address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -84,7 +84,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -98,7 +98,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens3" address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -112,7 +112,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedEncryptedSupporting"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -126,7 +126,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens2" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedEncryptedSupporting2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> @@ -140,7 +140,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncryptedSupportingTokens3" address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedEncryptedSupporting3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedSupportingPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.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.*"/> <entry key="ws-security.enable.streaming" value="true"/> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml index e8b9703..742a486 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client.xml @@ -66,7 +66,7 @@ <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.signature.username" value="alice"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedEncryptedPort"; createdFromAPI="true"> @@ -74,7 +74,7 @@ <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> <entry key="security.signature.username" value="alice"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedPort"; createdFromAPI="true"> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml index 52acc97..95b0ae4 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml @@ -48,21 +48,21 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSignedEndorsing" address="http://localhost:${testutil.ports.ServerDerived}/DoubleItUTDerivedSymmetricSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignedEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.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:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricEndorsingEncrypted" address="http://localhost:${testutil.ports.ServerDerived}/DoubleItUTDerivedSymmetricEndorsingEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricEndorsingEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.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:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SymmetricSignedEndorsingEncrypted" address="http://localhost:${testutil.ports.ServerDerived}/DoubleItUTDerivedSymmetricSignedEndorsingEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricSignedEndorsingEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUtDerived.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:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml index 8467df7..87f6808 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml @@ -70,14 +70,14 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEndorsing" address="https://localhost:${testutil.ports.Server}/DoubleItUTSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <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:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncrypted" address="https://localhost:${testutil.ports.Server}/DoubleItUTSignedEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <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:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml index 3cb2092..146adde 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml @@ -75,7 +75,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEndorsing" address="https://localhost:${testutil.ports.StaxServer}/DoubleItUTSignedEndorsing"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEndorsingPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <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> @@ -83,7 +83,7 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedEncrypted" address="https://localhost:${testutil.ports.StaxServer}/DoubleItUTSignedEncrypted"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedEncryptedPort" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl" depends-on="tls-settings"> <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> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml index 52f14b2..67b0661 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client.xml @@ -33,7 +33,7 @@ <jaxws:client name="{http://WSSec/wssc}SecureConversation_MutualCertificate10SignEncrypt_IPingService"; createdFromAPI="true"> <jaxws:properties> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties.sct" value="alice.properties"/> + <entry key="security.signature.properties.sct" value="alice.properties"/> <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> @@ -119,7 +119,7 @@ <jaxws:properties> <entry key="security.username.sct" value="abcd"/> <entry key="security.callback-handler.sct" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties.sct" value="alice.properties"/> + <entry key="security.signature.properties.sct" value="alice.properties"/> <entry key="security.encryption.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:client> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml index 2df1539..4913420 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/unit-server.xml @@ -48,8 +48,8 @@ <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="Symmetric" address="http://localhost:${testutil.ports.UnitServer.2}/DoubleItSymmetric"; serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/wssc/DoubleItWSSC.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="ws-security.signature.properties.sct" value="bob.properties"/> + <entry key="security.signature.properties" value="bob.properties"/> + <entry key="security.signature.properties.sct" value="bob.properties"/> </jaxws:properties> </jaxws:endpoint> </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml index 0f42169..ec350ed 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client.xml @@ -56,7 +56,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> @@ -67,7 +67,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml index 31ea18c..1813b60 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client_restricted.xml @@ -56,7 +56,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> @@ -67,7 +67,7 @@ <jaxws:properties> <entry key="security.username" value="Alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.encryption.properties" value="bob.properties"/> </jaxws:properties> </jaxws:client> http://git-wip-us.apache.org/repos/asf/cxf/blob/9a2c8262/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml index 2b027fc..1136da9 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml @@ -65,7 +65,7 @@ <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.Server}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncrypt"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <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="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -77,7 +77,7 @@ <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.Server}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDes"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <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="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/wssec10/server_restricted.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml index 35fc460..4154345 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml @@ -65,7 +65,7 @@ <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.Server}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRestricted"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <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="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -77,7 +77,7 @@ <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.Server}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDesRestricted"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <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="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/wssec10/stax-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml index 58b6586..1d321b3 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml @@ -67,7 +67,7 @@ <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.StaxServer}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncrypt"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <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="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -80,7 +80,7 @@ <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.StaxServer}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDes"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <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="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/wssec10/stax-server_restricted.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml index d8838a1..a762ed9 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml @@ -67,7 +67,7 @@ <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncrypt_IPingService"; id="MutualCertificate10SignEncrypt" address="http://localhost:${testutil.ports.StaxServer}/MutualCertificate10SignEncrypt"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncrypt_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRestricted"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <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="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -80,7 +80,7 @@ <jaxws:endpoint name="{http://WSSec/wssec10}MutualCertificate10SignEncryptRsa15TripleDes_IPingService"; id="MutualCertificate10SignEncryptRsa15TripleDes" address="http://localhost:${testutil.ports.StaxServer}/MutualCertificate10SignEncryptRsa15TripleDes"; serviceName="interop:PingService" endpointName="interop:MutualCertificate10SignEncryptRsa15TripleDes_IPingService" implementor="org.apache.cxf.systest.ws.wssec10.server.MutualCertificate10SignEncryptRsa15TripleDesRestricted"> <jaxws:properties> <entry key="security.username" value="Alice"/> - <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="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/x509/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml index f8e3eb6..e6aff1a 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client.xml @@ -76,7 +76,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -85,7 +85,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -100,7 +100,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -109,7 +109,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -118,7 +118,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -127,7 +127,7 @@ <jaxws:properties> <entry key="security.encryption.properties" value="bob-enc.properties"/> <entry key="security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice-enc.properties"/> + <entry key="security.signature.properties" value="alice-enc.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -136,7 +136,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> <entry key="ws-security.asymmetric.signature.algorithm" value="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/> @@ -146,7 +146,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -155,7 +155,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -164,7 +164,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -173,7 +173,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -182,7 +182,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -190,7 +190,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSignaturePort"; createdFromAPI="true"> <jaxws:properties> <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.signature.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -198,7 +198,7 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricSignatureSP11Port"; createdFromAPI="true"> <jaxws:properties> <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.signature.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -207,7 +207,7 @@ <jaxws:properties> <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.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -215,7 +215,7 @@ <jaxws:properties> <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.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> @@ -223,7 +223,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -232,7 +232,7 @@ <jaxws:properties> <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"/> <entry key="security.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> @@ -242,7 +242,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -263,42 +263,42 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingSP11Port"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSignedEndorsingPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingEncryptedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSignedEndorsingEncryptedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSupportingSignedPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -310,7 +310,7 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportKVTPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="security.signature.properties" value="alice.properties"/> <entry key="security.signature.username" value="alice"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -319,7 +319,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -333,7 +333,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -347,7 +347,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -361,7 +361,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -375,7 +375,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> @@ -395,7 +395,7 @@ <jaxws:properties> <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"/> <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties>
