[cxf] 02/02: Recording .gitmergeinfo Changes

[coheigea]

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 ad44e257dffa43587f97368ec92e1d5a0dcd189d
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Thu Feb 8 09:53:09 2018 +0000

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo                                                |  1 +
 .../java/org/apache/cxf/systest/ws/action/ActionTest.java    | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index c1c16d5..14f5dc6 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -829,6 +829,7 @@ M 5afec44d741580762fb5d6f4f4fac7d34446ae95
 M 5b7b014cc1d24cba1191bc07fd48b13dbf4d4391
 M 5c7031e8f555686ba6fe6d37e23db229dd4b73c7
 M 5cff82c735c7543ce6dfb6c52ac72f583dbb5d22
+M 5d67785208334062a950dc7f85ffcb7d52af3db5
 M 5d7a27d87a44d3e87f97d446e14301ad0a4e457c
 M 5e17bc043723353937ee7f1f9ac1c51c83b74679
 M 5f6cb0745adc5d8cb6dd53a46751f56f42928d94
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
index 6cd6b43..41cf09e 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java
@@ -458,8 +458,8 @@ public class ActionTest extends 
AbstractBusClientServerTestBase {
         URL busFile = ActionTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        BusFactory.setDefaultBus(bus);
-        BusFactory.setThreadDefaultBus(bus);
+        SpringBusFactory.setDefaultBus(bus);
+        SpringBusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -493,8 +493,8 @@ public class ActionTest extends 
AbstractBusClientServerTestBase {
         URL busFile = ActionTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        BusFactory.setDefaultBus(bus);
-        BusFactory.setThreadDefaultBus(bus);
+        SpringBusFactory.setDefaultBus(bus);
+        SpringBusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -535,8 +535,8 @@ public class ActionTest extends 
AbstractBusClientServerTestBase {
         URL busFile = ActionTest.class.getResource("client.xml");
 
         Bus bus = bf.createBus(busFile.toString());
-        BusFactory.setDefaultBus(bus);
-        BusFactory.setThreadDefaultBus(bus);
+        SpringBusFactory.setDefaultBus(bus);
+        SpringBusFactory.setThreadDefaultBus(bus);
 
         URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl");
         Service service = Service.create(wsdl, SERVICE_QNAME);

-- 
To stop receiving notification emails like this one, please contact
cohei...@apache.org.