Refactored VSHL into vshl-core and vshl-capabilities.

vshl-core: This API is responsible for request arbitration. Verbs exposed are

1. startListening
2. cancelListening
3. subscribe
4. enumerateVoiceAgents
5. setDefaultVoiceAgent Used by applications to subscribe to dialog, connection and auth states of underlying low level voiceagent bindings. Used by applications to trigger voice recognition routine of the underlying low level voiceagent binding.

vshl-capabilities: This API exposes publish and subscribe methods for all the speech framework domains/capabilities. For eg. navigation, phonecontrol etc. This API is used by apps and low level voice agent binding to subscribe and publish these capability messages whenever applicable. The code for this is agl-service-voice-high-capabilities repository.

This specific commit is for vshl-core API.

Change-Id: I1101db19b57ee918482a178843641b088508ac5d
Signed-off-by: Naveen Bobbili  <nbobbili@amazon.com>

6 files changed, 25 insertions, 39 deletions

diff --git a/src/plugins/afb/AFBApiImpl.cpp b/src/plugins/afb/AFBApiImpl.cpp
index 88d1e7e..9af4fbc 100644
--- a/src/plugins/afb/AFBApiImpl.cpp
+++ b/src/plugins/afb/AFBApiImpl.cpp
@@ -20,29 +20,19 @@
 
 extern "C" {
 #define AFB_BINDING_VERSION 3
-#define FREEIF(x) \
-    if (!x) {     \
-        free(x);  \
-    }
-#define BREAKIF(x)      \
-    if (x) {            \
-        result = false; \
-        break;          \
-    }
 
 #include "afb-definitions.h"
 }
 
-static std::string TAG = "vshl::afb::AFBApiImpl";
+static std::string TAG = "vshlcore::afb::AFBApiImpl";
 
 /**
  * Specifies the severity level of a log message
  */
