Commit 5d2cc1f4 authored by Jay Sharma's avatar Jay Sharma Committed by Uze Choi

[Resource-Manipulation] Renamed Resource-Manipulation to Resource-Encapsulation

Change-Id: I2520ee961d6556b26c3ba52be8e6d16238615d30
Signed-off-by: default avatarJay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1888Tested-by: default avatarjenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: default avatarUze Choi <uzchoi@samsung.com>
parent cc225de4
......@@ -42,9 +42,9 @@ if target_os not in ['arduino','darwin','ios']:
if target_os not in ['android', 'tizen']:
SConscript('notification-manager/SConscript')
# Build resource-manipulation project
# Build resource-encapsulation project
if target_os not in ['android', 'tizen']:
SConscript('resource-manipulation/SConscript')
SConscript('resource-encapsulation/SConscript')
#else:
# SConscript('notification-manager/SampleApp/arduino/SConscript')
......@@ -42,13 +42,13 @@ target_os = env.get('TARGET_OS')
# Build flags
######################################################################
notimgr_env.AppendUnique(CPPPATH = ['NotificationManager/include'])
notimgr_env.AppendUnique(CPPPATH = ['../resource-manipulation/include'])
notimgr_env.AppendUnique(CPPPATH = ['../resource-manipulation/src/common/primitiveResource/include'])
notimgr_env.AppendUnique(CPPPATH = ['../resource-manipulation/src/serverBuilder/include'])
notimgr_env.AppendUnique(CPPPATH = ['../resource-manipulation/src/resourceBroker/include'])
notimgr_env.AppendUnique(CPPPATH = ['../resource-manipulation/src/resourceCache/include'])
notimgr_env.AppendUnique(CPPPATH = ['../resource-manipulation/src/common/expiryTimer/include'])
notimgr_env.AppendUnique(CPPPATH = ['../resource-manipulation/src/common/expiryTimer/src'])
notimgr_env.AppendUnique(CPPPATH = ['../resource-encapsulation/include'])
notimgr_env.AppendUnique(CPPPATH = ['../resource-encapsulation/src/common/primitiveResource/include'])
notimgr_env.AppendUnique(CPPPATH = ['../resource-encapsulation/src/serverBuilder/include'])
notimgr_env.AppendUnique(CPPPATH = ['../resource-encapsulation/src/resourceBroker/include'])
notimgr_env.AppendUnique(CPPPATH = ['../resource-encapsulation/src/resourceCache/include'])
notimgr_env.AppendUnique(CPPPATH = ['../resource-encapsulation/src/common/expiryTimer/include'])
notimgr_env.AppendUnique(CPPPATH = ['../resource-encapsulation/src/common/expiryTimer/src'])
#notimgr_env.AppendUnique(CPPPATH = ['../../extlibs/cjson'])
#notimgr_env.AppendUnique(CPPPATH = ['../../resource/csdk/logger/include'])
notimgr_env.PrependUnique(LIBS = [
......
== Brief Guide to Service Basis
Service Basis provides common functions such as resource broker, cache, resource container.
resource encapsulation provides common functions such as resource broker, cache, resource container.
1. resourceBroker
resourceBroker checks and monitors the status of resources.
......@@ -8,7 +8,7 @@ This module notifies the change of reachability of selected resource to users.
2. resourceCache
resourceCache provides the up-to-date "DATA" of remote resource to users.
It tracks the most recent value of the selected resource and notifies to users according to the request notifying policy.
It tracks the most recent value of the selected resource and notifies to users according to called API
3. resourceContainer
Need to be updated.
......@@ -19,7 +19,7 @@
#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
######################################################################
# Resource-manipulation build script
# Resource-encapsulation build script
######################################################################
import platform
Import('env')
......
......@@ -21,11 +21,11 @@
/**
* @file
*
* This file defines a class to handle exception thrown for resource manipulation.
* This file defines a class to handle exception thrown for resource encapsulation.
*/
#ifndef RES_MANIPULATION_RCSEXCEPTION_H
#define RES_MANIPULATION_RCSEXCEPTION_H
#ifndef RES_ENCAPSULATION_RCSEXCEPTION_H
#define RES_ENCAPSULATION_RCSEXCEPTION_H
#include <string>
......@@ -119,4 +119,4 @@ namespace OIC
}
}
#endif // RES_MANIPULATION_RCSEXCEPTION_H
#endif // RES_ENCAPSULATION_RCSEXCEPTION_H
......@@ -18,8 +18,8 @@
//
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
#ifndef RES_MANIPULATION_RESOURCEATTRIBUTES_H
#define RES_MANIPULATION_RESOURCEATTRIBUTES_H
#ifndef RES_ENCAPSULATION_RESOURCEATTRIBUTES_H
#define RES_ENCAPSULATION_RESOURCEATTRIBUTES_H
// To avoid conflict using different boost::variant configuration with OC.
// It causes compile errors.
......@@ -750,4 +750,4 @@ namespace OIC
}
}
#endif // RES_MANIPULATION_RESOURCEATTRIBUTES_H
#endif // RES_ENCAPSULATION_RESOURCEATTRIBUTES_H
......@@ -23,7 +23,7 @@
*
* This file contains the Resource Client APIs provided to the developers.
* It is a common API layer for the Resource Broker and Resource Cache module of Resource
* Manipulation layer.
* Encapsulation layer.
*/
#ifndef RESOURCE_CLIENT_H_
......
......@@ -59,7 +59,7 @@
</bundle>
<!--<bundle>
<id>oic.bundle.hueJavaSample</id>
<path>../../../../../../../../service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/target/hue-0.1-jar-with-dependencies.jar</path>
<path>../../../../../../../../service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/target/hue-0.1-jar-with-dependencies.jar</path>
<libraryPath>.</libraryPath>
<uri>/hueJava</uri>
<activator>org.iotivity.bundle.hue.HueBundleActivator</activator>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment