Merge "Fix clustering versions"

[controller.git] / opendaylight / clustering / services_implementation / src / main / java / org / opendaylight / controller / clustering / services_implementation / internal / Activator.java

diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/Activator.java b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/Activator.java
index 79af2cf3989f46a9d1296692f44eff4cdfb59d66..1c6a5db6d5e0530de4ddae9c0d0b6c7892af2506 100644 (file)
--- a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/Activator.java
+++ b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/Activator.java
@@ -24,22 +24,7 @@ public class Activator extends ComponentActivatorAbstractBase {
     protected static final Logger logger = LoggerFactory
             .getLogger(Activator.class);
 
-    /**
-     * Function called when the activator starts just after some
-     * initializations are done by the
-     * ComponentActivatorAbstractBase.
-     *
-     */
-    public void init() {
-    }
 
-    /**
-     * Function called when the activator stops just before the
-     * cleanup done by ComponentActivatorAbstractBase
-     *
-     */
-    public void destroy() {
-    }
 
     /**
      * Function that is used to communicate to dependency manager the
@@ -50,8 +35,9 @@ public class Activator extends ComponentActivatorAbstractBase {
      * instantiated in order to get an fully working implementation
      * Object
      */
+    @Override
     public Object[] getGlobalImplementations() {
-        Object[] res = { ClusterManager.class, ClusterGlobalManager.class };
+        Object[] res = { ClusterManager.class, ClusterGlobalManager.class, ClusterManagerCLI.class };
         return res;
     }
 
@@ -64,6 +50,7 @@ public class Activator extends ComponentActivatorAbstractBase {
      * instantiated in order to get an fully working implementation
      * Object
      */
+    @Override
     public Object[] getImplementations() {
         Object[] res = { ClusterContainerManager.class };
         return res;
@@ -82,28 +69,30 @@ public class Activator extends ComponentActivatorAbstractBase {
      * also optional per-container different behavior if needed, usually
      * should not be the case though.
      */
+    @Override
     public void configureInstance(Component c, Object imp, String containerName) {
         if (imp.equals(ClusterContainerManager.class)) {
-            c.setInterface(new String[] { IClusterContainerServices.class
-                    .getName() }, null);
+            c.setInterface(new String[] { IClusterContainerServices.class.getName() },
+                           null);
 
-            c.add(createServiceDependency().setService(IClusterServices.class)
-                    .setCallbacks("setClusterService", "unsetClusterService")
-                    .setRequired(true));
+            c.add(createServiceDependency()
+                  .setService(IClusterServices.class)
+                  .setCallbacks("setClusterService", "unsetClusterService")
+                  .setRequired(true));
 
             // CacheUpdate services will be none or many so the
             // dependency is optional
-            c.add(createContainerServiceDependency(containerName).setService(
-                    ICacheUpdateAware.class).setCallbacks(
-                    "setCacheUpdateAware", "unsetCacheUpdateAware")
-                    .setRequired(false));
+            c.add(createContainerServiceDependency(containerName)
+                  .setService(ICacheUpdateAware.class)
+                  .setCallbacks("setCacheUpdateAware", "unsetCacheUpdateAware")
+                  .setRequired(false));
 
             // Coordinator change event can be one or many so
             // dependency is optional
-            c.add(createContainerServiceDependency(containerName).setService(
-                    ICoordinatorChangeAware.class).setCallbacks(
-                    "setCoordinatorChangeAware", "unsetCoordinatorChangeAware")
-                    .setRequired(false));
+            c.add(createContainerServiceDependency(containerName)
+                  .setService(ICoordinatorChangeAware.class)
+                  .setCallbacks("setCoordinatorChangeAware", "unsetCoordinatorChangeAware")
+                  .setRequired(false));
         }
     }
 
@@ -117,33 +106,34 @@ public class Activator extends ComponentActivatorAbstractBase {
      * needed as long as the same routine can configure multiple
      * implementations
      */
+    @Override
     public void configureGlobalInstance(Component c, Object imp) {
         if (imp.equals(ClusterManager.class)) {
             // export the service for Apps and Plugins
-            c.setInterface(new String[] { IClusterServices.class.getName() },
-                    null);
+            c.setInterface(new String[] { IClusterServices.class.getName() }, null);
         }
 
         if (imp.equals(ClusterGlobalManager.class)) {
-            c.setInterface(new String[] { IClusterGlobalServices.class
-                    .getName() }, null);
+            c.setInterface(new String[] { IClusterGlobalServices.class.getName() }, null);
 
-            c.add(createServiceDependency().setService(IClusterServices.class)
-                    .setCallbacks("setClusterService", "unsetClusterService")
-                    .setRequired(true));
+            c.add(createServiceDependency()
+                  .setService(IClusterServices.class)
+                  .setCallbacks("setClusterService", "unsetClusterService")
+                  .setRequired(true));
 
             // CacheUpdate services will be none or many so the
             // dependency is optional
-            c.add(createServiceDependency().setService(ICacheUpdateAware.class)
-                    .setCallbacks("setCacheUpdateAware",
-                            "unsetCacheUpdateAware").setRequired(false));
+            c.add(createServiceDependency()
+                  .setService(ICacheUpdateAware.class)
+                  .setCallbacks("setCacheUpdateAware", "unsetCacheUpdateAware")
+                  .setRequired(false));
 
             // Coordinator change event can be one or many so
             // dependency is optional
-            c.add(createServiceDependency().setService(
-                    ICoordinatorChangeAware.class).setCallbacks(
-                    "setCoordinatorChangeAware", "unsetCoordinatorChangeAware")
-                    .setRequired(false));
+            c.add(createServiceDependency()
+                  .setService(ICoordinatorChangeAware.class)
+                  .setCallbacks("setCoordinatorChangeAware", "unsetCoordinatorChangeAware")
+                  .setRequired(false));
         }
     }
 }