Gerritt #107 introduced a fix that caused Routing Listener registration issue.

Fixing it here. Also removed the unused DS xmls.

Change-Id: I2b6105d909bea0691b5568a0791d4920f73cc17e
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>

diff --git a/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java b/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java
index 2ee1583af7ebebe7f089f2992220f69e25338ade..3cd696854c3c9d89a6f6d5543b3ce276f751dfbc 100644 (file)
--- a/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java
+++ b/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java
@@ -84,7 +84,7 @@ public class Activator extends ComponentActivatorAbstractBase {
             // provider of service exists
             c.add(createContainerServiceDependency(containerName).setService(
                     IListenRoutingUpdates.class).setCallbacks(
-                    "setLIstenRoutingUpdates", "unsetLIstenRoutingUpdates")
+                    "setListenRoutingUpdates", "unsetListenRoutingUpdates")
                     .setRequired(false));
 
             c.add(createContainerServiceDependency(containerName).setService(

diff --git a/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java b/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java
index 6f1dc3f9d707bd49016a67005ef88799349bd64f..05ec5d40530919941dd69f67a197111c7a565687 100644 (file)
--- a/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java
+++ b/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java
@@ -71,7 +71,7 @@ public class DijkstraImplementation implements IRouting, ITopologyManagerAware {
         }
     }
 
-    public void unsetRoutingUpdates(IListenRoutingUpdates i) {
+    public void unsetListenRoutingUpdates(IListenRoutingUpdates i) {
         if (this.routingAware == null) {
             return;
         }

diff --git a/opendaylight/routing/dijkstra_implementation/src/main/resources/OSGI-INF/component-factory.xml b/opendaylight/routing/dijkstra_implementation/src/main/resources/OSGI-INF/component-factory.xml
deleted file mode 100644 (file)
index d71bef8..0000000
--- a/opendaylight/routing/dijkstra_implementation/src/main/resources/OSGI-INF/component-factory.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"
- activate="factoryStartUp" deactivate="factoryShutDown"
- factory="routing.dijkstra_implementation.factory" name="routing.dijkstra_implementation.ComponentFactory">
-   <implementation class="org.opendaylight.controller.routing.dijkstra_implementation.internal.DijkstraImplementation"/>
-   <service>
-      <provide interface="org.osgi.service.component.ComponentFactory"/>
-   </service>
-</scr:component>

diff --git a/opendaylight/routing/dijkstra_implementation/src/main/resources/OSGI-INF/component.xml b/opendaylight/routing/dijkstra_implementation/src/main/resources/OSGI-INF/component.xml
deleted file mode 100644 (file)
index 4f9cdc8..0000000
--- a/opendaylight/routing/dijkstra_implementation/src/main/resources/OSGI-INF/component.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"
-               activate="startUp"
-               deactivate="shutDown"
-               name="routing.dijkstra_implementation.Component">
-  <implementation class="org.opendaylight.controller.routing.dijkstra_implementation.internal.DijkstraImplementation"/>
-
-  <service>
-    <provide interface="org.opendaylight.controller.sal.routing.IRouting"/>
-    <provide interface="org.opendaylight.controller.topologymanager.ITopologyManagerAware"/>
-  </service>
-  <reference name="IListenRoutingUpdates"
-             bind="setListenRoutingUpdates"
-             unbind="unsetRoutingUpdates"
-             cardinality="0..n"
-             policy="dynamic"
-             interface="org.opendaylight.controller.sal.routing.IListenRoutingUpdates"/>
-</scr:component>