-using Level = vshl::common::interfaces::ILogger::Level;
-using namespace vshl::common::interfaces;
-using namespace vshl::utilities::logging;
-
-namespace vshl {
+using Level = vshlcore::common::interfaces::ILogger::Level;
+using namespace vshlcore::common::interfaces;
+using namespace vshlcore::utilities::logging;
+namespace vshlcore {
 namespace afb {
 
 std::unique_ptr<AFBApiImpl> AFBApiImpl::create(AFB_ApiT api) {
diff --git a/src/plugins/afb/AFBApiImpl.h b/src/plugins/afb/AFBApiImpl.h
index 74aa7ef..d6b7b31 100644
--- a/src/plugins/afb/AFBApiImpl.h
+++ b/src/plugins/afb/AFBApiImpl.h
@@ -25,11 +25,10 @@ extern "C" {
 #include "interfaces/utilities/logging/ILogger.h"
 
 using namespace std;
-
-namespace vshl {
+namespace vshlcore {
 namespace afb {
 
-class AFBApiImpl : public vshl::common::interfaces::IAFBApi {
+class AFBApiImpl : public vshlcore::common::interfaces::IAFBApi {
 public:
     static std::unique_ptr<AFBApiImpl> create(AFB_ApiT api);
 
@@ -52,7 +51,7 @@ private:
     AFB_ApiT mApi;
 
     // Logger
-    std::shared_ptr<vshl::common::interfaces::ILogger> mLogger;
+    std::shared_ptr<vshlcore::common::interfaces::ILogger> mLogger;
 };
 
 }  // namespace afb
diff --git a/src/plugins/afb/AFBRequestImpl.cpp b/src/plugins/afb/AFBRequestImpl.cpp
index 8ec5691..6e0f177 100644
--- a/src/plugins/afb/AFBRequestImpl.cpp
+++ b/src/plugins/afb/AFBRequestImpl.cpp
@@ -18,8 +18,7 @@
 extern "C" {
 #include "afb-definitions.h"
 }
-
-namespace vshl {
+namespace vshlcore {
 namespace afb {
 
 std::unique_ptr<AFBRequestImpl> AFBRequestImpl::create(AFB_ReqT afbRequest) {
diff --git a/src/plugins/afb/AFBRequestImpl.h b/src/plugins/afb/AFBRequestImpl.h
index 2e6f3ab..82772fb 100644
--- a/src/plugins/afb/AFBRequestImpl.h
+++ b/src/plugins/afb/AFBRequestImpl.h
@@ -22,14 +22,13 @@ extern "C" {
 }
 
 #include "interfaces/afb/IAFBApi.h"
-
-namespace vshl {
+namespace vshlcore {
 namespace afb {
 
 /**
  * AFB Request impl
  */
-class AFBRequestImpl : public vshl::common::interfaces::IAFBRequest {
+class AFBRequestImpl : public vshlcore::common::interfaces::IAFBRequest {
 public:
   static std::unique_ptr<AFBRequestImpl> create(AFB_ReqT afbRequest);
 
diff --git a/src/plugins/afb/include/AFBEventImpl.h b/src/plugins/afb/include/AFBEventImpl.h
index 45f85f9..924c966 100644
--- a/src/plugins/afb/include/AFBEventImpl.h
+++ b/src/plugins/afb/include/AFBEventImpl.h
@@ -28,15 +28,15 @@ extern "C" {
 
 using namespace std;
 
-namespace vshl {
+namespace vshlcore {
 namespace afb {
 /*
  * This class encapsulates AFB Event.
  */
-class AFBEventImpl : public vshl::common::interfaces::IAFBApi::IAFBEvent {
+class AFBEventImpl : public vshlcore::common::interfaces::IAFBApi::IAFBEvent {
 public:
   static unique_ptr<AFBEventImpl>
-  create(shared_ptr<vshl::common::interfaces::ILogger> logger, AFB_ApiT api,
+  create(shared_ptr<vshlcore::common::interfaces::ILogger> logger, AFB_ApiT api,
          const string &eventName);
 
   // Destructor
@@ -46,12 +46,12 @@ public:
   string getName() const override;
   bool isValid() override;
   int publishEvent(struct json_object *payload) override;
-  bool subscribe(vshl::common::interfaces::IAFBRequest &request) override;
-  bool unsubscribe(vshl::common::interfaces::IAFBRequest &request) override;
+  bool subscribe(vshlcore::common::interfaces::IAFBRequest &request) override;
+  bool unsubscribe(vshlcore::common::interfaces::IAFBRequest &request) override;
   /// @c IAFBEvent implementation }
 
 private:
-  AFBEventImpl(shared_ptr<vshl::common::interfaces::ILogger> logger,
+  AFBEventImpl(shared_ptr<vshlcore::common::interfaces::ILogger> logger,
                AFB_ApiT api, const string &eventName);
 
   // Make the event. This is a lazy make that happens
@@ -68,10 +68,10 @@ private:
   string mEventName;
 
   // Logger
-  shared_ptr<vshl::common::interfaces::ILogger> mLogger;
+  shared_ptr<vshlcore::common::interfaces::ILogger> mLogger;
 };
 
 } // namespace afb
-} // namespace vshl
+} // namespace vshlcore
 
 #endif // VSHL_AFB_EVENT_H_
diff --git a/src/plugins/afb/src/AFBEventImpl.cpp b/src/plugins/afb/src/AFBEventImpl.cpp
index e3c902d..b7837bb 100644
--- a/src/plugins/afb/src/AFBEventImpl.cpp
+++ b/src/plugins/afb/src/AFBEventImpl.cpp
@@ -14,23 +14,22 @@
  */
 #include "afb/include/AFBEventImpl.h"
 
-static string TAG = "vshl::afb::Event";
+static string TAG = "vshlcore::afb::Event";
 
-using Level = vshl::common::interfaces::ILogger::Level;
-using namespace vshl::common::interfaces;
-
-namespace vshl {
+using Level = vshlcore::common::interfaces::ILogger::Level;
+using namespace vshlcore::common::interfaces;
+namespace vshlcore {
 namespace afb {
 
 unique_ptr<AFBEventImpl> AFBEventImpl::create(
-    shared_ptr<vshl::common::interfaces::ILogger> logger,
+    shared_ptr<vshlcore::common::interfaces::ILogger> logger,
     AFB_ApiT api,
     const string& eventName) {
     return unique_ptr<AFBEventImpl>(new AFBEventImpl(logger, api, eventName));
 }
 
 AFBEventImpl::AFBEventImpl(
-    shared_ptr<vshl::common::interfaces::ILogger> logger,
+    shared_ptr<vshlcore::common::interfaces::ILogger> logger,
     AFB_ApiT api,
     const string& eventName) :
         mLogger(logger),