cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andreasm...@apache.org
Subject svn commit: r448964 - in /incubator/cxf/trunk: common/common/src/main/java/org/apache/cxf/common/injection/ common/common/src/main/java/org/apache/cxf/configuration/spring/ jca/src/test/java/org/apache/cxf/jca/cxf/ rt/ rt/core/src/main/java/org/apache/...
Date Fri, 22 Sep 2006 15:29:11 GMT
Author: andreasmyth
Date: Fri Sep 22 08:29:09 2006
New Revision: 448964

URL: http://svn.apache.org/viewvc?view=rev&rev=448964
Log:
[JIRA CXF-30] First cut of a Spring application context based bus.
Using a BeanPostProcessor to invoke @PostConstruct annotated methods and an ExtensionManager implementation that is a BeanFactoryPostProcessor.
At the moment the only available extension for this bus is the binding factory manager - so please continue using the CXFBusFactory until the application context based implementation until issue CXF-30 is closed.
Moved existing bus factory and bus implementatation into subpackage.
Changed build order to build rt-core before rt-management (necessary as the rt-management tests use a real instead of a mocked bus).

Added:
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/BusState.java   (with props)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusFactory.java
      - copied, changed from r448562, incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusImpl.java   (with props)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/
      - copied from r448538, incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/Extension.java
      - copied, changed from r448928, incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/Extension.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionException.java
      - copied, changed from r448928, incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/ExtensionException.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionFragmentParser.java
      - copied, changed from r448928, incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/ExtensionFragmentParser.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionManagerImpl.java
      - copied, changed from r448928, incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/ExtensionManagerImpl.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java   (with props)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties   (with props)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java   (with props)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusImpl.java   (with props)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/extension/
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/extension/ExtensionManagerImpl.java   (with props)
    incubator/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/
    incubator/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/cxf.xml   (with props)
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/CXFBusImplTest.java   (with props)
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/
      - copied from r448538, incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionFragmentParserTest.java
      - copied, changed from r448928, incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/ExtensionFragmentParserTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionManagerTest.java
      - copied, changed from r448928, incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/ExtensionManagerTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionTest.java
      - copied, changed from r448928, incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/ExtensionTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/MyService.java
      - copied, changed from r448928, incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/MyService.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/extension1.xml
      - copied unchanged from r448928, incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/extension1.xml
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java   (with props)
Removed:
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBus.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/
Modified:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
    incubator/cxf/trunk/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
    incubator/cxf/trunk/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingFactoryManagerImpl.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java
    incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
    incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
    incubator/cxf/trunk/rt/pom.xml
    incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/common/ClientServerSetupBase.java

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java?view=diff&rev=448964&r1=448963&r2=448964
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java Fri Sep 22 08:29:09 2006
@@ -68,6 +68,11 @@
 
         invokePostConstruct();
     }
+    
+    public void construct(Object o) {
+        setTarget(o);
+        invokePostConstruct();
+    }
 
 
 
@@ -264,7 +269,7 @@
     } 
 
 
