http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java ---------------------------------------------------------------------- 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 e577738..8855519 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 @@ -25,6 +25,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; @@ -70,8 +71,8 @@ public class ActionTest extends AbstractBusClientServerTestBase { URL busFile = ActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -92,8 +93,8 @@ public class ActionTest extends AbstractBusClientServerTestBase { URL busFile = ActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -129,8 +130,8 @@ public class ActionTest extends AbstractBusClientServerTestBase { URL busFile = ActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -168,8 +169,8 @@ public class ActionTest extends AbstractBusClientServerTestBase { URL busFile = ActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -190,8 +191,8 @@ public class ActionTest extends AbstractBusClientServerTestBase { URL busFile = ActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -226,8 +227,8 @@ public class ActionTest extends AbstractBusClientServerTestBase { URL busFile = ActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -251,8 +252,8 @@ public class ActionTest extends AbstractBusClientServerTestBase { URL busFile = ActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -275,8 +276,8 @@ public class ActionTest extends AbstractBusClientServerTestBase { URL busFile = ActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -299,8 +300,8 @@ public class ActionTest extends AbstractBusClientServerTestBase { URL busFile = ActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -327,8 +328,8 @@ public class ActionTest extends AbstractBusClientServerTestBase { URL busFile = ActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -355,8 +356,8 @@ public class ActionTest extends AbstractBusClientServerTestBase { URL busFile = ActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -383,8 +384,8 @@ public class ActionTest extends AbstractBusClientServerTestBase { URL busFile = ActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ActionTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java index 3d7f424..f190de4 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/SignatureWhitespaceTest.java @@ -30,6 +30,7 @@ import javax.xml.ws.Dispatch; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.endpoint.Client; import org.apache.cxf.jaxws.DispatchImpl; @@ -97,8 +98,8 @@ public class SignatureWhitespaceTest extends AbstractBusClientServerTestBase { URL busFile = SignatureWhitespaceTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SignatureWhitespaceTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -120,8 +121,8 @@ public class SignatureWhitespaceTest extends AbstractBusClientServerTestBase { URL busFile = SignatureWhitespaceTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SignatureWhitespaceTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -161,8 +162,8 @@ public class SignatureWhitespaceTest extends AbstractBusClientServerTestBase { URL busFile = SignatureWhitespaceTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SignatureWhitespaceTest.class.getResource("DoubleItAction.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/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 2d99d88..646f364 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 @@ -25,6 +25,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.ws.common.SecurityTestUtil; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; @@ -67,8 +68,8 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase { URL busFile = AlgorithmSuiteTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = AlgorithmSuiteTest.class.getResource("DoubleItAlgSuite.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -148,8 +149,8 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase { URL busFile = AlgorithmSuiteTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = AlgorithmSuiteTest.class.getResource("DoubleItAlgSuite.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -177,8 +178,8 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase { URL busFile = AlgorithmSuiteTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = AlgorithmSuiteTest.class.getResource("DoubleItAlgSuite.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -227,8 +228,8 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase { URL busFile = AlgorithmSuiteTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = AlgorithmSuiteTest.class.getResource("DoubleItAlgSuite.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -265,8 +266,8 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase { URL busFile = AlgorithmSuiteTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = AlgorithmSuiteTest.class.getResource("DoubleItAlgSuite.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -321,8 +322,8 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase { URL busFile = AlgorithmSuiteTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = AlgorithmSuiteTest.class.getResource("DoubleItAlgSuite.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java index 3a5335f..817bc04 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java @@ -25,6 +25,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.ws.common.SecurityTestUtil; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; @@ -67,8 +68,8 @@ public class StaxAlgorithmSuiteTest extends AbstractBusClientServerTestBase { URL busFile = StaxAlgorithmSuiteTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = StaxAlgorithmSuiteTest.class.getResource("DoubleItAlgSuite.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java index 22850fb..f0cfe38 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java @@ -25,6 +25,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.ws.common.SecurityTestUtil; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; @@ -65,8 +66,8 @@ public class BasicAuthTest extends AbstractBusClientServerTestBase { URL busFile = BasicAuthTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BasicAuthTest.class.getResource("DoubleItBasicAuth.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -88,8 +89,8 @@ public class BasicAuthTest extends AbstractBusClientServerTestBase { URL busFile = BasicAuthTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BasicAuthTest.class.getResource("DoubleItBasicAuth.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java index 6ed720c..83f574d 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java @@ -27,6 +27,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.ws.common.SecurityTestUtil; import org.apache.cxf.systest.ws.common.TestParam; @@ -93,8 +94,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = BindingPropertiesTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -138,8 +139,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = BindingPropertiesTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -184,8 +185,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = BindingPropertiesTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -230,8 +231,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = BindingPropertiesTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -276,8 +277,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = BindingPropertiesTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -323,8 +324,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = BindingPropertiesTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -374,8 +375,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = BindingPropertiesTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -425,8 +426,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = BindingPropertiesTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -476,8 +477,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = BindingPropertiesTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -528,8 +529,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = BindingPropertiesTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -572,8 +573,8 @@ public class BindingPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = BindingPropertiesTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BindingPropertiesTest.class.getResource("DoubleItBindings.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java index e77b85c..d4ad6e1 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java @@ -28,6 +28,7 @@ import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; @@ -88,8 +89,8 @@ public class CachingTest extends AbstractBusClientServerTestBase { URL busFile = CachingTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CachingTest.class.getResource("DoubleItCache.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -152,8 +153,8 @@ public class CachingTest extends AbstractBusClientServerTestBase { URL busFile = CachingTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CachingTest.class.getResource("DoubleItCache.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java index dd138fa..5fbc699 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java @@ -29,6 +29,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.ws.common.SecurityTestUtil; import org.apache.cxf.systest.ws.common.TestParam; @@ -102,8 +103,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -147,8 +148,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -195,8 +196,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -244,8 +245,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -289,8 +290,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -337,8 +338,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -390,8 +391,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -437,8 +438,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -490,8 +491,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -566,8 +567,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -617,8 +618,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -653,8 +654,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -690,8 +691,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -739,8 +740,8 @@ public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { URL busFile = CryptoCoverageCheckerTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = CryptoCoverageCheckerTest.class.getResource("DoubleItCoverageChecker.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java index 7fc8353..9265290 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java @@ -76,8 +76,8 @@ public class FaultTest extends AbstractBusClientServerTestBase { URL busFile = FaultTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = FaultTest.class.getResource("DoubleItFault.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -109,8 +109,8 @@ public class FaultTest extends AbstractBusClientServerTestBase { URL busFile = FaultTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = FaultTest.class.getResource("DoubleItFault.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -142,8 +142,8 @@ public class FaultTest extends AbstractBusClientServerTestBase { URL busFile = FaultTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = FaultTest.class.getResource("DoubleItFault.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -232,8 +232,8 @@ public class FaultTest extends AbstractBusClientServerTestBase { URL busFile = FaultTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = FaultTest.class.getResource("DoubleItFault.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -268,8 +268,8 @@ public class FaultTest extends AbstractBusClientServerTestBase { URL busFile = FaultTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = FaultTest.class.getResource("DoubleItFault.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java index 2e6e257..6423e8a 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java @@ -31,6 +31,7 @@ import javax.xml.ws.soap.SOAPFaultException; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; @@ -84,8 +85,8 @@ public class ModifiedRequestTest extends AbstractBusClientServerTestBase { URL busFile = ModifiedRequestTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ModifiedRequestTest.class.getResource("DoubleItFault.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -126,8 +127,8 @@ public class ModifiedRequestTest extends AbstractBusClientServerTestBase { URL busFile = ModifiedRequestTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ModifiedRequestTest.class.getResource("DoubleItFault.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -168,8 +169,8 @@ public class ModifiedRequestTest extends AbstractBusClientServerTestBase { URL busFile = ModifiedRequestTest.class.getResource("client-untrusted.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ModifiedRequestTest.class.getResource("DoubleItFault.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -201,8 +202,8 @@ public class ModifiedRequestTest extends AbstractBusClientServerTestBase { URL busFile = ModifiedRequestTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ModifiedRequestTest.class.getResource("DoubleItFault.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -243,8 +244,8 @@ public class ModifiedRequestTest extends AbstractBusClientServerTestBase { URL busFile = ModifiedRequestTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = ModifiedRequestTest.class.getResource("DoubleItFault.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java index 4ffb032..caeff69 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java @@ -27,6 +27,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.ws.common.SecurityTestUtil; import org.apache.cxf.systest.ws.common.TestParam; @@ -120,8 +121,8 @@ public class GCMTest extends AbstractBusClientServerTestBase { URL busFile = GCMTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = GCMTest.class.getResource("DoubleItGCM.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -162,8 +163,8 @@ public class GCMTest extends AbstractBusClientServerTestBase { URL busFile = GCMTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = GCMTest.class.getResource("DoubleItGCM.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -205,8 +206,8 @@ public class GCMTest extends AbstractBusClientServerTestBase { URL busFile = GCMTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = GCMTest.class.getResource("DoubleItGCM.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -247,8 +248,8 @@ public class GCMTest extends AbstractBusClientServerTestBase { URL busFile = GCMTest.class.getResource("mgf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = GCMTest.class.getResource("DoubleItGCM.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -295,8 +296,8 @@ public class GCMTest extends AbstractBusClientServerTestBase { URL busFile = GCMTest.class.getResource("mgf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = GCMTest.class.getResource("DoubleItGCM.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java index 8417820..e1a9d04 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java @@ -30,6 +30,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.ext.xml.XMLSource; @@ -76,8 +77,8 @@ public class HTTPGetTest extends AbstractBusClientServerTestBase { URL busFile = HTTPGetTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = HTTPGetTest.class.getResource("DoubleItHTTPGet.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -101,8 +102,8 @@ public class HTTPGetTest extends AbstractBusClientServerTestBase { URL busFile = HTTPGetTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "http://localhost:"; + PORT + "/DoubleItX509KeyIdentifier/DoubleIt"; WebClient client = WebClient.create(address); @@ -128,8 +129,8 @@ public class HTTPGetTest extends AbstractBusClientServerTestBase { URL busFile = HTTPGetTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = HTTPGetTest.class.getResource("DoubleItHTTPGet.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -167,8 +168,8 @@ public class HTTPGetTest extends AbstractBusClientServerTestBase { URL busFile = HTTPGetTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "http://localhost:"; + PORT + "/DoubleItSignBody/DoubleIt"; WebClient client = WebClient.create(address); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java index e1a854a..93b7ca8 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java @@ -27,6 +27,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.ws.common.SecurityTestUtil; import org.apache.cxf.systest.ws.common.TestParam; @@ -92,8 +93,8 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase { URL busFile = HttpsTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = HttpsTokenTest.class.getResource("DoubleItHttps.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -138,8 +139,8 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase { URL busFile = HttpsTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = HttpsTokenTest.class.getResource("DoubleItHttps.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -182,8 +183,8 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase { URL busFile = HttpsTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = HttpsTokenTest.class.getResource("DoubleItHttps.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -228,8 +229,8 @@ public class HttpsTokenTest extends AbstractBusClientServerTestBase { URL busFile = HttpsTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = HttpsTokenTest.class.getResource("DoubleItHttps.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java index 455985e..9bd4077 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java @@ -29,6 +29,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.ws.common.SecurityTestUtil; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; @@ -70,8 +71,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase { URL busFile = MTOMSecurityTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -97,8 +98,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase { URL busFile = MTOMSecurityTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -125,8 +126,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase { URL busFile = MTOMSecurityTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -149,8 +150,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase { URL busFile = MTOMSecurityTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -173,8 +174,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase { URL busFile = MTOMSecurityTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -199,8 +200,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase { URL busFile = MTOMSecurityTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -225,8 +226,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase { URL busFile = MTOMSecurityTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -251,8 +252,8 @@ public class MTOMSecurityTest extends AbstractBusClientServerTestBase { URL busFile = MTOMSecurityTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = MTOMSecurityTest.class.getResource("DoubleItMtom.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java index 90838ab..8d0a4385 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java @@ -28,6 +28,7 @@ import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.ws.common.SecurityTestUtil; import org.apache.cxf.systest.ws.common.TestParam; @@ -96,8 +97,8 @@ public class PartsTest extends AbstractBusClientServerTestBase { URL busFile = PartsTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -131,8 +132,8 @@ public class PartsTest extends AbstractBusClientServerTestBase { URL busFile = PartsTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -176,8 +177,8 @@ public class PartsTest extends AbstractBusClientServerTestBase { URL busFile = PartsTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -222,8 +223,8 @@ public class PartsTest extends AbstractBusClientServerTestBase { URL busFile = PartsTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -286,8 +287,8 @@ public class PartsTest extends AbstractBusClientServerTestBase { URL busFile = PartsTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -332,8 +333,8 @@ public class PartsTest extends AbstractBusClientServerTestBase { URL busFile = PartsTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -396,8 +397,8 @@ public class PartsTest extends AbstractBusClientServerTestBase { URL busFile = PartsTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -446,8 +447,8 @@ public class PartsTest extends AbstractBusClientServerTestBase { URL busFile = PartsTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -492,8 +493,8 @@ public class PartsTest extends AbstractBusClientServerTestBase { URL busFile = PartsTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -538,8 +539,8 @@ public class PartsTest extends AbstractBusClientServerTestBase { URL busFile = PartsTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -587,8 +588,8 @@ public class PartsTest extends AbstractBusClientServerTestBase { URL busFile = PartsTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PartsTest.class.getResource("DoubleItParts.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java index f0e2db3..a41dc8e 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java @@ -27,6 +27,7 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.ws.common.SecurityTestUtil; import org.apache.cxf.systest.ws.common.TestParam; @@ -89,8 +90,8 @@ public class PolicyAlternativeTest extends AbstractBusClientServerTestBase { URL busFile = PolicyAlternativeTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -119,8 +120,8 @@ public class PolicyAlternativeTest extends AbstractBusClientServerTestBase { URL busFile = PolicyAlternativeTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -154,8 +155,8 @@ public class PolicyAlternativeTest extends AbstractBusClientServerTestBase { URL busFile = PolicyAlternativeTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -185,8 +186,8 @@ public class PolicyAlternativeTest extends AbstractBusClientServerTestBase { URL busFile = PolicyAlternativeTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -223,8 +224,8 @@ public class PolicyAlternativeTest extends AbstractBusClientServerTestBase { URL busFile = PolicyAlternativeTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -260,8 +261,8 @@ public class PolicyAlternativeTest extends AbstractBusClientServerTestBase { URL busFile = PolicyAlternativeTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = PolicyAlternativeTest.class.getResource("DoubleItPolicy.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java index 3c11d58..1a2aa96 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/UriDomainFactoryBeanListener.java @@ -36,7 +36,7 @@ public class UriDomainFactoryBeanListener implements FactoryBeanListener { ExtensionManagerImpl orig = (ExtensionManagerImpl)factory.getBus().getExtension(ExtensionManager.class); List<String> names = new ArrayList<>(); names.add(org.apache.cxf.ws.policy.attachment.external.URIDomainExpressionBuilder.class.getName()); - ((ExtensionManagerImpl)orig).removeBeansOfNames(names); + orig.removeBeansOfNames(names); } } } http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java index 614b1da..a5e732b 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java @@ -31,6 +31,7 @@ import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; @@ -112,8 +113,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -182,8 +183,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -221,8 +222,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -270,8 +271,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -312,8 +313,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -366,8 +367,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -403,8 +404,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -469,8 +470,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -504,8 +505,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -539,8 +540,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -572,8 +573,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -607,8 +608,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -645,8 +646,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -684,8 +685,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -722,8 +723,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -753,8 +754,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -788,8 +789,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -821,8 +822,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -859,8 +860,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -899,8 +900,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -947,8 +948,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1012,8 +1013,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1067,8 +1068,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1106,8 +1107,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1171,8 +1172,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase { URL busFile = SamlTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME);
