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>

1 files changed, 9 insertions, 37 deletions

diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 06ef7a4..49c6a78 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -14,19 +14,18 @@
 # limitations under the License.
 ###########################################################################
 
-PROJECT_TARGET_ADD(vshl-api)
+PROJECT_TARGET_ADD(vshl-core-api)
 
     set(CMAKE_CXX_STANDARD 11)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
     set(CMAKE_CXX_EXTENSIONS OFF)
 
-    set(VSHL_LIB_SRC
-        ${CMAKE_CURRENT_SOURCE_DIR}/VshlApi.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/VshlApi.h
+    set(VSHL_CORE_LIB_SRC
+        ${CMAKE_CURRENT_SOURCE_DIR}/VshlCoreApi.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/VshlCoreApi.h
 
         # Interfaces
         ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/afb/IAFBApi.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/capabilities/ICapability.h
         ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/utilities/events/IEventFilter.h
         ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/utilities/logging/ILogger.h
         ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/voiceagents/IVoiceAgent.h
@@ -59,27 +58,6 @@ PROJECT_TARGET_ADD(vshl-api)
         ${CMAKE_CURRENT_SOURCE_DIR}/core/include/VRRequestProcessorDelegate.h
         ${CMAKE_CURRENT_SOURCE_DIR}/core/src/VRRequestProcessorDelegateImpl.cpp
 
-        #Capabilities
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/CapabilitiesFactory.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/CapabilitiesFactory.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/CapabilityMessagingService.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/CapabilityMessagingService.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/core/include/MessageChannel.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/core/src/MessageChannel.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/core/include/PublisherForwarder.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/core/src/PublisherForwarder.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/core/include/SubscriberForwarder.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/core/src/SubscriberForwarder.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/communication/include/PhoneControlMessages.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/communication/include/PhoneControlCapability.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/communication/src/PhoneControlCapability.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/navigation/include/NavigationMessages.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/navigation/include/NavigationCapability.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/navigation/src/NavigationCapability.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/guimetadata/include/GuiMetadataMessages.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/guimetadata/include/GuiMetadataCapability.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/guimetadata/src/GuiMetadataCapability.cpp
-
         #Utilities
         ${CMAKE_CURRENT_SOURCE_DIR}/utilities/events/EventRouter.h
         ${CMAKE_CURRENT_SOURCE_DIR}/utilities/events/EventRouter.cpp
@@ -91,7 +69,7 @@ PROJECT_TARGET_ADD(vshl-api)
 
     # Define targets
     ADD_LIBRARY(${TARGET_NAME} MODULE
-        ${VSHL_LIB_SRC}
+        ${VSHL_CORE_LIB_SRC}
     )
 
     # VSHL plugin properties
@@ -129,8 +107,8 @@ PROJECT_TARGET_ADD(vshl-api)
 
         include(cmake/gtest.cmake)
 
-        set(VSHL_TEST_SRC ${VSHL_LIB_SRC})
-        list(APPEND VSHL_TEST_SRC
+        set(VSHL_CORE_TEST_SRC ${VSHL_CORE_LIB_SRC})
+        list(APPEND VSHL_CORE_TEST_SRC
             # Main
             ${CMAKE_CURRENT_SOURCE_DIR}/TestMain.cpp
 
@@ -142,14 +120,8 @@ PROJECT_TARGET_ADD(vshl-api)
             ${CMAKE_CURRENT_SOURCE_DIR}/test/mocks/AFBApiMock.h
             ${CMAKE_CURRENT_SOURCE_DIR}/test/mocks/AFBEventMock.h
             ${CMAKE_CURRENT_SOURCE_DIR}/test/mocks/AFBRequestMock.h
-            ${CMAKE_CURRENT_SOURCE_DIR}/test/mocks/CapabilityMock.h
             ${CMAKE_CURRENT_SOURCE_DIR}/test/mocks/VoiceAgentsChangeObserverMock.h
 
-            # Capabilities
-            ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/test/CapabilityMessagingServiceTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/test/PublisherForwarderTest.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/capabilities/test/SubscriberForwarderTest.cpp
-
             # Core
             ${CMAKE_CURRENT_SOURCE_DIR}/core/test/VRRequestTest.cpp
             ${CMAKE_CURRENT_SOURCE_DIR}/core/test/VRRequestProcessorTest.cpp
@@ -160,7 +132,7 @@ PROJECT_TARGET_ADD(vshl-api)
         )
 
         ADD_EXECUTABLE(${TARGET_NAME}_Test
-            ${VSHL_TEST_SRC}
+            ${VSHL_CORE_TEST_SRC}
         )
 
         TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME}_Test
@@ -178,5 +150,5 @@ PROJECT_TARGET_ADD(vshl-api)
         )
 
         ENABLE_TESTING()
-        ADD_TEST(VshlTest ${TARGET_NAME}_Test)
+        ADD_TEST(VshlCoreTest ${TARGET_NAME}_Test)
     endif()
\ No newline at end of file