Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 14fcfdfba -> a33cd57e1
Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a33cd57e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a33cd57e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a33cd57e Branch: refs/heads/3.0.x-fixes Commit: a33cd57e1e76b2b4e6a326d065e4795157da69a6 Parents: 23fdf2e Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Oct 20 14:00:30 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Oct 20 14:00:45 2015 +0100 ---------------------------------------------------------------------- .../apache/cxf/systest/wssec/examples/saml/client.xml | 11 ++--------- .../cxf/systest/wssec/examples/sts/cxf-symmetric.xml | 7 +------ 2 files changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a33cd57e/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml index a4ac603..82f7704 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml @@ -110,17 +110,10 @@ <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Symmetric_Port"/> <property name="properties"> <map> -<<<<<<< HEAD <entry key="ws-security.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.encryption.username" value="cxfca"/> -======= - <entry key="security.username" value="alice"/> - <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="security.encryption.properties" value="sts.properties"/> - <entry key="security.encryption.username" value="sts"/> ->>>>>>> 62d70e9... Updating systest keys from 1024 bit to 2048 bits + <entry key="ws-security.encryption.properties" value="sts.properties"/> + <entry key="ws-security.encryption.username" value="sts"/> </map> </property> </bean> http://git-wip-us.apache.org/repos/asf/cxf/blob/a33cd57e/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml index c654ab0..070e3f6 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml @@ -50,13 +50,8 @@ </bean> <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"; id="SymmetricSTS" implementor="#symmetricSTSProviderBean" address="http://localhost:${testutil.ports.sts.STSServer}/SecurityTokenService/Symmetric"; wsdlLocation="src/test/resources/org/apache/cxf/systest/wssec/examples/sts/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Symmetric_Port"> <jaxws:properties> -<<<<<<< HEAD <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="ws-security.signature.properties" value="cxfca.properties"/> -======= - <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/> - <entry key="security.signature.properties" value="sts.properties"/> ->>>>>>> 62d70e9... Updating systest keys from 1024 bit to 2048 bits + <entry key="ws-security.signature.properties" value="sts.properties"/> </jaxws:properties> </jaxws:endpoint> </beans>