-    private void invokePostConstruct() {
+    public void invokePostConstruct() {
         
         boolean accessible = false; 
         for (Method method : getPostConstructMethods()) {

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java?view=diff&rev=448964&r1=448963&r2=448964
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java Fri Sep 22 08:29:09 2006
@@ -59,7 +59,7 @@
                 ApplicationContext ac = new ClassPathXmlApplicationContext(cfgFile);
                 setApplicationContext(ac);
             } catch (BeansException ex) {
-                LogUtils.log(LOG, Level.WARNING, "APP_CONTEXT_CREATION_FAILED_MSG", ex, null);
+                LogUtils.log(LOG, Level.WARNING, "APP_CONTEXT_CREATION_FAILED_MSG", ex, (Object[])null);
             }
         } else {
             LOG.log(Level.INFO, new Message("USER_CFG_FILE_NOT_FOUND_MSG", LOG, cfgFile).toString());

Modified: incubator/cxf/trunk/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java?view=diff&rev=448964&r1=448963&r2=448964
==============================================================================
--- incubator/cxf/trunk/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java (original)
+++ incubator/cxf/trunk/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java Fri Sep 22 08:29:09 2006
@@ -39,7 +39,7 @@
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.bus.cxf.CXFBusFactory;
 import org.apache.cxf.connector.CXFConnectionFactory;
 import org.apache.hello_world_soap_http.Greeter;
 import org.easymock.classextension.EasyMock;

Modified: incubator/cxf/trunk/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java?view=diff&rev=448964&r1=448963&r2=448964
==============================================================================
--- incubator/cxf/trunk/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java (original)
+++ incubator/cxf/trunk/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java Fri Sep 22 08:29:09 2006
@@ -32,7 +32,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
 import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.bus.cxf.CXFBusFactory;
 import org.apache.hello_world_soap_http.Greeter;
 import org.easymock.classextension.EasyMock;
 

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingFactoryManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingFactoryManagerImpl.java?view=diff&rev=448964&r1=448963&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingFactoryManagerImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/BindingFactoryManagerImpl.java Fri Sep 22 08:29:09 2006
@@ -24,8 +24,10 @@
 import java.util.ResourceBundle;
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 
+import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
 import org.apache.cxf.common.i18n.BundleUtils;
 import org.apache.cxf.common.i18n.Message;
@@ -37,12 +39,27 @@
     
     final Map<String, BindingFactory> bindingFactories;
     Properties factoryNamespaceMappings;
-    
-    @Resource
+       
     ExtensionManager extensionManager;
-   
+    Bus bus;
+     
     public BindingFactoryManagerImpl() throws BusException {
         bindingFactories = new ConcurrentHashMap<String, BindingFactory>();
+    }
+    
+    @Resource
+    public void setExtensionManager(ExtensionManager em) {
+        extensionManager = em;
+    }
+    
+    @Resource
+    public void setBus(Bus b) {
+        bus = b;
+    }
+    
+    @PostConstruct
+    public void register() {
+        bus.setExtension(this, BindingFactoryManager.class);
     }
     
     BindingFactory loadBindingFactory(String className, String ...namespaceURIs) throws BusException {

Added: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/BusState.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/BusState.java?view=auto&rev=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/BusState.java (added)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/BusState.java Fri Sep 22 08:29:09 2006
@@ -0,0 +1,23 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.bus;
+
+public enum BusState {
+    INITIAL, RUNNING, SHUTDOWN;
+}

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/BusState.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/BusState.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusFactory.java (from r448562, incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusFactory.java?view=diff&rev=448964&p1=incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java&r1=448562&p2=incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusFactory.java&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusFactory.java Fri Sep 22 08:29:09 2006
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.bus;
+package org.apache.cxf.bus.cxf;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -31,7 +31,7 @@
 
     public synchronized Bus getDefaultBus() {
         if (null == defaultBus) {
-            defaultBus = new CXFBus();
+            defaultBus = new CXFBusImpl();
         }
         return defaultBus;
     }
@@ -49,7 +49,7 @@
     }
     
     public Bus createBus(Map<Class, Object> e, Map<String, Object> properties) {
-        return new CXFBus(e, properties);
+        return new CXFBusImpl(e, properties);
     }
     
 }

Added: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusImpl.java?view=auto&rev=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusImpl.java (added)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusImpl.java Fri Sep 22 08:29:09 2006
@@ -0,0 +1,175 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.bus.cxf;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.BusState;
+import org.apache.cxf.bus.cxf.extension.ExtensionManagerImpl;
+import org.apache.cxf.buslifecycle.BusLifeCycleManager;
+import org.apache.cxf.configuration.Configurer;
+import org.apache.cxf.configuration.spring.ConfigurerImpl;
+import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
+import org.apache.cxf.resource.DefaultResourceManager;
+import org.apache.cxf.resource.PropertiesResolver;
+import org.apache.cxf.resource.ResourceManager;
+import org.apache.cxf.resource.ResourceResolver;
+import org.apache.cxf.resource.SinglePropertyResolver;
+
+public class CXFBusImpl extends AbstractBasicInterceptorProvider implements Bus {
+    
+    public static final String BUS_PROPERTY_NAME = "bus";
+    private static final String BUS_ID_PROPERTY_NAME = "org.apache.cxf.bus.id";
+    private static final String DEFAULT_BUS_ID = "cxf";
+    
+    private static final String BUS_EXTENSION_RESOURCE = "META-INF/bus-extensions.xml";
+
+    private Map<Class, Object> extensions;
+    private BusLifeCycleManager lifeCycleManager;
+    private String id;
+    private BusState state;
+    
+    protected CXFBusImpl() {
+        this(new HashMap<Class, Object>());
+    }
+
+    protected CXFBusImpl(Map<Class, Object> e) {
+        this(e, new HashMap<String, Object>());
+    }
+    
+    protected CXFBusImpl(Map<Class, Object> e, Map<String, Object> properties) {
+        
+        extensions = e;
+        
+        Configurer configurer = (Configurer)extensions.get(Configurer.class);
+        if (null == configurer) {
+            String cfgFile = (String)properties.get(Configurer.USER_CFG_FILE_PROPERTY_NAME);
+            configurer = new ConfigurerImpl(cfgFile);
+            extensions.put(Configurer.class, configurer);
+        }
+ 
+        id = getBusId(properties);
+        
+        ResourceManager resourceManager = new DefaultResourceManager();
+        
+        properties.put(BUS_ID_PROPERTY_NAME, BUS_PROPERTY_NAME);
+        properties.put(BUS_PROPERTY_NAME, this);
+        
+        ResourceResolver propertiesResolver = new PropertiesResolver(properties);
+        resourceManager.addResourceResolver(propertiesResolver);
+        
+        ResourceResolver busResolver = new SinglePropertyResolver(BUS_PROPERTY_NAME, this);
+        resourceManager.addResourceResolver(busResolver);
+        
+        extensions.put(ResourceManager.class, resourceManager);
+
+        new ExtensionManagerImpl(BUS_EXTENSION_RESOURCE, 
+                                 Thread.currentThread().getContextClassLoader(),
+                                 extensions,
+                                 resourceManager);
+        
+        state = BusState.INITIAL;
+        
+        lifeCycleManager = this.getExtension(BusLifeCycleManager.class);
+        if (null != lifeCycleManager) {
+            lifeCycleManager.initComplete();
+        }
+
+    }
+
+      
+    public final <T> T getExtension(Class<T> extensionType) {
+        Object obj = extensions.get(extensionType);
+        if (null != obj) {
+            return extensionType.cast(obj);
+        }
+        return null;
+    }
+
+    public <T> void setExtension(T extension, Class<T> extensionType) {
+        extensions.put(extensionType, extension);
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void run() {
+        synchronized (this) {
+            if (state == BusState.RUNNING) {
+                // REVISIT
+                return;
+            }
+            state = BusState.RUNNING;
+
+            while (state == BusState.RUNNING) {
+
+                try {
+                    wait();
+                } catch (InterruptedException ex) {
+                    // ignore;
+                }
+            }
+        }
+    }
+
+    public void shutdown(boolean wait) {
+        lifeCycleManager = this.getExtension(BusLifeCycleManager.class);
+        if (null != lifeCycleManager) {
+            lifeCycleManager.preShutdown();
+        }
+        synchronized (this) {
+            state = BusState.SHUTDOWN;
+            notifyAll();
+        }
+        if (null != lifeCycleManager) {
+            lifeCycleManager.postShutdown();
+        }
+    }
+    
+    protected BusState getState() {
+        return state;
+    }
+    
+    private String getBusId(Map<String, Object> properties) {
+
+        String busId = null;
+
+        // first check properties
+        if (null != properties) {
+            busId = (String)properties.get(BUS_ID_PROPERTY_NAME);
+            if (null != busId && !"".equals(busId)) {
+                return busId;
+            }
+        }
+
+        // next check system properties
+        busId = System.getProperty(BUS_ID_PROPERTY_NAME);
+        if (null != busId && !"".equals(busId)) {
+            return busId;
+        }
+
+        // otherwise use default
+        return DEFAULT_BUS_ID;
+    }
+}

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/Extension.java (from r448928, incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/Extension.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/Extension.java?view=diff&rev=448964&p1=incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/Extension.java&r1=448928&p2=incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/Extension.java&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/Extension.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/Extension.java Fri Sep 22 08:29:09 2006
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.extension;
+package org.apache.cxf.bus.cxf.extension;
 
 import java.util.ArrayList;
 import java.util.Collection;

Copied: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionException.java (from r448928, incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/ExtensionException.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionException.java?view=diff&rev=448964&p1=incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/ExtensionException.java&r1=448928&p2=incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionException.java&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/ExtensionException.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionException.java Fri Sep 22 08:29:09 2006
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.extension;
+package org.apache.cxf.bus.cxf.extension;
 
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.i18n.UncheckedException;

Copied: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionFragmentParser.java (from r448928, incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/ExtensionFragmentParser.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionFragmentParser.java?view=diff&rev=448964&p1=incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/ExtensionFragmentParser.java&r1=448928&p2=incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionFragmentParser.java&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/ExtensionFragmentParser.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionFragmentParser.java Fri Sep 22 08:29:09 2006
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.extension;
+package org.apache.cxf.bus.cxf.extension;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionManagerImpl.java (from r448928, incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/ExtensionManagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionManagerImpl.java?view=diff&rev=448964&p1=incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/ExtensionManagerImpl.java&r1=448928&p2=incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionManagerImpl.java&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/extension/ExtensionManagerImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/extension/ExtensionManagerImpl.java Fri Sep 22 08:29:09 2006
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.extension;
+package org.apache.cxf.bus.cxf.extension;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,6 +30,7 @@
 import java.util.Map;
 
 import org.apache.cxf.common.injection.ResourceInjector;
+import org.apache.cxf.extension.ExtensionManager;
 import org.apache.cxf.resource.ResourceManager;
 import org.apache.cxf.resource.ResourceResolver;
 import org.apache.cxf.resource.SinglePropertyResolver;

Added: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java?view=auto&rev=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java (added)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java Fri Sep 22 08:29:09 2006
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.bus.spring;
+
+import org.apache.cxf.common.injection.ResourceInjector;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+
+public class Jsr250BeanPostProcessor implements BeanPostProcessor {
+
+    private ResourceInjector injector;
+    
+    Jsr250BeanPostProcessor() {
+        injector = new ResourceInjector(null, null); 
+    }
+    
+        
+    public Object postProcessAfterInitialization(Object bean, String beanId) throws BeansException {
+        return bean;
+    }
+
+    public Object postProcessBeforeInitialization(Object bean, String beanId) throws BeansException {
+        injector.construct(bean);
+        return bean;
+    }
+
+}

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties?view=auto&rev=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties (added)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties Fri Sep 22 08:29:09 2006
@@ -0,0 +1,2 @@
+USER_CFG_FILE_NOT_FOUND_MSG = Could not find the configuration file {0} on the classpath.
+APP_CONTEXT_CREATION_FAILED_MSG = Failed to create application context.
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java?view=auto&rev=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java (added)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java Fri Sep 22 08:29:09 2006
@@ -0,0 +1,125 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.bus.spring;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.configuration.Configurer;
+import org.apache.cxf.configuration.spring.ConfigurerImpl;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.core.io.ClassPathResource;
+
+public class SpringBusFactory implements BusFactory {
+    
+    private static final String DEFAULT_CXF_CFG_FILE = "META-INF/cxf/cxf.xml";
+    private static final String DEFAULT_CXF_EXT_CFG_FILE = "META-INF/cxf/cxf-extension.xml";
+    private static final String DEFAULT_BUS_ID = "cxf";
+    
+    private static final Logger LOG = LogUtils.getL7dLogger(SpringBusImpl.class);
+    
+    private static Bus defaultBus;
+
+    public synchronized Bus getDefaultBus() {
+        if (null == defaultBus) {
+            defaultBus = new SpringBusImpl();
+        }
+        return defaultBus;
+    }
+
+    public void setDefaultBus(Bus bus) {
+        defaultBus = bus;
+    }
+    
+    public Bus createBus() {
+        return createBus(null);
+    }
+    
+    public Bus createBus(String cfgFile) {
+        return createBus(cfgFile, true);
+    }
+    
+    public Bus createBus(String cfgFile, boolean includeDefaults) {
+        
+        List<String> cfgFileLocations = new ArrayList<String>();
+        
+        if (includeDefaults) {
+            try {
+                Enumeration<URL> resources = Thread.currentThread().getContextClassLoader()
+                    .getResources(DEFAULT_CXF_CFG_FILE);                
+                if (resources.hasMoreElements()) {
+                    cfgFileLocations.add(DEFAULT_CXF_CFG_FILE);
+                }
+                resources = Thread.currentThread().getContextClassLoader()
+                    .getResources(DEFAULT_CXF_EXT_CFG_FILE);
+                if (resources.hasMoreElements()) {
+                    cfgFileLocations.add(DEFAULT_CXF_EXT_CFG_FILE);
+                }      
+            } catch (IOException ex) {
+                // ignore  
+            }  
+        }
+        
+        if (null == cfgFile) {
+            cfgFile = System.getProperty(Configurer.USER_CFG_FILE_PROPERTY_NAME);
+        }
+        if (null == cfgFile) {
+            cfgFile = Configurer.DEFAULT_USER_CFG_FILE;
+        }
+        ClassPathResource cpr = new ClassPathResource(cfgFile);
+        if (cpr.exists()) {
+            cfgFileLocations.add(cfgFile);
+        } else {
+            LOG.log(Level.INFO, new Message("USER_CFG_FILE_NOT_FOUND_MSG", LOG, cfgFile).toString());
+        }
+        
+        String[] locations = new String[cfgFileLocations.size()];
+        locations = cfgFileLocations.toArray(locations);
+        if (LOG.isLoggable(Level.FINE)) {
+            LOG.fine("Creating application context with cfg files: " + locations);
+        }
+        
+        ApplicationContext ac = null;
+        try {      
+            ac = new ClassPathXmlApplicationContext(locations);           
+        } catch (BeansException ex) {
+            LogUtils.log(LOG, Level.WARNING, "APP_CONTEXT_CREATION_FAILED_MSG", ex, (Object[])null);
+        }
+        
+        Bus bus = (Bus)ac.getBean(DEFAULT_BUS_ID);
+        
+        Configurer configurer = new ConfigurerImpl(ac);
+        bus.setExtension(configurer, Configurer.class);
+
+        return bus;
+    }
+    
+}

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusImpl.java?view=auto&rev=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusImpl.java (added)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusImpl.java Fri Sep 22 08:29:09 2006
@@ -0,0 +1,114 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.bus.spring;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.BusState;
+import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
+import org.apache.cxf.interceptor.Interceptor;
+
+public class SpringBusImpl extends AbstractBasicInterceptorProvider implements Bus {
+    
+    private Map<Class, Object> extensions;
+    
+    private String id;
+    private BusState state;      
+    
+    public SpringBusImpl() {
+        extensions = new HashMap<Class, Object>();
+        state = BusState.INITIAL;
+    }
+    
+    public void setExtensions(Map<Class, Object> e) {
+        extensions = e;
+    }
+    
+    public void setId(String i) {
+        id = i;
+    }
+
+    public List<Interceptor> getInFaultInterceptors() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public List<Interceptor> getInInterceptors() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public List<Interceptor> getOutFaultInterceptors() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public List<Interceptor> getOutInterceptors() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public final <T> T getExtension(Class<T> extensionType) {
+        Object obj = extensions.get(extensionType);
+        if (null != obj) {
+            return extensionType.cast(obj);
+        }
+        return null;
+    }
+    
+    public <T> void setExtension(T extension, Class<T> extensionType) {
+        extensions.put(extensionType, extension);
+    }
+     
+    public String getId() {
+        return id;
+    }
+
+    public void run() {
+        synchronized (this) {
+            if (state == BusState.RUNNING) {
+                // REVISIT
+                return;
+            }
+            state = BusState.RUNNING;
+
+            while (state == BusState.RUNNING) {
+
+                try {
+                    wait();
+                } catch (InterruptedException ex) {
+                    // ignore;
+                }
+            }
+        }
+    }
+
+    public void shutdown(boolean wait) {
+        // TODO
+    }
+    
+    protected BusState getState() {
+        return state;
+    }
+
+}

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/extension/ExtensionManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/extension/ExtensionManagerImpl.java?view=auto&rev=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/extension/ExtensionManagerImpl.java (added)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/extension/ExtensionManagerImpl.java Fri Sep 22 08:29:09 2006
@@ -0,0 +1,98 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.cxf.bus.spring.extension;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cxf.extension.ExtensionManager;
+import org.apache.cxf.helpers.CastUtils;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.MutablePropertyValues;
+import org.springframework.beans.PropertyValue;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+
+public class ExtensionManagerImpl implements ExtensionManager, BeanFactoryPostProcessor {
+
+    private static final String ACTIVATION_NAMESPACES_PROPERTY_NAME = "activationNamespaces";
+    
+    private Map<String, Collection<String>> deferred;
+    private ConfigurableListableBeanFactory factory;
+    
+    ExtensionManagerImpl() {
+        deferred = new HashMap<String, Collection<String>>();
+    }
+    
+    public void activateViaNS(String namespace) {
+        Collection<String> beanNames = deferred.get(namespace);
+        if (null != beanNames) {
+            for (String n : beanNames) {
+                factory.getBean(n);
+            }
+            beanNames = null;
+            deferred.remove(namespace);
+        }
+    }
+
+    public void postProcessBeanFactory(ConfigurableListableBeanFactory f) throws BeansException {
+        factory = f;
+        String[] names = factory.getBeanDefinitionNames();
+        for (String n : names) {
+            BeanDefinition bd = factory.getBeanDefinition(n);
+            if (!bd.isLazyInit()) {
+                continue;
+            }
+            MutablePropertyValues mpvs = bd.getPropertyValues();
+            if (null == mpvs) {
+                continue;
+            }
+            PropertyValue pv = mpvs.getPropertyValue(ACTIVATION_NAMESPACES_PROPERTY_NAME);
+            if (null == pv) {
+                continue;
+            }
+            List<String> activationNamespaces = null;
+            try {     
+                List<?> values = (List<?>)pv.getValue();
+                activationNamespaces = CastUtils.cast(values);
+            } catch (ClassCastException ex) {
+                continue;
+            }
+            for (String ns : activationNamespaces) {
+                addDeferred(ns, n);
+            }  
+        }
+        
+    }
+    
+    private void addDeferred(String namespace, String beanName) {
+        Collection<String> beanNames = deferred.get(namespace);
+        if (null == beanNames) {
+            beanNames = new ArrayList<String>();   
+            deferred.put(namespace, beanNames);
+        }
+        beanNames.add(beanName);
+    }
+}

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/extension/ExtensionManagerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/extension/ExtensionManagerImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java?view=diff&rev=448964&r1=448963&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java Fri Sep 22 08:29:09 2006
@@ -36,7 +36,7 @@
 import junit.framework.TestCase;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.bus.cxf.CXFBusFactory;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;

Added: incubator/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/cxf.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/cxf.xml?view=auto&rev=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/cxf.xml (added)
+++ incubator/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/cxf.xml Fri Sep 22 08:29:09 2006
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:foo="http://cxf.apache.org/configuration/foo"
+       xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="cxf" class="org.apache.cxf.bus.spring.SpringBusImpl"/>
+    
+    <bean class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
+    
+    <bean id="org.apache.cxf.extension.ExtensionManager" class="org.apache.cxf.bus.spring.extension.ExtensionManagerImpl"/>
+        
+    <bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl">
+        <property name="extensionManager">
+            <ref bean="org.apache.cxf.extension.ExtensionManager"/>
+        </property>
+        <property name="bus">
+            <ref bean="cxf"/>
+        </property>
+    </bean>
+
+</beans>
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/cxf.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/cxf.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/cxf.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/CXFBusImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/CXFBusImplTest.java?view=auto&rev=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/CXFBusImplTest.java (added)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/CXFBusImplTest.java Fri Sep 22 08:29:09 2006
@@ -0,0 +1,155 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.bus.cxf;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.apache.cxf.BusException;
+import org.apache.cxf.binding.BindingFactoryManager;
+import org.apache.cxf.bus.BusState;
+import org.apache.cxf.buslifecycle.BusLifeCycleListener;
+import org.apache.cxf.buslifecycle.BusLifeCycleManager;
+import org.apache.cxf.event.EventProcessor;
+import org.apache.cxf.management.InstrumentationManager;
+import org.apache.cxf.phase.PhaseManager;
+import org.apache.cxf.transport.ConduitInitiatorManager;
+import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.wsdl.WSDLManager;
+import org.easymock.classextension.EasyMock;
+import org.easymock.classextension.IMocksControl;
+
+public class CXFBusImplTest extends TestCase {
+
+    
+    public void testConstructionWithoutExtensions() throws BusException {
+        
+        CXFBusImpl bus = new CXFBusImpl();
+        assertNotNull(bus.getExtension(BindingFactoryManager.class));
+        assertNotNull(bus.getExtension(ConduitInitiatorManager.class));   
+        assertNotNull(bus.getExtension(DestinationFactoryManager.class));
+        assertNotNull(bus.getExtension(WSDLManager.class));
+        assertNotNull(bus.getExtension(PhaseManager.class));
+    }
+    
+    public void testConstructionWithExtensions() throws BusException {
+        
+        IMocksControl control;
+        BindingFactoryManager bindingFactoryManager;
+        WSDLManager wsdlManager;
+        EventProcessor eventProcessor;
+        InstrumentationManager instrumentationManager;
+        PhaseManager phaseManager;
+        
+        control = EasyMock.createNiceControl();
+        
+        Map<Class, Object> properties = new HashMap<Class, Object>();
+        bindingFactoryManager = control.createMock(BindingFactoryManager.class);
+        wsdlManager = control.createMock(WSDLManager.class);
+        eventProcessor = control.createMock(EventProcessor.class);
+        instrumentationManager = control.createMock(InstrumentationManager.class);
+        phaseManager = control.createMock(PhaseManager.class);
+        
+        properties.put(BindingFactoryManager.class, bindingFactoryManager);
+        properties.put(WSDLManager.class, wsdlManager);
+        properties.put(EventProcessor.class, eventProcessor);
+        properties.put(InstrumentationManager.class, instrumentationManager);
+        properties.put(PhaseManager.class, phaseManager);
+        
+        CXFBusImpl bus = new CXFBusImpl(properties);
+        
+        assertSame(bindingFactoryManager, bus.getExtension(BindingFactoryManager.class));
+        assertSame(wsdlManager, bus.getExtension(WSDLManager.class));
+        assertSame(eventProcessor, bus.getExtension(EventProcessor.class));
+        assertSame(instrumentationManager, bus.getExtension(InstrumentationManager.class));
+        assertSame(phaseManager, bus.getExtension(PhaseManager.class));
+  
+    }
+
+    public void testExtensions() {
+        CXFBusImpl bus = new CXFBusImpl();
+        String extension = "CXF";
+        bus.setExtension(extension, String.class);
+        assertSame(extension, bus.getExtension(String.class));
+    }
+    
+    public void testRun() {
+        final CXFBusImpl bus = new CXFBusImpl();
+        Thread t = new Thread() {
+            public void run() {
+                bus.run();
+            }
+        };
+        t.start();
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException ex) {
+            // ignore;
+        }
+        try {
+            t.join(400);
+        } catch (InterruptedException ex) {
+            // ignore
+        }
+        assertEquals(BusState.RUNNING, bus.getState());
+    }
+    
+    public void testShutdown() {
+        final CXFBusImpl bus = new CXFBusImpl();
+        Thread t = new Thread() {
+            public void run() {
+                bus.run();
+            }
+        };
+        t.start();
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException ex) {
+            // ignore;
+        }
+        bus.shutdown(true);
+        try {
+            t.join();
+        } catch (InterruptedException ex) {
+            // ignore
+        }
+        assertEquals(BusState.SHUTDOWN, bus.getState());
+        
+    }
+    
+    public void testShutdownWithBusLifecycle() {
+        final CXFBusImpl bus = new CXFBusImpl();
+        BusLifeCycleManager lifeCycleManager = bus.getExtension(BusLifeCycleManager.class);
+        BusLifeCycleListener listener = EasyMock.createMock(BusLifeCycleListener.class);
+        EasyMock.reset(listener);
+        listener.preShutdown();
+        EasyMock.expectLastCall();
+        listener.postShutdown();
+        EasyMock.expectLastCall();        
+        EasyMock.replay(listener);        
+        lifeCycleManager.registerLifeCycleListener(listener);
+        bus.shutdown(true);
+        EasyMock.verify(listener);
+        
+    }
+
+}

Propchange: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/CXFBusImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/CXFBusImplTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionFragmentParserTest.java (from r448928, incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/ExtensionFragmentParserTest.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionFragmentParserTest.java?view=diff&rev=448964&p1=incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/ExtensionFragmentParserTest.java&r1=448928&p2=incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionFragmentParserTest.java&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/ExtensionFragmentParserTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionFragmentParserTest.java Fri Sep 22 08:29:09 2006
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.extension;
+package org.apache.cxf.bus.cxf.extension;
 
 import java.io.InputStream;
 import java.util.Collection;

Copied: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionManagerTest.java (from r448928, incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/ExtensionManagerTest.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionManagerTest.java?view=diff&rev=448964&p1=incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/ExtensionManagerTest.java&r1=448928&p2=incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionManagerTest.java&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/ExtensionManagerTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionManagerTest.java Fri Sep 22 08:29:09 2006
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.extension;
+package org.apache.cxf.bus.cxf.extension;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionTest.java (from r448928, incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/ExtensionTest.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionTest.java?view=diff&rev=448964&p1=incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/ExtensionTest.java&r1=448928&p2=incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionTest.java&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/ExtensionTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/ExtensionTest.java Fri Sep 22 08:29:09 2006
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.extension;
+package org.apache.cxf.bus.cxf.extension;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

Copied: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/MyService.java (from r448928, incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/MyService.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/MyService.java?view=diff&rev=448964&p1=incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/MyService.java&r1=448928&p2=incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/MyService.java&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/extension/MyService.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/cxf/extension/MyService.java Fri Sep 22 08:29:09 2006
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.extension;
+package org.apache.cxf.bus.cxf.extension;
 
 import java.util.Collection;
 

Added: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java?view=auto&rev=448964
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java (added)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java Fri Sep 22 08:29:09 2006
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.bus.spring;
+
+import junit.framework.TestCase;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusException;
+import org.apache.cxf.binding.BindingFactoryManager;
+
+public class SpringBusFactoryTest extends TestCase {
+
+    public void testCustom() {
+       
+    }
+    
+    public void testDefault() {
+        Bus bus = new SpringBusFactory().createBus();
+        assertNotNull(bus);
+        BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);  
+        assertNotNull("No binding factory manager", bfm);
+        
+        try {
+            bfm.getBindingFactory("http://cxf.apache.org/unknown");
+        } catch (BusException ex) {
+            // expected
+        }
+    }
+}

Propchange: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java?view=diff&rev=448964&r1=448963&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java Fri Sep 22 08:29:09 2006
@@ -34,7 +34,7 @@
 import org.apache.cxf.binding.Binding;
 import org.apache.cxf.binding.BindingFactory;
 import org.apache.cxf.binding.BindingFactoryManager;
-import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.bus.cxf.CXFBusFactory;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.endpoint.EndpointImpl;
 import org.apache.cxf.interceptor.WrappedInInterceptor;

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java?view=diff&rev=448964&r1=448963&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java Fri Sep 22 08:29:09 2006
@@ -48,7 +48,7 @@
 
 import org.apache.cxf.Bus;
 
-import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.bus.cxf.CXFBusFactory;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
 import org.apache.cxf.jaxws.support.JaxwsImplementorInfo;

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java?view=diff&rev=448964&r1=448963&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java Fri Sep 22 08:29:09 2006
@@ -28,7 +28,7 @@
 import javax.xml.ws.spi.ServiceDelegate;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.bus.cxf.CXFBusFactory;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.jaxws.EndpointImpl;

Modified: incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java?view=diff&rev=448964&r1=448963&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java (original)
+++ incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java Fri Sep 22 08:29:09 2006
@@ -26,7 +26,7 @@
 
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.bus.cxf.CXFBusFactory;
 import org.apache.cxf.event.ComponentEventFilter;
 import org.apache.cxf.event.Event;
 import org.apache.cxf.event.EventProcessor;

Modified: incubator/cxf/trunk/rt/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/pom.xml?view=diff&rev=448964&r1=448963&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/pom.xml (original)
+++ incubator/cxf/trunk/rt/pom.xml Fri Sep 22 08:29:09 2006
@@ -37,8 +37,8 @@
     </properties>
 
     <modules>
-        <module>management</module>
         <module>core</module>
+        <module>management</module>
         <module>transports/local</module>
         <module>databinding/jaxb</module>
         <module>bindings</module>

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java?view=diff&rev=448964&r1=448963&r2=448964
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java Fri Sep 22 08:29:09 2006
@@ -27,7 +27,7 @@
 
 import junit.framework.TestCase;
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.bus.cxf.CXFBusFactory;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/common/ClientServerSetupBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/common/ClientServerSetupBase.java?view=diff&rev=448964&r1=448963&r2=448964
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/common/ClientServerSetupBase.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/common/ClientServerSetupBase.java Fri Sep 22 08:29:09 2006
@@ -22,7 +22,7 @@
 import junit.framework.Test;
 
 import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.bus.cxf.CXFBusFactory;
 import org.apache.cxf.testutil.common.AbstractClientServerSetupBase;
 
 public abstract class ClientServerSetupBase extends AbstractClientServerSetupBase {



Mime
View raw message