Project structure refactoring.

diff --git a/device_core/CMakeLists.txt b/device_core/CMakeLists.txt
index 30f14fc..41ad4b3 100644 (file)
--- a/device_core/CMakeLists.txt
+++ b/device_core/CMakeLists.txt
@@ -1,8 +1,10 @@
 cmake_minimum_required (VERSION 2.8)
 
 SET (PROJECT_ROOT ${CMAKE_CURRENT_LIST_DIR})
-SET (NETWORK_MANAGER_LIB ${PROJECT_ROOT}/nmlib)
-SET (NETWORK_MANAGER_LIB_PROJECT_NAME nmlib)
+SET (CTRL_APP_LIB ${PROJECT_ROOT}/ctrl_app_lib)
+SET (CTRL_APP_LIB_PROJECT_NAME nmlib)
+SET (IOTIVITY_LIB_PROJECT_NAME iotivity)
+SET (AGENT_LIB_PROJECT_NAME agent_policy)
 
 if (DEFINED DEBUG)
 SET (CMAKE_BUILD_TYPE "Debug")
@@ -89,7 +91,6 @@ endif()
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -D__LOGGING__ ")
 
 include_directories(common/inc)
-include_directories(nmlib/include)
 
 message(STATUS "EXTRA_CFLAGS: " ${EXTRA_CFLAGS})
 
@@ -101,6 +102,8 @@ if("${FLAVOR}" STREQUAL "UBUNTU")
        add_subdirectory(secserver)
 endif()
 
-add_subdirectory(nmlib)
+add_subdirectory(agent_lib)
+add_subdirectory(ctrl_app_lib)
+add_subdirectory(iotivity_lib)
 add_subdirectory(utest)
 add_subdirectory(nmdaemon)

