http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java index 642258c..6dd611d 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecurityContextTokenUnitTest.java @@ -25,6 +25,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.common.TestParam; @@ -87,8 +88,8 @@ public class SecurityContextTokenUnitTest extends AbstractBusClientServerTestBas URL busFile = SecurityContextTokenUnitTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String wsdlLocation = "https://localhost:"; + test.getStsPort() + "/SecurityTokenService/TransportSCT?wsdl"; @@ -105,8 +106,8 @@ public class SecurityContextTokenUnitTest extends AbstractBusClientServerTestBas URL busFile = SecurityContextTokenUnitTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String wsdlLocation = "https://localhost:"; + test.getStsPort() + "/SecurityTokenService/TransportSCT?wsdl"; @@ -123,8 +124,8 @@ public class SecurityContextTokenUnitTest extends AbstractBusClientServerTestBas URL busFile = SecurityContextTokenUnitTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String wsdlLocation = "https://localhost:"; + test.getStsPort() + "/SecurityTokenService/TransportSCTEncrypted?wsdl"; @@ -141,8 +142,8 @@ public class SecurityContextTokenUnitTest extends AbstractBusClientServerTestBas URL busFile = SecurityContextTokenUnitTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String wsdlLocation = "https://localhost:"; + test.getStsPort() + "/SecurityTokenService/TransportSCTEncrypted?wsdl";
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java index aeee6c2..0677e66 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/soap12/Soap12Test.java @@ -30,6 +30,7 @@ import javax.xml.ws.Service; import org.w3c.dom.Element; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.sts.common.SecurityTestUtil; @@ -131,8 +132,8 @@ public class Soap12Test extends AbstractBusClientServerTestBase { URL busFile = Soap12Test.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = Soap12Test.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -163,8 +164,8 @@ public class Soap12Test extends AbstractBusClientServerTestBase { URL busFile = Soap12Test.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); try { String badAddress = http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java index c5cbd74..0dc54d5 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSSenderVouchesTest.java @@ -27,6 +27,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.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.common.TestParam; @@ -100,8 +101,8 @@ public class STSSenderVouchesTest extends AbstractBusClientServerTestBase { URL busFile = STSSenderVouchesTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = STSSenderVouchesTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java index 8b52b56..38c7827 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/transformation/TransformationTest.java @@ -24,6 +24,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.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.deployment.STSServer; @@ -79,8 +80,8 @@ public class TransformationTest extends AbstractBusClientServerTestBase { URL busFile = TransformationTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TransformationTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -102,8 +103,8 @@ public class TransformationTest extends AbstractBusClientServerTestBase { URL busFile = TransformationTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TransformationTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java index aa8294c..f1707f3 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/usernametoken/UsernameTokenTest.java @@ -26,6 +26,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.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.common.TestParam; @@ -113,8 +114,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -140,8 +141,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("cxf-bad-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -176,8 +177,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -207,8 +208,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("cxf-bad-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java index a89c15b..397fe57 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.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.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.common.TestParam; @@ -128,8 +129,8 @@ public class AsymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = AsymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = AsymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -157,8 +158,8 @@ public class AsymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = AsymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = AsymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -187,8 +188,8 @@ public class AsymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = AsymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = AsymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -217,8 +218,8 @@ public class AsymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = AsymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = AsymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java index b3de3ea..9b127a8 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java @@ -27,6 +27,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.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.common.TestParam; @@ -113,8 +114,8 @@ public class BearerTest extends AbstractBusClientServerTestBase { URL busFile = BearerTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BearerTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -142,8 +143,8 @@ public class BearerTest extends AbstractBusClientServerTestBase { URL busFile = BearerTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BearerTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java index cdc3a2e..3797bf2 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java @@ -27,6 +27,7 @@ import javax.security.auth.callback.CallbackHandler; import org.w3c.dom.Element; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.jaxws.context.WrappedMessageContext; import org.apache.cxf.message.MessageImpl; @@ -92,8 +93,8 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase { URL busFile = SAMLDelegationTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); // Get a token from the UT endpoint first SecurityToken token = @@ -129,8 +130,8 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase { URL busFile = SAMLDelegationTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); // Get a token from the UT endpoint first SecurityToken token = @@ -166,8 +167,8 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase { URL busFile = SAMLDelegationTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties()); CallbackHandler callbackHandler = new CommonCallbackHandler(); @@ -202,8 +203,8 @@ public class SAMLDelegationTest extends AbstractBusClientServerTestBase { URL busFile = SAMLDelegationTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); // Create SAML token Element samlToken = http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java index b42f3f7..b103512 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java @@ -26,6 +26,7 @@ import javax.xml.ws.Service; import javax.xml.ws.soap.SOAPFaultException; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.common.TokenTestUtils; @@ -87,8 +88,8 @@ public class IntermediaryTransformationCachingTest extends AbstractBusClientServ URL busFile = IntermediaryTransformationCachingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = IntermediaryTransformationCachingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java index 9e393b4..40cc753 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java @@ -25,6 +25,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.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.common.TokenTestUtils; @@ -86,8 +87,8 @@ public class IntermediaryTransformationTest extends AbstractBusClientServerTestB URL busFile = IntermediaryTransformationTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = IntermediaryTransformationTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -112,8 +113,8 @@ public class IntermediaryTransformationTest extends AbstractBusClientServerTestB URL busFile = IntermediaryTransformationTest.class.getResource("cxf-bad-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = IntermediaryTransformationTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java index 0f9efeb..3cdf8d5 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java @@ -26,6 +26,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.sts.common.SecurityTestUtil; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; @@ -90,8 +91,8 @@ public class IssuerTest extends AbstractBusClientServerTestBase { URL busFile = IssuerTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = IssuerTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -118,8 +119,8 @@ public class IssuerTest extends AbstractBusClientServerTestBase { URL busFile = IssuerTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = IssuerTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -146,8 +147,8 @@ public class IssuerTest extends AbstractBusClientServerTestBase { URL busFile = IssuerTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = IssuerTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java index 630bb43..c19396f 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java @@ -30,6 +30,7 @@ import javax.xml.namespace.QName; import org.w3c.dom.Element; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.binding.soap.SoapBindingConstants; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.helpers.DOMUtils; @@ -112,8 +113,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { URL busFile = IssueUnitTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); // Get Metadata JaxWsProxyFactoryBean proxyFac = new JaxWsProxyFactoryBean(); @@ -143,8 +144,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { URL busFile = IssueUnitTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); // Get a token SecurityToken token = @@ -184,8 +185,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { URL busFile = IssueUnitTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); // Get a token SecurityToken token = @@ -224,8 +225,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { URL busFile = IssueUnitTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); // Get a token SecurityToken token = @@ -261,8 +262,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { URL busFile = IssueUnitTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); // Get a token SecurityToken token = @@ -300,8 +301,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { URL busFile = IssueUnitTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); try { requestSecurityToken(SAML1_TOKEN_TYPE, BEARER_KEYTYPE, bus, null); @@ -322,8 +323,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { URL busFile = IssueUnitTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); // Get a token String context = "AuthenticationContext"; @@ -360,8 +361,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { URL busFile = IssueUnitTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); // Get a token SecurityToken token = @@ -394,8 +395,8 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { URL busFile = IssueUnitTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties()); CallbackHandler callbackHandler = new CommonCallbackHandler(); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java index 04562b7..d274219 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java @@ -26,6 +26,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.jaxrs.client.WebClient; import org.apache.cxf.systest.sts.common.SecurityTestUtil; @@ -87,8 +88,8 @@ public class JAASTest extends AbstractBusClientServerTestBase { URL busFile = JAASTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -118,8 +119,8 @@ public class JAASTest extends AbstractBusClientServerTestBase { URL busFile = JAASTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -149,8 +150,8 @@ public class JAASTest extends AbstractBusClientServerTestBase { URL busFile = JAASTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -182,8 +183,8 @@ public class JAASTest extends AbstractBusClientServerTestBase { URL busFile = JAASTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -215,8 +216,8 @@ public class JAASTest extends AbstractBusClientServerTestBase { URL busFile = JAASTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -246,8 +247,8 @@ public class JAASTest extends AbstractBusClientServerTestBase { URL busFile = JAASTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -279,8 +280,8 @@ public class JAASTest extends AbstractBusClientServerTestBase { URL busFile = JAASTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -315,8 +316,8 @@ public class JAASTest extends AbstractBusClientServerTestBase { URL busFile = JAASTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = JAASTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java index b7d3177..59ad1a9 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/rest/STSRESTTest.java @@ -40,6 +40,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.common.util.Base64Utility; import org.apache.cxf.common.util.CompressionUtils; @@ -116,8 +117,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -148,8 +149,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -180,8 +181,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -222,8 +223,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -264,8 +265,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -306,8 +307,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -348,8 +349,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -388,8 +389,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -428,8 +429,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -461,8 +462,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -488,8 +489,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -550,8 +551,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -575,8 +576,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -615,8 +616,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -656,8 +657,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -697,8 +698,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -768,8 +769,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -837,8 +838,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -874,8 +875,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -896,8 +897,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -919,8 +920,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -962,8 +963,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -1008,8 +1009,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -1087,8 +1088,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -1162,8 +1163,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -1185,8 +1186,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -1203,8 +1204,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -1224,8 +1225,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); @@ -1245,8 +1246,8 @@ public class STSRESTTest extends AbstractBusClientServerTestBase { URL busFile = STSRESTTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); String address = "https://localhost:"; + STSPORT + "/SecurityTokenService/token"; WebClient client = WebClient.create(address, busFile.toString()); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java index 5dfc6b7..40a43da 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/SenderVouchesTest.java @@ -26,6 +26,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.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.common.TestParam; @@ -109,8 +110,8 @@ public class SenderVouchesTest extends AbstractBusClientServerTestBase { URL busFile = SenderVouchesTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SenderVouchesTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java index facfbc4..92d4c14 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java @@ -24,6 +24,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.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.deployment.STSServer; @@ -70,8 +71,8 @@ public class STSClientTest extends AbstractBusClientServerTestBase { URL busFile = STSClientTest.class.getResource("cxf-client-name.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = STSClientTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -93,8 +94,8 @@ public class STSClientTest extends AbstractBusClientServerTestBase { URL busFile = STSClientTest.class.getResource("cxf-default-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = STSClientTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java index 44e136d..f7bc2d4 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java @@ -38,6 +38,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; 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; @@ -139,8 +140,8 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = SymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -169,8 +170,8 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = SymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -198,8 +199,8 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = SymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -227,8 +228,8 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = SymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -256,8 +257,8 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = SymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -297,8 +298,8 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = SymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java index b8dd073..50ed170 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java @@ -29,6 +29,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.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.common.TestParam; @@ -104,8 +105,8 @@ public class TemplateTest extends AbstractBusClientServerTestBase { URL busFile = TemplateTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TemplateTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -140,8 +141,8 @@ public class TemplateTest extends AbstractBusClientServerTestBase { URL busFile = TemplateTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TemplateTest.class.getResource("DoubleItNoTemplate.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -183,8 +184,8 @@ public class TemplateTest extends AbstractBusClientServerTestBase { URL busFile = TemplateTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TemplateTest.class.getResource("DoubleItNoTemplate2.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -227,8 +228,8 @@ public class TemplateTest extends AbstractBusClientServerTestBase { URL busFile = TemplateTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TemplateTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -263,8 +264,8 @@ public class TemplateTest extends AbstractBusClientServerTestBase { URL busFile = TemplateTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TemplateTest.class.getResource("DoubleItNoTemplate.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -306,8 +307,8 @@ public class TemplateTest extends AbstractBusClientServerTestBase { URL busFile = TemplateTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TemplateTest.class.getResource("DoubleItNoTemplate2.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java ---------------------------------------------------------------------- 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 fe42d38..7e0110b 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 @@ -37,6 +37,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; 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; @@ -129,8 +130,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase { URL busFile = TransportBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -158,8 +159,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase { URL busFile = TransportBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -193,8 +194,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase { URL busFile = TransportBindingTest.class.getResource("cxf-bad-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -227,8 +228,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase { URL busFile = TransportBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -261,8 +262,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase { URL busFile = TransportBindingTest.class.getResource("cxf-bad-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -300,8 +301,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase { URL busFile = TransportBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -347,8 +348,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase { URL busFile = TransportBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -395,8 +396,8 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase { URL busFile = TransportBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = TransportBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java index cc496d7..5fd6ad6 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java @@ -26,6 +26,7 @@ import javax.xml.ws.Service; import org.apache.cxf.Bus; import org.apache.cxf.BusException; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.endpoint.EndpointException; import org.apache.cxf.systest.sts.common.SecurityTestUtil; @@ -86,8 +87,8 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase { URL busFile = UsernameActAsCachingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameActAsCachingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -172,8 +173,8 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase { URL busFile = UsernameActAsCachingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameActAsCachingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -262,8 +263,8 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase { URL busFile = UsernameActAsCachingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameActAsCachingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -353,8 +354,8 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase { URL busFile = UsernameActAsCachingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameActAsCachingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java index 6caf9b4..d24b394 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java @@ -27,6 +27,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.rt.security.SecurityConstants; import org.apache.cxf.systest.sts.common.SecurityTestUtil; @@ -107,8 +108,8 @@ public class UsernameActAsTest extends AbstractBusClientServerTestBase { URL busFile = UsernameActAsTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameActAsTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java index 583dbe7..d520dc7 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java @@ -26,6 +26,7 @@ import javax.xml.ws.Service; import org.apache.cxf.Bus; import org.apache.cxf.BusException; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.endpoint.EndpointException; import org.apache.cxf.systest.sts.common.SecurityTestUtil; @@ -85,8 +86,8 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa URL busFile = UsernameOnBehalfOfCachingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameOnBehalfOfCachingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -172,8 +173,8 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa URL busFile = UsernameOnBehalfOfCachingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameOnBehalfOfCachingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -262,8 +263,8 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa URL busFile = UsernameOnBehalfOfCachingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameOnBehalfOfCachingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -353,8 +354,8 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa URL busFile = UsernameOnBehalfOfCachingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameOnBehalfOfCachingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java index d7874e4..3be8271 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java @@ -27,6 +27,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.rt.security.SecurityConstants; import org.apache.cxf.systest.sts.common.SecurityTestUtil; @@ -106,8 +107,8 @@ public class UsernameOnBehalfOfTest extends AbstractBusClientServerTestBase { URL busFile = UsernameOnBehalfOfTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameOnBehalfOfTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java index 8bc26ad..2911967 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java @@ -25,6 +25,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.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.common.TokenTestUtils; @@ -75,8 +76,8 @@ public class X509AsymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = X509AsymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509AsymmetricBindingTest.class.getResource("DoubleItAsymmetric.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java index 93df546..ea8f52d 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java @@ -27,6 +27,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.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.common.TestParam; @@ -115,8 +116,8 @@ public class X509SymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = X509SymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509SymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -144,8 +145,8 @@ public class X509SymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = X509SymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509SymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -174,8 +175,8 @@ public class X509SymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = X509SymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509SymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -206,8 +207,8 @@ public class X509SymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = X509SymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509SymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -242,8 +243,8 @@ public class X509SymmetricBindingTest extends AbstractBusClientServerTestBase { URL busFile = X509SymmetricBindingTest.class.getResource("cxf-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509SymmetricBindingTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME);
