Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 18ef37ed6 -> 26178395a
Fixing tests Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/26178395 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/26178395 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/26178395 Branch: refs/heads/3.0.x-fixes Commit: 26178395a67e81d1a299e8c7880654fd913983f3 Parents: 18ef37e Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Fri Oct 14 20:09:54 2016 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Fri Oct 14 20:10:06 2016 +0100 ---------------------------------------------------------------------- .../apache/cxf/systest/ws/tokens/tls-client.xml | 26 ++++++++++---------- .../apache/cxf/systest/ws/tokens/tls-server.xml | 20 +++++++-------- 2 files changed, 23 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/26178395/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-client.xml index 7016412..c91ad37 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-client.xml @@ -27,18 +27,18 @@ <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> <sec:trustManagers> - <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/> + <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Truststore.jks"/> </sec:trustManagers> </http:tlsClientParameters> </http:conduit> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedSupportingPort4"; createdFromAPI="true"> <jaxws:properties> - <entry key="security.username" value="Alice"/> - <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="security.encryption.properties" value="bob.properties"/> - <entry key="security.encryption.username" value="bob"/> - <entry key="security.signature.properties" value="alice.properties"/> - <entry key="security.signature.username" value="alice"/> + <entry key="ws-security.username" value="Alice"/> + <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="ws-security.encryption.username" value="bob"/> + <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="ws-security.signature.username" value="alice"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> </jaxws:properties> <jaxws:features> @@ -49,12 +49,12 @@ </jaxws:client> <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedSupportingPort5"; createdFromAPI="true"> <jaxws:properties> - <entry key="security.username" value="Alice"/> - <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="security.encryption.properties" value="bob.properties"/> - <entry key="security.encryption.username" value="bob"/> - <entry key="security.signature.properties" value="alice.properties"/> - <entry key="security.signature.username" value="alice"/> + <entry key="ws-security.username" value="Alice"/> + <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="ws-security.encryption.username" value="bob"/> + <entry key="ws-security.signature.properties" value="alice.properties"/> + <entry key="ws-security.signature.username" value="alice"/> <entry key="ws-security.username-token.always.encrypted" value="false"/> </jaxws:properties> <jaxws:features> http://git-wip-us.apache.org/repos/asf/cxf/blob/26178395/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-server.xml index 9b2266d..bd06c2d 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/tls-server.xml @@ -29,10 +29,10 @@ <httpj:engine port="${testutil.ports.tokens.TLSServer}"> <httpj:tlsServerParameters> <sec:keyManagers keyPassword="password"> - <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/> + <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/> </sec:keyManagers> <sec:trustManagers> - <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/> + <sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Truststore.jks"/> </sec:trustManagers> <sec:clientAuthentication want="true" required="false"/> </httpj:tlsServerParameters> @@ -40,10 +40,10 @@ </httpj:engine-factory> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens4" address="https://localhost:${testutil.ports.tokens.TLSServer}/DoubleItEncryptedSupporting4"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort4" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl" depends-on="tls-settings"> <jaxws:properties> - <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="security.signature.properties" value="bob.properties"/> - <entry key="security.encryption.username" value="useReqSigCert"/> - <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies> @@ -53,10 +53,10 @@ </jaxws:endpoint> <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedSupportingTokens5" address="https://localhost:${testutil.ports.tokens.TLSServer}/DoubleItEncryptedSupporting5"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedSupportingPort5" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/tokens/DoubleItTokens.wsdl" depends-on="tls-settings"> <jaxws:properties> - <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="security.signature.properties" value="bob.properties"/> - <entry key="security.encryption.username" value="useReqSigCert"/> - <entry key="security.subject.cert.constraints" value=".*O=apache.org.*"/> + <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> + <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="ws-security.encryption.username" value="useReqSigCert"/> + <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> </jaxws:properties> <jaxws:features> <p:policies>
