http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java index cbf5219..613a3b2 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.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.rt.security.SecurityConstants; import org.apache.cxf.systest.ws.common.SecurityTestUtil; @@ -99,8 +100,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { URL busFile = SamlSubjectConfTest.class.getResource("client-auth.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -153,8 +154,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { URL busFile = SamlSubjectConfTest.class.getResource("client-auth.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -187,8 +188,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { URL busFile = SamlSubjectConfTest.class.getResource("client-noauth.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -230,8 +231,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { URL busFile = SamlSubjectConfTest.class.getResource("client-auth.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -261,8 +262,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { URL busFile = SamlSubjectConfTest.class.getResource("client-noauth.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -300,8 +301,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { URL busFile = SamlSubjectConfTest.class.getResource("client-auth.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -335,8 +336,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { URL busFile = SamlSubjectConfTest.class.getResource("client-auth.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -371,8 +372,8 @@ public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { URL busFile = SamlSubjectConfTest.class.getResource("client-auth.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SamlSubjectConfTest.class.getResource("DoubleItSamlSubjectConf.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/security/SecurityPolicyTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java index b5ea117..be25805 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java @@ -227,8 +227,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase { URL busFile = SecurityPolicyTest.class.getResource("https_config_client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -351,8 +351,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase { SpringBusFactory bf = new SpringBusFactory(); Bus bus = bf.createBus(); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -412,8 +412,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase { SpringBusFactory bf = new SpringBusFactory(); Bus bus = bf.createBus(); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -506,8 +506,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase { SpringBusFactory bf = new SpringBusFactory(); Bus bus = bf.createBus(); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -541,8 +541,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase { SpringBusFactory bf = new SpringBusFactory(); Bus bus = bf.createBus(); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -576,8 +576,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase { SpringBusFactory bf = new SpringBusFactory(); Bus bus = bf.createBus(); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -608,8 +608,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase { SpringBusFactory bf = new SpringBusFactory(); Bus bus = bf.createBus(); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -661,8 +661,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase { SpringBusFactory bf = new SpringBusFactory(); Bus bus = bf.createBus(); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); Service service = Service.create(wsdl, SERVICE_QNAME); QName portQName = new QName(NAMESPACE, "DoubleItPortCXF4122"); @@ -706,8 +706,8 @@ public class SecurityPolicyTest extends AbstractBusClientServerTestBase { URL busFile = SecurityPolicyTest.class.getResource("https_config_client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SecurityPolicyTest.class.getResource("DoubleIt.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/swa/SWAActionTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java index 47a762d..e34332f 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.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; @@ -64,8 +65,8 @@ public class SWAActionTest extends AbstractBusClientServerTestBase { URL busFile = SWAActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SWAActionTest.class.getResource("DoubleItSwa.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -89,8 +90,8 @@ public class SWAActionTest extends AbstractBusClientServerTestBase { URL busFile = SWAActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SWAActionTest.class.getResource("DoubleItSwa.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -114,8 +115,8 @@ public class SWAActionTest extends AbstractBusClientServerTestBase { URL busFile = SWAActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SWAActionTest.class.getResource("DoubleItSwa.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -139,8 +140,8 @@ public class SWAActionTest extends AbstractBusClientServerTestBase { URL busFile = SWAActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SWAActionTest.class.getResource("DoubleItSwa.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -164,8 +165,8 @@ public class SWAActionTest extends AbstractBusClientServerTestBase { URL busFile = SWAActionTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SWAActionTest.class.getResource("DoubleItSwa.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/swa/SWAPolicyTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java index 9be49b5..f998c59 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.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; @@ -95,8 +96,8 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase { URL busFile = SWAPolicyTest.class.getResource("policy-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -124,8 +125,8 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase { URL busFile = SWAPolicyTest.class.getResource("policy-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -153,8 +154,8 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase { URL busFile = SWAPolicyTest.class.getResource("policy-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -182,8 +183,8 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase { URL busFile = SWAPolicyTest.class.getResource("policy-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -211,8 +212,8 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase { URL busFile = SWAPolicyTest.class.getResource("policy-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -240,8 +241,8 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase { URL busFile = SWAPolicyTest.class.getResource("policy-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -269,8 +270,8 @@ public class SWAPolicyTest extends AbstractBusClientServerTestBase { URL busFile = SWAPolicyTest.class.getResource("policy-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SWAPolicyTest.class.getResource("DoubleItSwa.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/tokens/BinarySecurityTokenTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java index f7515a1..f0a01cf 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/BinarySecurityTokenTest.java @@ -28,6 +28,7 @@ import javax.xml.ws.Service; import org.w3c.dom.Document; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.systest.ws.common.SecurityTestUtil; @@ -71,8 +72,8 @@ public class BinarySecurityTokenTest extends AbstractBusClientServerTestBase { URL busFile = BinarySecurityTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = BinarySecurityTokenTest.class.getResource("DoubleItTokens.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/tokens/EndorsingSupportingTokenTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java index 6024c1e..861d87e 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/EndorsingSupportingTokenTest.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; @@ -91,8 +92,8 @@ public class EndorsingSupportingTokenTest extends AbstractBusClientServerTestBas URL busFile = EndorsingSupportingTokenTest.class.getResource("endorsing-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = EndorsingSupportingTokenTest.class.getResource("DoubleItTokens.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -145,8 +146,8 @@ public class EndorsingSupportingTokenTest extends AbstractBusClientServerTestBas URL busFile = EndorsingSupportingTokenTest.class.getResource("endorsing-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = EndorsingSupportingTokenTest.class.getResource("DoubleItTokens.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/tokens/SupportingTokenTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java index 974a9b4..267155f 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.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; @@ -107,8 +108,8 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase { URL busFile = SupportingTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SupportingTokenTest.class.getResource("DoubleItTokens.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -171,8 +172,8 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase { URL busFile = SupportingTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SupportingTokenTest.class.getResource("DoubleItTokens.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -235,8 +236,8 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase { URL busFile = SupportingTokenTest.class.getResource("tls-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SupportingTokenTest.class.getResource("DoubleItTokens.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -291,8 +292,8 @@ public class SupportingTokenTest extends AbstractBusClientServerTestBase { URL busFile = SupportingTokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = SupportingTokenTest.class.getResource("DoubleItTokens.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/ut/UsernameTokenDerivedTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java index a278839..0106e96 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenDerivedTest.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; @@ -71,8 +72,8 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenDerivedTest.class.getResource("DoubleItUtDerived.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -98,8 +99,8 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenDerivedTest.class.getResource("DoubleItUtDerived.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -125,8 +126,8 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenDerivedTest.class.getResource("DoubleItUtDerived.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -152,8 +153,8 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenDerivedTest.class.getResource("DoubleItUtDerived.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -179,8 +180,8 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenDerivedTest.class.getResource("DoubleItUtDerived.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -206,8 +207,8 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenDerivedTest.class.getResource("DoubleItUtDerived.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -233,8 +234,8 @@ public class UsernameTokenDerivedTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenDerivedTest.class.getResource("client-derived.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenDerivedTest.class.getResource("DoubleItUtDerived.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/ut/UsernameTokenPolicyTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java index 66aec03..ad7b124 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.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 UsernameTokenPolicyTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenPolicyTest.class.getResource("DoubleItUtPolicy.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -137,8 +138,8 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenPolicyTest.class.getResource("DoubleItUtPolicy.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -198,8 +199,8 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenPolicyTest.class.getResource("DoubleItUtPolicy.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -259,8 +260,8 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenPolicyTest.class.getResource("DoubleItUtPolicy.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -304,8 +305,8 @@ public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenPolicyTest.class.getResource("policy-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = UsernameTokenPolicyTest.class.getResource("DoubleItUtPolicy.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/ut/UsernameTokenTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java index 47b58e6..0bd4f55 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.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; @@ -97,8 +98,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("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("DoubleItUt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -124,8 +125,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("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("DoubleItUt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -151,8 +152,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("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("DoubleItUt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -178,8 +179,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("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("DoubleItUt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -205,8 +206,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("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("DoubleItUt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -232,8 +233,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("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("DoubleItUt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -259,8 +260,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("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("DoubleItUt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -286,8 +287,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("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("DoubleItUt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -313,8 +314,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("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("DoubleItUt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -340,8 +341,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("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("DoubleItUt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -374,8 +375,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("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("DoubleItUt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -414,8 +415,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("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("DoubleItUt.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -452,8 +453,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase { URL busFile = UsernameTokenTest.class.getResource("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("DoubleItUt.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/wssc/WSSCUnitTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java index fe6afde..317d628 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java @@ -35,6 +35,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.rt.security.SecurityConstants; import org.apache.cxf.systest.ws.common.SecurityTestUtil; @@ -110,8 +111,8 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase { URL busFile = WSSCUnitTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = WSSCUnitTest.class.getResource("DoubleItWSSC.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -136,8 +137,8 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase { URL busFile = WSSCUnitTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = WSSCUnitTest.class.getResource("DoubleItWSSC.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -166,8 +167,8 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase { URL busFile = WSSCUnitTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); STSClient stsClient = new STSClient(bus); stsClient.setSecureConv(true); @@ -197,8 +198,8 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase { URL busFile = WSSCUnitTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); STSClient stsClient = new STSClient(bus); stsClient.setSecureConv(true); @@ -232,8 +233,8 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase { URL busFile = WSSCUnitTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); STSClient stsClient = new STSClient(bus); stsClient.setSecureConv(true); http://git-wip-us.apache.org/repos/asf/cxf/blob/ed5dfc98/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java index f050d3b..099fb5f 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java @@ -30,6 +30,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; @@ -115,8 +116,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -151,8 +152,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -178,8 +179,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -205,8 +206,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -232,8 +233,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -259,8 +260,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("jaxws-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -290,8 +291,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -323,8 +324,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("intermediary-client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItIntermediary.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -346,8 +347,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -373,8 +374,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -400,8 +401,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -425,8 +426,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -450,8 +451,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -477,8 +478,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -502,8 +503,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -529,8 +530,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -556,8 +557,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -584,8 +585,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -611,8 +612,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -642,8 +643,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -669,8 +670,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -696,8 +697,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -723,8 +724,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -750,8 +751,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -777,8 +778,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -804,8 +805,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -831,8 +832,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -858,8 +859,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -885,8 +886,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -914,8 +915,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -941,8 +942,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -971,8 +972,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1002,8 +1003,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1033,8 +1034,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1064,8 +1065,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1095,8 +1096,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1126,8 +1127,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509Signature.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1153,8 +1154,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509Signature.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1180,8 +1181,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509Signature.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1207,8 +1208,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509Signature.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1237,8 +1238,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509Signature.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1272,8 +1273,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1303,8 +1304,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1352,8 +1353,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1387,8 +1388,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItOperations.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1424,8 +1425,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1474,8 +1475,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1524,8 +1525,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509Signature.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1551,8 +1552,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -1578,8 +1579,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase { URL busFile = X509TokenTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = X509TokenTest.class.getResource("DoubleItX509Addressing.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/xkms/XKMSTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java index da55848..2bfe572 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.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; @@ -101,8 +102,8 @@ public class XKMSTest extends AbstractBusClientServerTestBase { URL busFile = XKMSTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = XKMSTest.class.getResource("DoubleItXKMS.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME); @@ -131,8 +132,8 @@ public class XKMSTest extends AbstractBusClientServerTestBase { URL busFile = XKMSTest.class.getResource("client.xml"); Bus bus = bf.createBus(busFile.toString()); - SpringBusFactory.setDefaultBus(bus); - SpringBusFactory.setThreadDefaultBus(bus); + BusFactory.setDefaultBus(bus); + BusFactory.setThreadDefaultBus(bus); URL wsdl = XKMSTest.class.getResource("DoubleItXKMS.wsdl"); Service service = Service.create(wsdl, SERVICE_QNAME);
