Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8d3e9292 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8d3e9292 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8d3e9292 Branch: refs/heads/2.7.x-fixes Commit: 8d3e92924ecf6d76aa161c496079a7d3eca20091 Parents: 33cb260 Author: Colm O hEigeartaigh <[email protected]> Authored: Thu May 22 16:56:43 2014 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu May 22 16:56:43 2014 +0100 ---------------------------------------------------------------------- .../intermediary_transformation/cxf-client.xml | 34 -------------------- 1 file changed, 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/8d3e9292/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml index a058c35..e7281dc 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-client.xml @@ -34,7 +34,6 @@ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/confi <cxf:logging/> </cxf:features> </cxf:bus> -<<<<<<< HEAD <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1EndorsingPort"; createdFromAPI="true"> @@ -54,7 +53,6 @@ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/confi value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/> <property name="properties"> <map> - <entry key="ws-security.username" value="alice"/> <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> <entry key="ws-security.sts.token.username" value="myclientkey"/> @@ -75,37 +73,5 @@ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/confi </http:tlsClientParameters> </http:conduit> -======= - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML1EndorsingPort"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="myclientkey"/> - <entry key="ws-security.signature.properties" value="clientKeystore.properties"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.sts.client"> - <bean class="org.apache.cxf.ws.security.trust.STSClient"> - <constructor-arg ref="cxf"/> - <property name="wsdlLocation" value="https://localhost:8443/SecurityTokenService/Transport?wsdl"/> - <property name="serviceName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/> - <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}Transport_Port"/> - <property name="properties"> - <map> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/> - <entry key="ws-security.sts.token.username" value="myclientkey"/> - <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/> - <entry key="ws-security.sts.token.usecert" value="true"/> - </map> - </property> - </bean> - </entry> - </jaxws:properties> - </jaxws:client> - <http:conduit name="https://localhost.*";> - <http:tlsClientParameters disableCNCheck="true"> - <sec:trustManagers> - <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/> - </sec:trustManagers> - </http:tlsClientParameters> - </http:conduit> ->>>>>>> a8e21df... Add some more STS caching tests </beans>
