Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/38c2b418 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/38c2b418 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/38c2b418 Branch: refs/heads/3.0.x-fixes Commit: 38c2b41810a3c575edbc03f13a6a1f0e854a8809 Parents: ec57d78 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Thu Jun 18 17:11:59 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Thu Jun 18 17:11:59 2015 +0100 ---------------------------------------------------------------------- .../apache/cxf/systest/ws/swa/policy-client.xml | 13 ------------- .../apache/cxf/systest/ws/swa/policy-server.xml | 16 ---------------- .../cxf/systest/ws/swa/stax-policy-server.xml | 17 ----------------- 3 files changed, 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/38c2b418/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml index 6ccf037..91a20da 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml @@ -70,17 +70,4 @@ </jaxws:properties> </jaxws:client> -<<<<<<< HEAD - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWACombinedAsymmetricDerivedPolicyPort"; createdFromAPI="true"> - <jaxws:properties> - <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.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - </jaxws:properties> - </jaxws:client> - -======= ->>>>>>> 25d02a2... Removing test </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/38c2b418/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml index 2e13ac7..12b7180 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml @@ -94,20 +94,4 @@ </jaxws:properties> </jaxws:endpoint> -<<<<<<< HEAD - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="CombinedAsymmetricDerivedPolicy" - address="http://localhost:${testutil.ports.swa.PolicyServer}/DoubleItSWACombinedAsymmetricDerivedPolicy"; - serviceName="s:DoubleItService" endpointName="s:DoubleItSWACombinedAsymmetricDerivedPolicyPort" - implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" - wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> - <jaxws:properties> - <entry key="ws-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="ws-security.encryption.username" value="alice"/> - </jaxws:properties> - </jaxws:endpoint> - -======= ->>>>>>> 25d02a2... Removing test </beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/38c2b418/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml index 37a892a..b96a776 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml @@ -100,21 +100,4 @@ </jaxws:properties> </jaxws:endpoint> -<<<<<<< HEAD - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="CombinedAsymmetricDerivedPolicy" - address="http://localhost:${testutil.ports.swa.StaxPolicyServer}/DoubleItSWACombinedAsymmetricDerivedPolicy"; - serviceName="s:DoubleItService" endpointName="s:DoubleItSWACombinedAsymmetricDerivedPolicyPort" - implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" - wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> - <jaxws:properties> - <entry key="ws-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="ws-security.encryption.username" value="alice"/> - <entry key="ws-security.enable.streaming" value="true"/> - </jaxws:properties> - </jaxws:endpoint> - -======= ->>>>>>> 25d02a2... Removing test </beans>
