svn commit: r903383 - in /cxf/branches/2.2.x-fixes: ./ common/common/src/main/java/org/apache/cxf/event/ rt/core/src/test/java/org/apache/cxf/bus/

[dkulp]

Author: dkulp
Date: Tue Jan 26 19:38:17 2010
New Revision: 903383

URL: http://svn.apache.org/viewvc?rev=903383&view=rev
Log:
Merged revisions 903345 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r903345 | dkulp | 2010-01-26 13:04:37 -0500 (Tue, 26 Jan 2010) | 1 line
  
  Remove some dead code.
........

Removed:
    
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/event/ComponentEventFilter.java
    
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/event/Event.java
    
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/event/EventCache.java
    
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/event/EventFilter.java
    
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/event/EventListener.java
    
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/event/EventProcessor.java
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java?rev=903383&r1=903382&r2=903383&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
 Tue Jan 26 19:38:17 2010
@@ -28,7 +28,6 @@
 import org.apache.cxf.bus.extension.ExtensionManagerBus;
 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;
@@ -58,7 +57,6 @@
         IMocksControl control;
         BindingFactoryManager bindingFactoryManager;
         WSDLManager wsdlManager;
-        EventProcessor eventProcessor;
         InstrumentationManager instrumentationManager;
         PhaseManager phaseManager;
         
@@ -67,13 +65,11 @@
         Map<Class, Object> extensions = 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);
         
         extensions.put(BindingFactoryManager.class, bindingFactoryManager);
         extensions.put(WSDLManager.class, wsdlManager);
-        extensions.put(EventProcessor.class, eventProcessor);
         extensions.put(InstrumentationManager.class, instrumentationManager);
         extensions.put(PhaseManager.class, phaseManager);
         
@@ -81,7 +77,6 @@
         
         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));