svn commit: r1555935 - in /cxf/trunk/core/src: main/java/org/apache/cxf/bus/osgi/CXFActivator.java main/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfig.java test/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfigTest.java

[dkulp]

Author: dkulp
Date: Mon Jan  6 17:33:22 2014
New Revision: 1555935

URL: http://svn.apache.org/r1555935
Log:
Remove the deprecated loading of the single workqueue config format.

Removed:
    
cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfig.java
    
cxf/trunk/core/src/test/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfigTest.java
Modified:
    cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java

Modified: cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java?rev=1555935&r1=1555934&r2=1555935&view=diff
==============================================================================
--- cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java 
(original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java Mon 
Jan  6 17:33:22 2014
@@ -33,7 +33,6 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.cm.ManagedService;
 import org.osgi.service.cm.ManagedServiceFactory;
 import org.osgi.util.tracker.ServiceTracker;
 
@@ -54,7 +53,6 @@ public class CXFActivator implements Bun
     private ServiceRegistration wqSingleConfigRegistratin;
 
     /** {@inheritDoc}*/
-    @SuppressWarnings("deprecation")
     public void start(BundleContext context) throws Exception {
         cxfBundleListener = new 
CXFExtensionBundleListener(context.getBundle().getBundleId());
         context.addBundleListener(cxfBundleListener);
@@ -66,12 +64,7 @@ public class CXFActivator implements Bun
         workQueueServiceRegistration = registerManagedServiceFactory(context, 
ManagedServiceFactory.class, 
                                                                      
workQueues,
                                                                      
ManagedWorkQueueList.FACTORY_PID);
-        
-        WorkQueueSingleConfig wqSingleConfig = new 
WorkQueueSingleConfig(workQueues);
-        wqSingleConfigRegistratin = registerManagedServiceFactory(context, 
ManagedService.class, 
-                                                                  
wqSingleConfig,
-                                                                  
WorkQueueSingleConfig.SERVICE_PID);
-        
+                
         extensions = new ArrayList<Extension>();
         extensions.add(createOsgiBusListenerExtension(context));
         extensions.add(createManagedWorkQueueListExtension(workQueues));