Added @Component back to OpenFlowControllerImpl
diff --git a/of/ctl/src/main/java/org/onlab/onos/of/controller/impl/Controller.java b/of/ctl/src/main/java/org/onlab/onos/of/controller/impl/Controller.java
index 44d70ac..7c6b2ce 100644
--- a/of/ctl/src/main/java/org/onlab/onos/of/controller/impl/Controller.java
+++ b/of/ctl/src/main/java/org/onlab/onos/of/controller/impl/Controller.java
@@ -232,7 +232,7 @@
}
public void start(OpenFlowAgent ag) {
- log.info("Initialising OpenFlow Lib and IO");
+ log.info("Starting OpenFlow IO");
this.agent = ag;
this.init(new HashMap<String, String>());
this.run();
@@ -240,6 +240,7 @@
public void stop() {
+ log.info("Stopping OpenFlow IO");
execFactory.shutdown();
cg.close();
}
diff --git a/of/ctl/src/main/java/org/onlab/onos/of/controller/impl/OpenFlowControllerImpl.java b/of/ctl/src/main/java/org/onlab/onos/of/controller/impl/OpenFlowControllerImpl.java
index f7ff997..a58d796 100644
--- a/of/ctl/src/main/java/org/onlab/onos/of/controller/impl/OpenFlowControllerImpl.java
+++ b/of/ctl/src/main/java/org/onlab/onos/of/controller/impl/OpenFlowControllerImpl.java
@@ -6,7 +6,9 @@
import java.util.concurrent.locks.ReentrantLock;
import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Service;
import org.onlab.onos.of.controller.Dpid;
import org.onlab.onos.of.controller.OpenFlowController;
import org.onlab.onos.of.controller.OpenFlowSwitch;
@@ -19,6 +21,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Component(immediate = true)
+@Service
public class OpenFlowControllerImpl implements OpenFlowController {
private static final Logger log =