tom

Added @Component back to OpenFlowControllerImpl

......@@ -232,7 +232,7 @@ public class Controller {
}
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 class Controller {
public void stop() {
log.info("Stopping OpenFlow IO");
execFactory.shutdown();
cg.close();
}
......
......@@ -6,7 +6,9 @@ import java.util.concurrent.locks.Lock;
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.projectfloodlight.openflow.protocol.OFPortStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Component(immediate = true)
@Service
public class OpenFlowControllerImpl implements OpenFlowController {
private static final Logger log =
......