Author: asoldano Date: 2013-10-03 13:24:54 -0400 (Thu, 03 Oct 2013) New Revision: 17977 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/Helper.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java Log: [JBWS-3713] Using new feature in a bunch of tests to force THREAD_BUS strategy Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java 2013-10-03 17:23:35 UTC (rev 17976) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase.java 2013-10-03 17:24:54 UTC (rev 17977) @@ -34,6 +34,7 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.interceptor.LoggingInInterceptor; import org.apache.cxf.interceptor.LoggingOutInterceptor; +import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -62,7 +63,7 @@ URL wsdlURL = new URL(endpointURl + "?wsdl"); QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/fastinfoset", "HelloWorldService"); - Service service = Service.create(wsdlURL, serviceName); + Service service = Service.create(wsdlURL, serviceName, new UseThreadBusFeature()); QName portQName = new QName("http://org.jboss.ws/jaxws/cxf/fastinfoset", "HelloWorldImplPort"); HelloWorld port = (HelloWorld) service.getPort(portQName, HelloWorld.class); assertEquals("helloworld", port.echo("helloworld")); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java 2013-10-03 17:23:35 UTC (rev 17976) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/gzip/Helper.java 2013-10-03 17:24:54 UTC (rev 17977) @@ -35,6 +35,7 @@ import org.apache.cxf.transport.common.gzip.GZIPOutInterceptor; import org.apache.cxf.transport.http.HTTPConduit; import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; +import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; import org.jboss.wsf.test.ClientHelper; public class Helper implements ClientHelper @@ -167,7 +168,7 @@ { URL wsdlURL = new URL(gzipFeatureEndpointURL + "?wsdl"); QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/gzip", "HelloWorldService"); - Service service = Service.create(wsdlURL, serviceName); + Service service = Service.create(wsdlURL, serviceName, new UseThreadBusFeature()); QName portQName = new QName("http://org.jboss.ws/jaxws/cxf/gzip", "HelloWorldImplPort"); return (HelloWorld) service.getPort(portQName, HelloWorld.class); } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/Helper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/Helper.java 2013-10-03 17:23:35 UTC (rev 17976) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jaxbintros/Helper.java 2013-10-03 17:24:54 UTC (rev 17977) @@ -32,6 +32,7 @@ import org.jboss.jaxb.intros.BindingCustomizationFactory; import org.jboss.ws.api.binding.BindingCustomization; import org.jboss.ws.api.binding.JAXBBindingCustomization; +import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSConfigurer; import org.jboss.wsf.test.ClientHelper; @@ -66,7 +67,7 @@ URL wsdlURL = new URL(endpointAddress + "?wsdl"); QName serviceName = new QName("http://org.jboss.ws/cxf/jaxbintros", "EndpointBeanService"); - Service service = Service.create(wsdlURL, serviceName); + Service service = Service.create(wsdlURL, serviceName, new UseThreadBusFeature()); Endpoint port = service.getPort(Endpoint.class); UserType user = new UserType(); QName qname = new QName("ns", "local", "prefix"); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2013-10-03 17:23:35 UTC (rev 17976) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase.java 2013-10-03 17:24:54 UTC (rev 17977) @@ -34,6 +34,7 @@ import org.apache.cxf.endpoint.ClientLifeCycleListener; import org.apache.cxf.endpoint.ClientLifeCycleManager; import org.apache.cxf.endpoint.ServerLifeCycleManager; +import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -80,7 +81,7 @@ try { URL wsdlOneURL = new URL(endpointOneURL + "?wsdl"); QName serviceOneName = new QName(targetNS, "ServiceOne"); - Service serviceOne = Service.create(wsdlOneURL, serviceOneName); + Service serviceOne = Service.create(wsdlOneURL, serviceOneName, new UseThreadBusFeature()); CustomClientLifeCycleListener listener = new CustomClientLifeCycleListener(); ClientLifeCycleManager mgr = bus.getExtension(ClientLifeCycleManager.class); try { Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2013-10-03 17:23:35 UTC (rev 17976) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3648/PolicyAttachmentTestCase.java 2013-10-03 17:24:54 UTC (rev 17977) @@ -35,6 +35,7 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.interceptor.LoggingInInterceptor; import org.apache.cxf.ws.security.SecurityConstants; +import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -61,7 +62,7 @@ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3648-b/ServiceThree" + "?wsdl"); QName serviceName = new QName("http://org.jboss.ws.jaxws.cxf/jbws3648", "ServiceThree"); - Service service = Service.create(wsdlURL, serviceName); + Service service = Service.create(wsdlURL, serviceName, new UseThreadBusFeature()); EndpointThree proxy = (EndpointThree)service.getPort(EndpointThree.class); setupWsse((BindingProvider)proxy); @@ -86,7 +87,7 @@ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3648-b/ServiceFour" + "?wsdl"); QName serviceName = new QName("http://org.jboss.ws.jaxws.cxf/jbws3648", "ServiceFour"); - Service service = Service.create(wsdlURL, serviceName); + Service service = Service.create(wsdlURL, serviceName, new UseThreadBusFeature()); EndpointFour proxy = (EndpointFour)service.getPort(EndpointFour.class); setupWsse((BindingProvider)proxy); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java 2013-10-03 17:23:35 UTC (rev 17976) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/MessageLoggingTestCase.java 2013-10-03 17:24:54 UTC (rev 17977) @@ -34,6 +34,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.interceptor.LoggingInInterceptor; +import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -93,7 +94,7 @@ bus.getInInterceptors().add(myLoggingInterceptor); BusFactory.setThreadDefaultBus(bus); - Service service = Service.create(wsdlURL, serviceName); + Service service = Service.create(wsdlURL, serviceName, new UseThreadBusFeature()); QName portQName = new QName("http://logging.cxf.jaxws.ws.test.jboss.org/";, "LoggingFeatureEndpointPort"); port = (LoggingEndpoint)service.getPort(portQName, LoggingEndpoint.class); String content = "foo"; Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java 2013-10-03 17:23:35 UTC (rev 17976) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/policy/PolicyInterceptorProviderTestCase.java 2013-10-03 17:24:54 UTC (rev 17977) @@ -32,6 +32,7 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.ws.policy.IgnorablePolicyInterceptorProvider; import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry; +import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; import org.jboss.wsf.test.JBossWSCXFTestSetup; import org.jboss.wsf.test.JBossWSTest; @@ -65,7 +66,7 @@ URL wsdlURL = new URL(endpointAddress + "?wsdl"); QName serviceName = new QName("http://policy.cxf.jaxws.ws.test.jboss.org/";, "PIPService"); - Service service = Service.create(wsdlURL, serviceName); + Service service = Service.create(wsdlURL, serviceName, new UseThreadBusFeature()); QName portQName = new QName("http://policy.cxf.jaxws.ws.test.jboss.org/";, "PIPEndpointPort"); PIPEndpoint port = (PIPEndpoint)service.getPort(portQName, PIPEndpoint.class); @@ -86,7 +87,7 @@ URL wsdlURL = new URL(endpointAddress + "?wsdl"); QName serviceName = new QName("http://policy.cxf.jaxws.ws.test.jboss.org/";, "PIPService"); - Service service = Service.create(wsdlURL, serviceName); + Service service = Service.create(wsdlURL, serviceName, new UseThreadBusFeature()); QName portQName = new QName("http://policy.cxf.jaxws.ws.test.jboss.org/";, "PIPEndpointPort"); PIPEndpoint port = (PIPEndpoint)service.getPort(portQName, PIPEndpoint.class);