diff --git a/device_core/agent_lib/CMakeLists.txt b/device_core/agent_lib/CMakeLists.txt
new file mode 100644 (file)
index 0000000..91d77d4
--- /dev/null
+++ b/device_core/agent_lib/CMakeLists.txt
@@ -0,0 +1,22 @@
+get_filename_component(ProjectId ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+project(${AGENT_LIB_PROJECT_NAME})
+
+include_directories (
+       inc
+       ../iotivity_lib/inc
+       ../ctrl_app_lib/inc
+)
+
+FILE(GLOB SRCS src/*.cpp)
+
+add_library (${PROJECT_NAME} ${SRCS})
+
+target_link_libraries(${PROJECT_NAME}
+       ${IOTIVITY_LIB_PROJECT_NAME}
+)
+
+install(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR})
+#install(FILES tests.manifest DESTINATION ${MANIFESTDIR})
+
+message(STATUS "Configuring: " ${ProjectId})
+message(STATUS "CMAKE_CXX_FLAGS: " ${CMAKE_CXX_FLAGS})

diff --git a/device_core/nmlib/json_policy/inc/json_policy.h b/device_core/agent_lib/inc/json_policy.h
similarity index 99%
rename from device_core/nmlib/json_policy/inc/json_policy.h
rename to device_core/agent_lib/inc/json_policy.h
index 2f2ed36..f39523a 100644 (file)
--- a/device_core/nmlib/json_policy/inc/json_policy.h
+++ b/device_core/agent_lib/inc/json_policy.h
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <vector>
-#include "../../include/iotivity.h"
+#include "iotivity.h"
 
 using namespace std;
 

diff --git a/device_core/nmlib/json_policy/src/json_policy.cpp b/device_core/agent_lib/src/json_policy.cpp
similarity index 99%
rename from device_core/nmlib/json_policy/src/json_policy.cpp
rename to device_core/agent_lib/src/json_policy.cpp
index b3e9db2..3197c38 100644 (file)
--- a/device_core/nmlib/json_policy/src/json_policy.cpp
+++ b/device_core/agent_lib/src/json_policy.cpp
@@ -338,7 +338,7 @@ PolicyList::PolicyList(vector<PolicyEnforcement> list_, string &json) : list(lis
 // ##########################################################################
 // ##########################################################################
 
-void json_test()
+void internal_json_test()
 {
        try {
 

diff --git a/device_core/ctrl_app_lib/CMakeLists.txt b/device_core/ctrl_app_lib/CMakeLists.txt
new file mode 100644 (file)
index 0000000..75aeac2
--- /dev/null
+++ b/device_core/ctrl_app_lib/CMakeLists.txt
@@ -0,0 +1,27 @@
+cmake_minimum_required (VERSION 2.8)
+
+project (${CTRL_APP_LIB_PROJECT_NAME})
+
+add_definitions(-DPS_PATH=${LIBDIR})
+
+include_directories(
+       ../iotivity_lib/inc
+       inc
+)
+
+#add_dependencies (${IOTIVITY_LIB_PROJECT_NAME})
+
+FILE(GLOB CTRL_APP_SUPPORT_SRCS src/*.cpp)
+
+SET( LIB_SOURCES 
+    ${CTRL_APP_SUPPORT_SRCS}
+)
+
+add_library(${PROJECT_NAME} SHARED ${LIB_SOURCES})
+
+target_link_libraries(${PROJECT_NAME}
+       ${IOTIVITY_LIB_PROJECT_NAME}
+)
+
+install(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR})
+install(FILES ../NetworkManager.manifest DESTINATION ${MANIFESTDIR})

diff --git a/device_core/nmlib/include/nmlib.h b/device_core/ctrl_app_lib/inc/nmlib.h
similarity index 100%
rename from device_core/nmlib/include/nmlib.h
rename to device_core/ctrl_app_lib/inc/nmlib.h

diff --git a/device_core/nmlib/ctrl_app/src/iot_dev_manager.cpp b/device_core/ctrl_app_lib/src/ctrl_app_support.cpp
similarity index 100%
rename from device_core/nmlib/ctrl_app/src/iot_dev_manager.cpp
rename to device_core/ctrl_app_lib/src/ctrl_app_support.cpp

diff --git a/device_core/iotivity_lib/CMakeLists.txt b/device_core/iotivity_lib/CMakeLists.txt
new file mode 100644 (file)
index 0000000..fdab35f
--- /dev/null
+++ b/device_core/iotivity_lib/CMakeLists.txt
@@ -0,0 +1,32 @@
+cmake_minimum_required (VERSION 2.8)
+
+project (${IOTIVITY_LIB_PROJECT_NAME})
+
+add_definitions(-DPS_PATH=${LIBDIR})
+
+include_directories(
+       ../common/inc
+       inc
+       easy-setup/inc
+       easy-setup/enrollee/inc
+       easy-setup/mediator/richsdk/inc
+       ../ctrl_app_lib/inc
+)
+
+SET (CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -fPIC ")
+
+add_subdirectory(easy-setup/mediator/richsdk)
+
+FILE(GLOB IOTIVITY_SRCS src/*.cpp)
+
+SET( LIB_SOURCES 
+       ${IOTIVITY_SRCS}
+)
+
+add_library(${PROJECT_NAME} STATIC ${LIB_SOURCES})
+
+target_link_libraries(${PROJECT_NAME}
+       oc octbstack oc_logger resource_directory connectivity_abstraction
+       ESEnrolleeSDK
+       richsdk
+)

diff --git a/device_core/nmlib/easy-setup/enrollee/CMakeLists.txt b/device_core/iotivity_lib/easy-setup/enrollee/CMakeLists.txt
similarity index 100%
rename from device_core/nmlib/easy-setup/enrollee/CMakeLists.txt
rename to device_core/iotivity_lib/easy-setup/enrollee/CMakeLists.txt

diff --git a/device_core/nmlib/easy-setup/enrollee/inc/ESEnrolleeCommon.h b/device_core/iotivity_lib/easy-setup/enrollee/inc/ESEnrolleeCommon.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/enrollee/inc/ESEnrolleeCommon.h
rename to device_core/iotivity_lib/easy-setup/enrollee/inc/ESEnrolleeCommon.h

diff --git a/device_core/nmlib/easy-setup/enrollee/inc/easysetup.h b/device_core/iotivity_lib/easy-setup/enrollee/inc/easysetup.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/enrollee/inc/easysetup.h
rename to device_core/iotivity_lib/easy-setup/enrollee/inc/easysetup.h

diff --git a/device_core/nmlib/easy-setup/enrollee/src/easysetup.c b/device_core/iotivity_lib/easy-setup/enrollee/src/easysetup.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/enrollee/src/easysetup.c
rename to device_core/iotivity_lib/easy-setup/enrollee/src/easysetup.c

diff --git a/device_core/nmlib/easy-setup/enrollee/src/resourcehandler.c b/device_core/iotivity_lib/easy-setup/enrollee/src/resourcehandler.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/enrollee/src/resourcehandler.c
rename to device_core/iotivity_lib/easy-setup/enrollee/src/resourcehandler.c

diff --git a/device_core/nmlib/easy-setup/enrollee/src/resourcehandler.h b/device_core/iotivity_lib/easy-setup/enrollee/src/resourcehandler.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/enrollee/src/resourcehandler.h
rename to device_core/iotivity_lib/easy-setup/enrollee/src/resourcehandler.h

diff --git a/device_core/nmlib/easy-setup/inc/escommon.h b/device_core/iotivity_lib/easy-setup/inc/escommon.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/inc/escommon.h
rename to device_core/iotivity_lib/easy-setup/inc/escommon.h

diff --git a/device_core/nmlib/easy-setup/mediator/richsdk/CMakeLists.txt b/device_core/iotivity_lib/easy-setup/mediator/richsdk/CMakeLists.txt
similarity index 100%
rename from device_core/nmlib/easy-setup/mediator/richsdk/CMakeLists.txt
rename to device_core/iotivity_lib/easy-setup/mediator/richsdk/CMakeLists.txt

diff --git a/device_core/nmlib/easy-setup/mediator/richsdk/inc/ESRichCommon.h b/device_core/iotivity_lib/easy-setup/mediator/richsdk/inc/ESRichCommon.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/mediator/richsdk/inc/ESRichCommon.h
rename to device_core/iotivity_lib/easy-setup/mediator/richsdk/inc/ESRichCommon.h

diff --git a/device_core/nmlib/easy-setup/mediator/richsdk/inc/EasySetup.h b/device_core/iotivity_lib/easy-setup/mediator/richsdk/inc/EasySetup.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/mediator/richsdk/inc/EasySetup.h
rename to device_core/iotivity_lib/easy-setup/mediator/richsdk/inc/EasySetup.h

diff --git a/device_core/nmlib/easy-setup/mediator/richsdk/inc/RemoteEnrollee.h b/device_core/iotivity_lib/easy-setup/mediator/richsdk/inc/RemoteEnrollee.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/mediator/richsdk/inc/RemoteEnrollee.h
rename to device_core/iotivity_lib/easy-setup/mediator/richsdk/inc/RemoteEnrollee.h

diff --git a/device_core/nmlib/easy-setup/mediator/richsdk/src/CloudResource.cpp b/device_core/iotivity_lib/easy-setup/mediator/richsdk/src/CloudResource.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/mediator/richsdk/src/CloudResource.cpp
rename to device_core/iotivity_lib/easy-setup/mediator/richsdk/src/CloudResource.cpp

diff --git a/device_core/nmlib/easy-setup/mediator/richsdk/src/CloudResource.h b/device_core/iotivity_lib/easy-setup/mediator/richsdk/src/CloudResource.h
similarity index 100%
rename from device_core/nmlib/easy-setup/mediator/richsdk/src/CloudResource.h
rename to device_core/iotivity_lib/easy-setup/mediator/richsdk/src/CloudResource.h

diff --git a/device_core/nmlib/easy-setup/mediator/richsdk/src/ESException.cpp b/device_core/iotivity_lib/easy-setup/mediator/richsdk/src/ESException.cpp
similarity index 100%
rename from device_core/nmlib/easy-setup/mediator/richsdk/src/ESException.cpp
rename to device_core/iotivity_lib/easy-setup/mediator/richsdk/src/ESException.cpp

diff --git a/device_core/nmlib/easy-setup/mediator/richsdk/src/ESException.h b/device_core/iotivity_lib/easy-setup/mediator/richsdk/src/ESException.h
similarity index 100%
rename from device_core/nmlib/easy-setup/mediator/richsdk/src/ESException.h
rename to device_core/iotivity_lib/easy-setup/mediator/richsdk/src/ESException.h

diff --git a/device_core/nmlib/easy-setup/mediator/richsdk/src/EasySetup.cpp b/device_core/iotivity_lib/easy-setup/mediator/richsdk/src/EasySetup.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/mediator/richsdk/src/EasySetup.cpp
rename to device_core/iotivity_lib/easy-setup/mediator/richsdk/src/EasySetup.cpp

diff --git a/device_core/nmlib/easy-setup/mediator/richsdk/src/EnrolleeResource.cpp b/device_core/iotivity_lib/easy-setup/mediator/richsdk/src/EnrolleeResource.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/mediator/richsdk/src/EnrolleeResource.cpp
rename to device_core/iotivity_lib/easy-setup/mediator/richsdk/src/EnrolleeResource.cpp

diff --git a/device_core/nmlib/easy-setup/mediator/richsdk/src/EnrolleeResource.h b/device_core/iotivity_lib/easy-setup/mediator/richsdk/src/EnrolleeResource.h
similarity index 100%
rename from device_core/nmlib/easy-setup/mediator/richsdk/src/EnrolleeResource.h
rename to device_core/iotivity_lib/easy-setup/mediator/richsdk/src/EnrolleeResource.h

diff --git a/device_core/nmlib/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp b/device_core/iotivity_lib/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp
rename to device_core/iotivity_lib/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp

diff --git a/device_core/nmlib/easy-setup/mediator/richsdk/src/EnrolleeSecurity.h b/device_core/iotivity_lib/easy-setup/mediator/richsdk/src/EnrolleeSecurity.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/mediator/richsdk/src/EnrolleeSecurity.h
rename to device_core/iotivity_lib/easy-setup/mediator/richsdk/src/EnrolleeSecurity.h

diff --git a/device_core/nmlib/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp b/device_core/iotivity_lib/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from device_core/nmlib/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp
rename to device_core/iotivity_lib/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp

diff --git a/device_core/nmlib/IoT/inc/IOT_DeviceFinder.h b/device_core/iotivity_lib/inc/IOT_DeviceFinder.h
similarity index 100%
rename from device_core/nmlib/IoT/inc/IOT_DeviceFinder.h
rename to device_core/iotivity_lib/inc/IOT_DeviceFinder.h

diff --git a/device_core/nmlib/include/iotdevice.h b/device_core/iotivity_lib/inc/iotdevice.h
similarity index 100%
rename from device_core/nmlib/include/iotdevice.h
rename to device_core/iotivity_lib/inc/iotdevice.h

diff --git a/device_core/nmlib/IoT/inc/iotdevice_impl.h b/device_core/iotivity_lib/inc/iotdevice_impl.h
similarity index 100%
rename from device_core/nmlib/IoT/inc/iotdevice_impl.h
rename to device_core/iotivity_lib/inc/iotdevice_impl.h

diff --git a/device_core/nmlib/include/iotivity.h b/device_core/iotivity_lib/inc/iotivity.h
similarity index 97%
rename from device_core/nmlib/include/iotivity.h
rename to device_core/iotivity_lib/inc/iotivity.h
index f373323..6d5d592 100644 (file)
--- a/device_core/nmlib/include/iotivity.h
+++ b/device_core/iotivity_lib/inc/iotivity.h
@@ -1,9 +1,9 @@
 #ifndef __IOTIVITY_H__
 #define __IOTIVITY_H__
 
-#include "nmlib.h"
 #include "nmexceptions.h"
 #include "iotdevice.h"
+#include "nmlib.h"
 #include <memory>
 #include <map>
 #include <functional>
@@ -14,6 +14,8 @@ namespace NetworkManager
 typedef std::map<std::string, std::shared_ptr<IoTDevice> > IoTDevicesMap;
 
 typedef std::function<void(const std::string&, bool)> PresenceHook;
+constexpr char NOTIFICATION_URI[] = "/secserver/notification";
+constexpr char NOTIFICATION_TYPE[] = "secserver.notification";
 
 /**
  * @brief The OAuthCredential struct contains information about current session with cloud server. Filled after signIn().

diff --git a/device_core/nmlib/include/nmexceptions.h b/device_core/iotivity_lib/inc/nmexceptions.h
similarity index 100%
rename from device_core/nmlib/include/nmexceptions.h
rename to device_core/iotivity_lib/inc/nmexceptions.h

diff --git a/device_core/nmlib/IoT/src/IOT_DeviceFinder.cpp b/device_core/iotivity_lib/src/IOT_DeviceFinder.cpp
similarity index 100%
rename from device_core/nmlib/IoT/src/IOT_DeviceFinder.cpp
rename to device_core/iotivity_lib/src/IOT_DeviceFinder.cpp

diff --git a/device_core/nmlib/IoT/src/iotdevice_impl.cpp b/device_core/iotivity_lib/src/iotdevice_impl.cpp
similarity index 100%
rename from device_core/nmlib/IoT/src/iotdevice_impl.cpp
rename to device_core/iotivity_lib/src/iotdevice_impl.cpp

diff --git a/device_core/nmlib/IoT/src/iotivity.cpp b/device_core/iotivity_lib/src/iotivity.cpp
similarity index 99%
rename from device_core/nmlib/IoT/src/iotivity.cpp
rename to device_core/iotivity_lib/src/iotivity.cpp
index 3b40e71..b2fa4ce 100644 (file)
--- a/device_core/nmlib/IoT/src/iotivity.cpp
+++ b/device_core/iotivity_lib/src/iotivity.cpp
@@ -7,6 +7,7 @@
 #include <functional>
 #include <thread>
 #include <chrono>
+#include "nmlib.h"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wreorder"
@@ -15,8 +16,6 @@
 #pragma GCC diagnostic pop
 #include <logging.h>
 
-#include "notification_resource.h"
-
 using namespace std;
 using namespace OC;
 #define TAG "NetworkManager"
@@ -29,7 +28,7 @@ const std::string SIGNUP = "Sign up";
 const std::string SIGNIN = "Sign in";
 const std::string SIGNOUT = "Sign out";
 const std::string NOTIF_FIND = "Notification findResource()";
-const std::string NOTIF_REQUEST = string(OC_RSRVD_WELL_KNOWN_URI) + "?rt=" + NOTIFICATION_TYPE;
+const std::string NOTIF_REQUEST = string(OC_RSRVD_WELL_KNOWN_URI) + "?rt=" + NetworkManager::NOTIFICATION_TYPE;
 
 const std::string REP_LIST{"prslist"};
 

diff --git a/device_core/nmdaemon/CMakeLists.txt b/device_core/nmdaemon/CMakeLists.txt
index 02d7565..8c99b67 100644 (file)
--- a/device_core/nmdaemon/CMakeLists.txt
+++ b/device_core/nmdaemon/CMakeLists.txt
@@ -4,25 +4,25 @@ get_filename_component(ProjectId ${CMAKE_CURRENT_SOURCE_DIR} NAME)
 string(REPLACE " " "_" ProjectId ${ProjectId})
 project(${ProjectId} C CXX)
 
-include_directories(
-        .
-        IoT
-       )
+include_directories( IoT )
 
 file(GLOB IOT_SOURCES IoT/*.cpp IoT/*.c)
 file(GLOB NMDAEMON_SOURCES *.cpp)
-SET(   SOURCES
-           ${IOT_SOURCES}
-           ${NMDAEMON_SOURCES} )
-add_executable(${PROJECT_NAME} ${SOURCES})
-
-target_link_libraries( ${PROJECT_NAME}
-                            pthread
-                           c_common oc octbstack oc_logger resource_directory connectivity_abstraction
-                            ESEnrolleeSDK
-                           )
-
-if(NOT "${FLAVOR}" STREQUAL "UBUNTU")
+
+SET (SOURCES
+       ${IOT_SOURCES}
+       ${NMDAEMON_SOURCES}
+)
+
+add_executable (${PROJECT_NAME} ${SOURCES})
+
+target_link_libraries (${PROJECT_NAME}
+       pthread
+       c_common oc octbstack oc_logger resource_directory connectivity_abstraction
+       ESEnrolleeSDK
+)
+
+if (NOT "${FLAVOR}" STREQUAL "UBUNTU")
     target_link_libraries(${PROJECT_NAME} dlog)
 endif()
 

diff --git a/device_core/nmlib/CMakeLists.txt b/device_core/nmlib/CMakeLists.txt
deleted file mode 100644 (file)
index 7a4e229..0000000
--- a/device_core/nmlib/CMakeLists.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-cmake_minimum_required (VERSION 2.8)
-
-project (${NETWORK_MANAGER_LIB_PROJECT_NAME})
-
-add_definitions(-DPS_PATH=${LIBDIR})
-
-include_directories(
-       include
-       dpm/inc
-       IoT/inc
-       ctrl_app/inc
-       easy-setup/inc
-       easy-setup/enrollee/inc
-       json_policy/inc
-       easy-setup/mediator/richsdk/inc
-       ../secserver
-)
-
-#add_subdirectory(easy-setup/enrollee)
-add_subdirectory(easy-setup/mediator/richsdk)
-
-FILE(GLOB CTRL_APP_SUPPORT_SRCS ctrl_app/src/*.cpp)
-
-FILE(GLOB IOT_SRC IoT/src/*.cpp IoT/src/*.c)
-FILE(GLOB JSON_POLICY_SRC json_policy/src/*.cpp)
-
-if(NOT "${FLAVOR}" STREQUAL "UBUNTU")
-       FILE(GLOB DPM_SRCS dpm/src/*.cpp)
-endif()
-
-SET( LIB_SOURCES 
-       ${DPM_SRCS}
-    ${CTRL_APP_SUPPORT_SRCS}
-       ${IOT_SRC}
-       ${JSON_POLICY_SRC}
-)
-
-add_library(${PROJECT_NAME} SHARED ${LIB_SOURCES})
-
-target_link_libraries(${PROJECT_NAME}
-       curl
-       # iotbridge
-
-       # main iotivity libs
-       oc octbstack oc_logger resource_directory connectivity_abstraction
-
-       # Copy of easy-setup from iotivity-1.2.1
-        # enrollee
-        ESEnrolleeSDK
-        richsdk
-        #ESMediatorRich
-)
-
-if(NOT "${FLAVOR}" STREQUAL "UBUNTU")
-       target_link_libraries(${PROJECT_NAME} dpm)
-endif()
-
-install(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR})
-install(FILES ../NetworkManager.manifest DESTINATION ${MANIFESTDIR})

diff --git a/device_core/nmlib/dpm/.gitignore b/device_core/nmlib/dpm/.gitignore
deleted file mode 100644 (file)
index b4b939f..0000000
--- a/device_core/nmlib/dpm/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Release
-.cproject
-.project
-

diff --git a/device_core/nmlib/include/uuid.h b/device_core/nmlib/include/uuid.h
deleted file mode 100644 (file)
index 3f7dee2..0000000
--- a/device_core/nmlib/include/uuid.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __UUID_H__
-#define __UUID_H__
-
-#include <stdint.h>
-
-
-struct UUID
-{
-    uint32_t timeLow;
-    uint16_t timeMid;
-    uint16_t timeHiAndVersion;
-    uint8_t clockSeqAndNode[8];
-};
-
-#endif // __UUID_H__
\ No newline at end of file

diff --git a/device_core/nmlib/json_policy/.gitignore b/device_core/nmlib/json_policy/.gitignore
deleted file mode 100644 (file)
index b4b939f..0000000
--- a/device_core/nmlib/json_policy/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Release
-.cproject
-.project
-

diff --git a/device_core/nw_daemon/README b/device_core/nw_daemon/README
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/device_core/secserver/CMakeLists.txt b/device_core/secserver/CMakeLists.txt
index e7dc115..02f07a6 100644 (file)
--- a/device_core/secserver/CMakeLists.txt
+++ b/device_core/secserver/CMakeLists.txt
@@ -4,9 +4,14 @@ project(${ProjectId})
 set(app ${ProjectId})
 file(GLOB SRCS *.cpp)
 
-include_directories(./nmlib/include)
+include_directories(
+       ../iotivity_lib/inc
+       ../ctrl_app_lib/inc
+)
 
 add_executable(${app} ${SRCS})
-target_link_libraries(${app} nmlib)
+target_link_libraries(${app}
+       ${IOTIVITY_LIB_PROJECT_NAME}
+)
 
 install(TARGETS ${app} DESTINATION ${TESTS_DIR})

diff --git a/device_core/secserver/notification_resource.cpp b/device_core/secserver/notification_resource.cpp
index d087777..2c8ce40 100644 (file)
--- a/device_core/secserver/notification_resource.cpp
+++ b/device_core/secserver/notification_resource.cpp
@@ -1,3 +1,4 @@
+#include "iotivity.h"
 #include "notification_resource.h"
 
 namespace PH = std::placeholders;
@@ -15,7 +16,7 @@ NotificationResource::NotificationResource(bool isSecured):
     mTime(std::time(nullptr)),
     mTitle(RESOURCE_DEFAULT_TITLE),
     mMessage(RESOURCE_DEFAULT_MESSAGE),
-    mUri(NOTIFICATION_URI),
+    mUri(NetworkManager::NOTIFICATION_URI),
     mResourceHandle(nullptr),
     mIsSecured(isSecured)
 {
@@ -30,7 +31,7 @@ void NotificationResource::registerResource()
     OCStackResult result = OCPlatform::registerResource(
                                mResourceHandle,
                                mUri,
-                               NOTIFICATION_TYPE,
+                               NetworkManager::NOTIFICATION_TYPE,
                                DEFAULT_INTERFACE,
                                resourceCallback,
                                OC_DISCOVERABLE | OC_OBSERVABLE | (mIsSecured ? OC_SECURE : 0)

diff --git a/device_core/secserver/notification_resource.h b/device_core/secserver/notification_resource.h
index bb0a865..e4bf219 100644 (file)
--- a/device_core/secserver/notification_resource.h
+++ b/device_core/secserver/notification_resource.h
@@ -6,9 +6,6 @@
 using namespace OC;
 using namespace std;
 
-static const std::string NOTIFICATION_URI = "/secserver/notification";
-static const std::string NOTIFICATION_TYPE = "secserver.notification";
-
 /**
  * Class that represents /secserver/notification resource.
  */

diff --git a/device_core/utest/CMakeLists.txt b/device_core/utest/CMakeLists.txt
index 1749265..a9dcdd6 100644 (file)
--- a/device_core/utest/CMakeLists.txt
+++ b/device_core/utest/CMakeLists.txt
@@ -3,12 +3,9 @@ string(REPLACE " " "_" ProjectId ${ProjectId})
 project(${ProjectId})
 
 include_directories (
-    ${NETWORK_MANAGER_LIB}/IoT/inc
-    ${NETWORK_MANAGER_LIB}/REST/inc
-    ${NETWORK_MANAGER_LIB}/json_policy/inc
-       ${NETWORK_MANAGER_LIB}/include
-       ${NETWORK_MANAGER_LIB}/easy-setup/inc
-       ${NETWORK_MANAGER_LIB}/easy-setup/enrollee/inc
+       ../ctrl_app_lib/inc
+       ../iotivity_lib/inc
+       ../agent_lib/inc
 )
 
 FILE(GLOB SRCS *.cpp)
@@ -19,7 +16,8 @@ target_link_libraries(${PROJECT_NAME}
     ${GTEST_LIB}
        pthread
        boost_system boost_thread
-       ${NETWORK_MANAGER_LIB_PROJECT_NAME}
+       ${CTRL_APP_LIB_PROJECT_NAME}
+       ${AGENT_LIB_PROJECT_NAME}
 )
 
 install(TARGETS ${PROJECT_NAME} DESTINATION ${TESTS_DIR})

diff --git a/device_core/nmlib/dpm/inc/dpm.h b/dpm/inc/dpm.h
similarity index 100%
rename from device_core/nmlib/dpm/inc/dpm.h
rename to dpm/inc/dpm.h

diff --git a/device_core/nmlib/dpm/src/dpm.cpp b/dpm/src/dpm.cpp
similarity index 100%
rename from device_core/nmlib/dpm/src/dpm.cpp
rename to dpm/src/dpm.cpp