You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/01/16 21:07:13 UTC
[cxf] 03/03: Fixing merge
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c3d6d23a585f14a7a685d047183f08679a973b0f
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jan 16 18:00:34 2018 +0000
Fixing merge
---
.../apache/cxf/systest/sts/transport/TransportBindingTest.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
index 524baa9..c492171 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
@@ -417,10 +417,7 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
((java.io.Closeable)transportSaml1Port).close();
bus.shutdown(true);
}
-<<<<<<< HEAD
-=======
-
@org.junit.Test
public void testSAML2EndorsingSymmetric() throws Exception {
@@ -428,8 +425,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
URL busFile = TransportBindingTest.class.getResource("cxf-client.xml");
Bus bus = bf.createBus(busFile.toString());
- BusFactory.setDefaultBus(bus);
- BusFactory.setThreadDefaultBus(bus);
+ SpringBusFactory.setDefaultBus(bus);
+ SpringBusFactory.setThreadDefaultBus(bus);
URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -450,7 +447,6 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase {
bus.shutdown(true);
}
->>>>>>> dae5b16c80... Added EndorsingSupportingToken/IssuedToken SymmetricKey test
private DOMSource createDOMRequest() throws ParserConfigurationException {
// Creating a DOMSource Object for the request
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.