commit bc76210b87719ef3c9967e72242659d83c9b4650
author Ray Milkey <ray@opennetworking.org> Wed Oct 03 11:46:26 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Tue Oct 09 16:39:08 2018 +0000
tree d1425be68bc4e9295be7eea90aebc657cc3b6270
parent 58dd64ef6aa34ec7c18c8a629cff941c2ddb6a9c

Fixes for karaf 4.2.1 CLI annotations for events app

Change-Id: Ifb78566498855cf0301c7568310646e67cc9e44a

apps/events/BUILD

diff --git a/apps/events/BUILD b/apps/events/BUILD
index d5d9ebf..52b97c7 100644
--- a/apps/events/BUILD
+++ b/apps/events/BUILD
@@ -1,6 +1,7 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + CLI
 
 osgi_jar_with_tests(
+    karaf_command_packages = ["org.onosproject.events"],
     resources = glob(["src/main/resources/**"]),
     resources_root = "src/main/resources",
     deps = COMPILE_DEPS,

apps/events/src/main/java/org/onosproject/events/EventHistoryManager.java

diff --git a/apps/events/src/main/java/org/onosproject/events/EventHistoryManager.java b/apps/events/src/main/java/org/onosproject/events/EventHistoryManager.java
index 549b358..490e585 100644
--- a/apps/events/src/main/java/org/onosproject/events/EventHistoryManager.java
+++ b/apps/events/src/main/java/org/onosproject/events/EventHistoryManager.java
@@ -51,7 +51,7 @@
 /**
  * Application to store history of instance local ONOS Events.
  */
-@Component(immediate = true, service = EventHistoryManager.class)
+@Component(immediate = true, service = EventHistoryService.class)
 public class EventHistoryManager
     implements EventHistoryService {