Remove plugin projects dependency on ad-sal clustering.

Currently plugin code is not using any feature of clustering in the existing code. Removing this unnecessary dependency

Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

diff --git a/plugin/pom.xml b/plugin/pom.xml
index ba42c4bb465f7777384901a7419d993cd02ab12c..af60ddfd44aa56eddd60de560aed095c277d2948 100755 (executable)
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -43,10 +43,6 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.dependencymanager</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>clustering.services</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
@@ -101,7 +97,6 @@
               org.opendaylight.controller.sal.match,
               org.opendaylight.controller.sal.utils,
               org.opendaylight.controller.sal.connection,
-              org.opendaylight.controller.clustering.services,
               org.opendaylight.ovsdb.lib.error,
               org.opendaylight.ovsdb.lib.notation,
               org.opendaylight.ovsdb.lib.operations,

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConfigurationServiceImpl.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConfigurationServiceImpl.java
index aa53a40399c1435fe668785dbf59f9dfaafbf210..0db04125d96cd969f98bafc06a33c25eaf3aac17 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConfigurationServiceImpl.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConfigurationServiceImpl.java
@@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutionException;
 
 import org.eclipse.osgi.framework.console.CommandProvider;
-import org.opendaylight.controller.clustering.services.IClusterGlobalServices;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.utils.Status;
 import org.opendaylight.controller.sal.utils.StatusCode;
@@ -135,18 +134,6 @@ public class ConfigurationServiceImpl implements OvsdbConfigurationService
         }
     }
 
-    private IClusterGlobalServices clusterServices;
-
-    public void setClusterServices(IClusterGlobalServices i) {
-        this.clusterServices = i;
-    }
-
-    public void unsetClusterServices(IClusterGlobalServices i) {
-        if (this.clusterServices == i) {
-            this.clusterServices = null;
-        }
-    }
-
     private Connection getConnection (Node node) {
         Connection connection = connectionService.getConnection(node);
         if (connection == null || !connection.getClient().isActive()) {

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Activator.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Activator.java
index 4121c5a6a7f4f7f164eb4afa6861bcee6cb5a2e0..04db192b30b17eb1540c911877ceb39e72c54fbe 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Activator.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Activator.java
@@ -13,7 +13,6 @@ import java.util.Dictionary;
 import java.util.Hashtable;
 
 import org.apache.felix.dm.Component;
-import org.opendaylight.controller.clustering.services.IClusterGlobalServices;
 import org.opendaylight.controller.sal.connection.IPluginInConnectionService;
 import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase;
 import org.opendaylight.controller.sal.core.Node;
@@ -91,10 +90,6 @@ public class Activator extends ComponentActivatorAbstractBase {
             c.add(createServiceDependency()
                     .setService(OvsdbInventoryService.class)
                     .setRequired(true));
-            c.add(createServiceDependency()
-                    .setService(IClusterGlobalServices.class)
-                    .setCallbacks("setClusterServices", "unsetClusterServices")
-                    .setRequired(false));
         }
 
         if (imp.equals(ConnectionServiceImpl.class)) {