cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [5/5] cxf git commit: Fixing backmerge
Date Mon, 26 Sep 2016 11:47:47 GMT
Fixing backmerge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/32176313
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/32176313
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/32176313

Branch: refs/heads/3.0.x-fixes
Commit: 32176313ee92b9ded02643005d8641c6b279aa31
Parents: 1994f0b
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Sep 26 12:47:34 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Sep 26 12:47:34 2016 +0100

----------------------------------------------------------------------
 .../apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java   | 4 ----
 .../resources/org/apache/cxf/systest/ws/algsuite/client.xml  | 8 ++++----
 .../resources/org/apache/cxf/systest/ws/algsuite/server.xml  | 6 +++---
 3 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/32176313/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
index a358527..4626c50 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
@@ -310,9 +310,6 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase
{
         bus.shutdown(true);
     }
     
-<<<<<<< HEAD
-}
-=======
     @org.junit.Test
     public void testMultipleAlgorithmSuitesPolicy() throws Exception {
         
@@ -344,4 +341,3 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase
{
         bus.shutdown(true);
     }
 }
->>>>>>> 434cdaf... Adding a test for multiple algorithm suites

http://git-wip-us.apache.org/repos/asf/cxf/blob/32176313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml
index 45fcbe5..b84a5fb 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client.xml
@@ -185,10 +185,10 @@
     </jaxws:client>
     <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItMultipleAlgSuitesPort"
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="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"/>
         </jaxws:properties>
         <jaxws:features>
             <p:policies>

http://git-wip-us.apache.org/repos/asf/cxf/blob/32176313/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
index 2bf11e3..d808a13 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml
@@ -174,9 +174,9 @@
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="DoubleItMultipleAlgSuites"
address="http://localhost:${testutil.ports.algsuite.Server}/DoubleItMultipleAlgSuites" serviceName="s:DoubleItService"
endpointName="s:DoubleItMultipleAlgSuitesPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/algsuite/DoubleItAlgSuite.wsdl">
         <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.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.subject.cert.constraints" value=".*O=apache.org.*"/>
             <entry key="ws-security.is-bsp-compliant" value="false"/>
         </jaxws:properties>
         <jaxws:features>


Mime
View raw message