svn commit: r1235087 - in /cxf/trunk/rt/core/src: main/java/org/apache/cxf/bus/managers/ main/java/org/apache/cxf/buslifecycle/ main/resources/META-INF/cxf/ test/java/org/apache/cxf/bus/spring/ test/java/org/apache/cxf/buslifecycle/

[dkulp]

Author: dkulp
Date: Tue Jan 24 00:50:38 2012
New Revision: 1235087

URL: http://svn.apache.org/viewvc?rev=1235087&view=rev
Log:
Resolve buslifecycle split package between api and core

Added:
    
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java
   (contents, props changed)
      - copied, changed from r1235086, 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java
Removed:
    
cxf/trunk/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java
Modified:
    cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
    
cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
    
cxf/trunk/rt/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java

Copied: 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java
 (from r1235086, 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java)
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java&r1=1235086&r2=1235087&rev=1235087&view=diff
==============================================================================
--- 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManager.java
 (original)
+++ 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java
 Tue Jan 24 00:50:38 2012
@@ -17,13 +17,15 @@
  * under the License.
  */
 
-package org.apache.cxf.buslifecycle;
+package org.apache.cxf.bus.managers;
 
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.annotation.Resource;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.buslifecycle.BusLifeCycleListener;
+import org.apache.cxf.buslifecycle.BusLifeCycleManager;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.configuration.ConfiguredBeanLocator;
 

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

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

Modified: cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1235087&r1=1235086&r2=1235087&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt 
(original)
+++ cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt Tue 
Jan 24 00:50:38 2012
@@ -1,7 +1,7 @@
 org.apache.cxf.wsdl11.WSDLManagerImpl:org.apache.cxf.wsdl.WSDLManager:true
 
org.apache.cxf.bus.managers.PhaseManagerImpl:org.apache.cxf.phase.PhaseManager:true
 
org.apache.cxf.workqueue.WorkQueueManagerImpl:org.apache.cxf.workqueue.WorkQueueManager:true
-org.apache.cxf.buslifecycle.CXFBusLifeCycleManager:org.apache.cxf.buslifecycle.BusLifeCycleManager:true
           
+org.apache.cxf.bus.managers.CXFBusLifeCycleManager:org.apache.cxf.buslifecycle.BusLifeCycleManager:true
           
 
org.apache.cxf.endpoint.ServerRegistryImpl:org.apache.cxf.endpoint.ServerRegistry:true
 
org.apache.cxf.transports.http.internal.QueryHandlerRegistryImpl:org.apache.cxf.transports.http.QueryHandlerRegistry:true
 
 
org.apache.cxf.endpoint.EndpointResolverRegistryImpl:org.apache.cxf.endpoint.EndpointResolverRegistry:true

Modified: 
cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java?rev=1235087&r1=1235086&r2=1235087&view=diff
==============================================================================
--- 
cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
 (original)
+++ 
cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
 Tue Jan 24 00:50:38 2012
@@ -19,8 +19,8 @@
 package org.apache.cxf.bus.spring;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.bus.managers.CXFBusLifeCycleManager;
 import org.apache.cxf.buslifecycle.BusLifeCycleListener;
-import org.apache.cxf.buslifecycle.CXFBusLifeCycleManager;
 import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;

Modified: 
cxf/trunk/rt/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java?rev=1235087&r1=1235086&r2=1235087&view=diff
==============================================================================
--- 
cxf/trunk/rt/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
 (original)
+++ 
cxf/trunk/rt/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
 Tue Jan 24 00:50:38 2012
@@ -19,6 +19,7 @@
 
 package org.apache.cxf.buslifecycle;
 
+import org.apache.cxf.bus.managers.CXFBusLifeCycleManager;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 import org.junit.Assert;