cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1483988 - in /cxf/trunk: api/src/main/java/org/apache/cxf/ integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/ osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ rt/core/src/main/java/org/apache/cxf/bus/ rt/core/src/ma...
Date Fri, 17 May 2013 20:50:57 GMT
Author: dkulp
Date: Fri May 17 20:50:57 2013
New Revision: 1483988

URL: http://svn.apache.org/r1483988
Log:
Remove the CXFBusImpl class

Removed:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java
Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/Bus.java
    cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java
    cxf/trunk/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
    cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
    cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
    cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
    cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/Bus.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/Bus.java?rev=1483988&r1=1483987&r2=1483988&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/Bus.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/Bus.java Fri May 17 20:50:57 2013
@@ -45,16 +45,18 @@ public interface Bus extends Interceptor
     boolean hasExtensionByName(String name);
     
     String getId();
+    void setId(String i);
     
     void shutdown(boolean wait);
     
     void setProperty(String s, Object o);
-    
     Object getProperty(String s);
-    
+    void setProperties(Map<String, Object> properties);
     Map<String, Object> getProperties();    
     
     Collection<Feature> getFeatures();
+    void setFeatures(Collection<? extends Feature> features);
     
     BusState getState();
+
 }

Modified: cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java?rev=1483988&r1=1483987&r2=1483988&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java (original)
+++ cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java Fri
May 17 20:50:57 2013
@@ -150,4 +150,19 @@ public class DummyBus extends AbstractBa
         return null;
     }
 
