From d38788248c5a6443349cbe1eb31412eede8419ad Mon Sep 17 00:00:00 2001 From: Jaehong Jo Date: Mon, 22 Aug 2016 14:57:30 +0900 Subject: [PATCH] Change uri from 'ocf' to 'oic' According to a OCF spec. And associated with the patch below. https://gerrit.iotivity.org/gerrit/#/c/10581/ Change-Id: I74cab69eb1b0a0b241591c0e48ee5fe63ce3f54d Signed-off-by: Jaehong Jo Reviewed-on: https://gerrit.iotivity.org/gerrit/10713 Tested-by: jenkins-iotivity Reviewed-by: Hyuna Jo Reviewed-by: Eunok Shin Reviewed-by: Jee Hyeok Kim Reviewed-by: Jaewook Jung Reviewed-by: Ashok Babu Channa --- resource/csdk/stack/include/octypes.h | 16 ++++++++-------- resource/src/InProcClientWrapper.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resource/csdk/stack/include/octypes.h b/resource/csdk/stack/include/octypes.h index 2c48c45..1a202f1 100644 --- a/resource/csdk/stack/include/octypes.h +++ b/resource/csdk/stack/include/octypes.h @@ -70,15 +70,15 @@ extern "C" { #endif /** MQ Broker URI.*/ -#define OC_RSRVD_WELL_KNOWN_MQ_URI "/ocf/ps" +#define OC_RSRVD_WELL_KNOWN_MQ_URI "/oic/ps" #ifdef WITH_PRESENCE /** Presence URI through which the OIC devices advertise their presence.*/ #define OC_RSRVD_PRESENCE_URI "/oic/ad" -/** Presence URI through which the OCF devices advertise their device presence.*/ -#define OCF_RSRVD_DEVICE_PRESENCE_URI "/ocf/prs" +/** Presence URI through which the OIC devices advertise their device presence.*/ +#define OC_RSRVD_DEVICE_PRESENCE_URI "/oic/prs" /** Sets the default time to live (TTL) for presence.*/ #define OC_DEFAULT_PRESENCE_TTL_SECONDS (60) @@ -155,10 +155,10 @@ extern "C" { #ifdef WITH_MQ /** To represent content type with MQ Broker.*/ -#define OC_RSRVD_RESOURCE_TYPE_MQ_BROKER "ocf.wk.ps" +#define OC_RSRVD_RESOURCE_TYPE_MQ_BROKER "oic.wk.ps" /** To represent content type with MQ Topic.*/ -#define OC_RSRVD_RESOURCE_TYPE_MQ_TOPIC "ocf.wk.ps.topic" +#define OC_RSRVD_RESOURCE_TYPE_MQ_TOPIC "oic.wk.ps.topic" #endif /** To represent interface.*/ @@ -359,13 +359,13 @@ extern "C" { /** Cloud Account */ /** Account URI.*/ -#define OC_RSRVD_ACCOUNT_URI "/ocf/account" +#define OC_RSRVD_ACCOUNT_URI "/oic/account" /** Account session URI.*/ -#define OC_RSRVD_ACCOUNT_SESSION_URI "/ocf/account/session" +#define OC_RSRVD_ACCOUNT_SESSION_URI "/oic/account/session" /** Account token refresh URI.*/ -#define OC_RSRVD_ACCOUNT_TOKEN_REFRESH_URI "/ocf/account/tokenrefresh" +#define OC_RSRVD_ACCOUNT_TOKEN_REFRESH_URI "/oic/account/tokenrefresh" /** ACL group URI.*/ #define OC_RSRVD_ACL_GROUP_URI "/ocf/acl/group" diff --git a/resource/src/InProcClientWrapper.cpp b/resource/src/InProcClientWrapper.cpp index 1ba07f0..4436956 100644 --- a/resource/src/InProcClientWrapper.cpp +++ b/resource/src/InProcClientWrapper.cpp @@ -1214,7 +1214,7 @@ namespace OC std::lock_guard lock(*cLock); std::ostringstream os; - os << host << OCF_RSRVD_DEVICE_PRESENCE_URI; + os << host << OC_RSRVD_DEVICE_PRESENCE_URI; QueryParamsList queryParams({{OC_RSRVD_DEVICE_ID, di}}); std::string url = assembleSetResourceUri(os.str(), queryParams); -- 2.7.4