+    public void setId(String i) {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public void setProperties(Map<String, Object> properties) {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public void setFeatures(Collection<? extends Feature> features) {
+        // TODO Auto-generated method stub
+        
+    }
+
 }

Modified: cxf/trunk/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java?rev=1483988&r1=1483987&r2=1483988&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
(original)
+++ cxf/trunk/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
Fri May 17 20:50:57 2013
@@ -22,7 +22,6 @@ package org.apache.cxf.karaf.commands;
 import java.util.List;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusImpl;
 import org.apache.felix.gogo.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 
@@ -47,10 +46,7 @@ public class ListBussesCommand extends O
         System.out.println(String.format(headerFormat, "Name", "State"));
 
         for (Bus bus : busses) {
-            String state = "";
-            if (bus instanceof CXFBusImpl) {
-                state = ((CXFBusImpl)bus).getState().toString();
-            }
+            String state = bus.getState().toString();
             System.out.println(String.format(outputFormat, bus.getId(), state));
         }
         return null;

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java?rev=1483988&r1=1483987&r2=1483988&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java Fri
May 17 20:50:57 2013
@@ -27,7 +27,6 @@ import java.util.concurrent.atomic.Atomi
 import org.w3c.dom.Element;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusImpl;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
@@ -155,7 +154,7 @@ public class BusDefinitionParser extends
     public static class BusConfig extends AbstractBasicInterceptorProvider
         implements ApplicationContextAware {
         
-        CXFBusImpl bus;
+        Bus bus;
         String busName;
         String id;
         Collection<Feature> features;
@@ -169,41 +168,36 @@ public class BusDefinitionParser extends
             if (bus == bb) {
                 return;
             }
-            CXFBusImpl b = (CXFBusImpl)bb;
+            bus = bb;
             if (properties != null) {
-                b.setProperties(properties);
+                bus.setProperties(properties);
                 properties = null;
             }
             if (!getInInterceptors().isEmpty()) {
-                b.getInInterceptors().addAll(getInInterceptors());
+                bus.getInInterceptors().addAll(getInInterceptors());
             }
             if (!getOutInterceptors().isEmpty()) {
-                b.getOutInterceptors().addAll(getOutInterceptors());
+                bus.getOutInterceptors().addAll(getOutInterceptors());
             }
             if (!getInFaultInterceptors().isEmpty()) {
-                b.getInFaultInterceptors().addAll(getInFaultInterceptors());
+                bus.getInFaultInterceptors().addAll(getInFaultInterceptors());
             }
             if (!getOutFaultInterceptors().isEmpty()) {
-                b.getOutFaultInterceptors().addAll(getOutFaultInterceptors());
+                bus.getOutFaultInterceptors().addAll(getOutFaultInterceptors());
             }
             if (!StringUtils.isEmpty(id)) {
-                b.setId(id);
+                bus.setId(id);
             }
             if (features != null) {
-                b.setFeatures(features);
+                bus.setFeatures(features);
                 features = null;
             }
-            bus = b;
         }
 
         public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{
             if (bus != null) {
                 return;
-            }
-            /*
-            bus = (CXFBusImpl)BusWiringBeanFactoryPostProcessor
-                    .addBus(applicationContext, busName);
-                    */                
+            }             
         }
         
         public List<Interceptor<? extends Message>> getOutFaultInterceptors()
{
@@ -260,7 +254,7 @@ public class BusDefinitionParser extends
 
         public void setOutFaultInterceptors(List<Interceptor<? extends Message>>
interceptors) {
             if (bus != null) {
-                bus.setOutFaultInterceptors(interceptors);
+                bus.getOutFaultInterceptors().addAll(interceptors);
             } else {
                 super.setOutFaultInterceptors(interceptors);
             }

Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java?rev=1483988&r1=1483987&r2=1483988&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java (original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java Fri May 17 20:50:57
2013
@@ -43,7 +43,7 @@ public class CXFBusImplTest extends Asse
     @Test
     public void testConstructionWithoutExtensions() throws BusException {
         
-        CXFBusImpl bus = new ExtensionManagerBus();
+        Bus bus = new ExtensionManagerBus();
         assertNotNull(bus.getExtension(BindingFactoryManager.class));
         assertNotNull(bus.getExtension(ConduitInitiatorManager.class));   
         assertNotNull(bus.getExtension(DestinationFactoryManager.class));
@@ -73,7 +73,7 @@ public class CXFBusImplTest extends Asse
         extensions.put(InstrumentationManager.class, instrumentationManager);
         extensions.put(PhaseManager.class, phaseManager);
         
-        CXFBusImpl bus = new CXFBusImpl(extensions);
+        Bus bus = new ExtensionManagerBus(extensions);
         
         assertSame(bindingFactoryManager, bus.getExtension(BindingFactoryManager.class));
         assertSame(wsdlManager, bus.getExtension(WSDLManager.class));
@@ -84,7 +84,7 @@ public class CXFBusImplTest extends Asse
 
     @Test
     public void testExtensions() {
-        CXFBusImpl bus = new CXFBusImpl();
+        Bus bus = new ExtensionManagerBus();
         String extension = "CXF";
         bus.setExtension(extension, String.class);
         assertSame(extension, bus.getExtension(String.class));
@@ -92,7 +92,7 @@ public class CXFBusImplTest extends Asse
     
     @Test
     public void testBusID() {
-        CXFBusImpl bus = new CXFBusImpl();
+        Bus bus = new ExtensionManagerBus();
         String id = bus.getId();
         assertEquals("The bus id should be cxf", id, Bus.DEFAULT_BUS_ID + Math.abs(bus.hashCode()));
         bus.setId("test");
@@ -101,7 +101,7 @@ public class CXFBusImplTest extends Asse
     
     @Test
     public void testShutdownWithBusLifecycle() {
-        final CXFBusImpl bus = new ExtensionManagerBus();
+        final Bus bus = new ExtensionManagerBus();
         BusLifeCycleManager lifeCycleManager = bus.getExtension(BusLifeCycleManager.class);
         BusLifeCycleListener listener = EasyMock.createMock(BusLifeCycleListener.class);
         EasyMock.reset(listener);

Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java?rev=1483988&r1=1483987&r2=1483988&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
(original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
Fri May 17 20:50:57 2013
@@ -26,7 +26,6 @@ import java.util.concurrent.atomic.Atomi
 import javax.annotation.PostConstruct;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusImpl;
 import org.apache.cxf.buslifecycle.BusLifeCycleListener;
 import org.apache.cxf.buslifecycle.BusLifeCycleManager;
 import org.apache.cxf.feature.AbstractFeature;
@@ -56,7 +55,7 @@ public class BusDefinitionParserTest ext
         }
         assertTrue("could not find logging interceptor.", found);
    
-        Collection<Feature> features = ((CXFBusImpl)bus).getFeatures();
+        Collection<Feature> features = bus.getFeatures();
         TestFeature tf = null;
         for (Feature f : features) {
             if (f instanceof TestFeature) {

Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java?rev=1483988&r1=1483987&r2=1483988&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java (original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java Fri
May 17 20:50:57 2013
@@ -32,7 +32,6 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.BindingFactoryManager;
-import org.apache.cxf.bus.CXFBusImpl;
 import org.apache.cxf.bus.managers.PhaseManagerImpl;
 import org.apache.cxf.buslifecycle.BusLifeCycleListener;
 import org.apache.cxf.buslifecycle.BusLifeCycleManager;
@@ -257,7 +256,7 @@ public class SpringBusFactoryTest extend
         
         public void initComplete() {
             assertNull(bus.getExtension(TestFeature.class));
-            Collection<Feature> features = ((CXFBusImpl)bus).getFeatures();
+            Collection<Feature> features = bus.getFeatures();
             assertEquals(1, features.size());
             TestFeature tf = (TestFeature)features.iterator().next();
             assertTrue(tf.initialised);

Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml?rev=1483988&r1=1483987&r2=1483988&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml (original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/customerBus.xml Fri May 17 20:50:57
2013
@@ -24,9 +24,6 @@
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
 
-  <bean id="cxf1" class="org.apache.cxf.bus.CXFBusImpl"/>
-   
-  <bean id="cxf2" class="org.apache.cxf.bus.CXFBusImpl"/>
 
    <cxf:bus bus="cxf1">
         <cxf:outInterceptors>

Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java?rev=1483988&r1=1483987&r2=1483988&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java (original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java Fri May
17 20:50:57 2013
@@ -20,7 +20,7 @@
 package org.apache.cxf.endpoint;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusImpl;
+import org.apache.cxf.bus.extension.ExtensionManagerBus;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.ServiceImpl;
 import org.apache.cxf.service.model.EndpointInfo;
@@ -35,7 +35,7 @@ public class EndpointImplTest extends As
     
     @Test
     public void testEqualsAndHashCode() throws Exception {
-        Bus bus = new CXFBusImpl();
+        Bus bus = new ExtensionManagerBus();
         Service svc = new ServiceImpl();
         EndpointInfo ei = new EndpointInfo();
         ei.setAddress("http://nowhere.com/bar/foo");

Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java?rev=1483988&r1=1483987&r2=1483988&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
(original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
Fri May 17 20:50:57 2013
@@ -40,7 +40,7 @@ import javax.xml.namespace.QName;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
 import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.CXFBusImpl;
+import org.apache.cxf.bus.extension.ExtensionManagerBus;
 import org.apache.cxf.common.util.Base64Utility;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
@@ -224,7 +224,7 @@ public class JettyHTTPDestinationTest ex
             }
         };
         transportFactory = new HTTPTransportFactory();
-        transportFactory.setBus(new CXFBusImpl());
+        transportFactory.setBus(new ExtensionManagerBus());
         transportFactory.getBus().setExtension(
             factory, JettyHTTPServerEngineFactory.class);
         
@@ -280,7 +280,7 @@ public class JettyHTTPDestinationTest ex
 
     @Test
     public void testDoService() throws Exception {
-        Bus defaultBus = new CXFBusImpl();
+        Bus defaultBus = new ExtensionManagerBus();
         assertSame("Default thread bus has not been set",
                    defaultBus, BusFactory.getThreadDefaultBus()); 
         destination = setUpDestination(false, false);
@@ -431,7 +431,7 @@ public class JettyHTTPDestinationTest ex
         throws Exception {
         policy = new HTTPServerPolicy();
         address = getEPR("bar/foo");
-        bus = new CXFBusImpl();
+        bus = new ExtensionManagerBus();
         
         transportFactory = new HTTPTransportFactory();
         transportFactory.setBus(bus);
@@ -566,8 +566,9 @@ public class JettyHTTPDestinationTest ex
         };
         
         if (!mockedBus) {
-            bus = new CXFBusImpl();
+            bus = new ExtensionManagerBus();
             bus.setExtension(mgr, ConduitInitiatorManager.class);
+            bus.setExtension(null, QueryHandlerRegistry.class);
         } else {
             bus = EasyMock.createMock(Bus.class);
             bus.getExtension(EndpointResolverRegistry.class);

Modified: cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java?rev=1483988&r1=1483987&r2=1483988&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
(original)
+++ cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitTest.java
Fri May 17 20:50:57 2013
@@ -28,7 +28,7 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusImpl;
+import org.apache.cxf.bus.extension.ExtensionManagerBus;
 import org.apache.cxf.common.util.Base64Utility;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
 import org.apache.cxf.helpers.CastUtils;
@@ -87,7 +87,7 @@ public class HTTPConduitTest extends Ass
      */
     @Test
     public void testGetTarget() throws Exception {
-        Bus bus = new CXFBusImpl();
+        Bus bus = new ExtensionManagerBus();
         EndpointInfo ei = new EndpointInfo();
         ei.setAddress("http://nowhere.com/bar/foo");
         HTTPConduit conduit = new URLConnectionHTTPConduit(bus, ei, null);
@@ -123,7 +123,7 @@ public class HTTPConduitTest extends Ass
      */
     @Test
     public void testConduitOutputStream() throws Exception {
-        Bus bus = new CXFBusImpl();
+        Bus bus = new ExtensionManagerBus();
         EndpointInfo ei = new EndpointInfo();
         ei.setAddress("http://nowhere.com/bar/foo");
         HTTPConduit conduit = new URLConnectionHTTPConduit(bus, ei, null);
@@ -140,7 +140,7 @@ public class HTTPConduitTest extends Ass
 
     @Test
     public void testAuthPolicyFromEndpointInfo() throws Exception {
-        Bus bus = new CXFBusImpl();
+        Bus bus = new ExtensionManagerBus();
         EndpointInfo ei = new EndpointInfo();
         AuthorizationPolicy ap = new AuthorizationPolicy();
         ap.setPassword("password");
@@ -173,7 +173,7 @@ public class HTTPConduitTest extends Ass
      */
     @Test
     public void testAuthPolicyPrecedence() throws Exception {
-        Bus bus = new CXFBusImpl();
+        Bus bus = new ExtensionManagerBus();
         EndpointInfo ei = new EndpointInfo();
         ei.setAddress("http://nowhere.com/bar/foo");
         HTTPConduit conduit = new URLConnectionHTTPConduit(bus, ei, null);

Modified: cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java?rev=1483988&r1=1483987&r2=1483988&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
(original)
+++ cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
Fri May 17 20:50:57 2013
@@ -28,7 +28,7 @@ import java.util.TreeMap;
 import javax.net.ssl.HttpsURLConnection;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusImpl;
+import org.apache.cxf.bus.extension.ExtensionManagerBus;
 import org.apache.cxf.configuration.jsse.TLSClientParameters;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
@@ -75,7 +75,7 @@ public class HTTPConduitURLConnectionTes
      */
     @Test
     public void testConnectionURL() throws Exception {
-        Bus bus = new CXFBusImpl();
+        Bus bus = new ExtensionManagerBus();
         EndpointInfo ei = new EndpointInfo();
         ei.setAddress("http://nowhere.com/bar/foo");
         HTTPConduit conduit = new URLConnectionHTTPConduit(bus, ei, null);
@@ -98,7 +98,7 @@ public class HTTPConduitURLConnectionTes
      */
     @Test
     public void testConnectionURLOverride() throws Exception {
-        Bus bus = new CXFBusImpl();
+        Bus bus = new ExtensionManagerBus();
         EndpointInfo ei = new EndpointInfo();
         ei.setAddress("http://nowhere.null/bar/foo");
         HTTPConduit conduit = new URLConnectionHTTPConduit(bus, ei, null);
@@ -133,7 +133,7 @@ public class HTTPConduitURLConnectionTes
     }
     
     private Object doTestTLSServerParameters() throws Exception {
-        Bus bus = new CXFBusImpl();
+        Bus bus = new ExtensionManagerBus();
         EndpointInfo ei = new EndpointInfo();
         ei.setAddress("https://secure.nowhere.null/" + "bar/foo");
         HTTPConduit conduit = new URLConnectionHTTPConduit(bus, ei, null);

Modified: cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java?rev=1483988&r1=1483987&r2=1483988&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
(original)
+++ cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
Fri May 17 20:50:57 2013
@@ -35,7 +35,7 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusImpl;
+import org.apache.cxf.bus.extension.ExtensionManagerBus;
 import org.apache.cxf.configuration.jsse.TLSClientParameters;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
 import org.apache.cxf.helpers.CastUtils;
@@ -342,7 +342,7 @@ public class HTTPConduitURLEasyMockTest 
             
         }
 
-        CXFBusImpl bus = new CXFBusImpl();
+        ExtensionManagerBus bus = new ExtensionManagerBus();
         
         control.replay();
         

Modified: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java?rev=1483988&r1=1483987&r2=1483988&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java (original)
+++ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java Fri
May 17 20:50:57 2013
@@ -30,7 +30,7 @@ import java.util.Set;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusImpl;
+import org.apache.cxf.bus.extension.ExtensionManagerBus;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.message.Message;
@@ -92,7 +92,7 @@ public class PolicyEngineTest extends As
         assertNotNull(engine.getPolicyProviders()); 
         assertNull(engine.getAlternativeSelector());
         assertTrue(!engine.isEnabled());
-        Bus bus = new CXFBusImpl();
+        Bus bus = new ExtensionManagerBus();
         
         engine.setBus(bus);
         List<PolicyProvider> providers = CastUtils.cast(Collections.EMPTY_LIST, PolicyProvider.class);



Mime
View raw message