Rename from OIC(Open Interconnect Consortium) to OCF(Open Connectivity Foundation)

Change-Id: I883cb5af3b182f3a6e0c0510d4db25af86297c67

diff --git a/common/ic-utils.c b/common/ic-utils.c
index 1d06e1e7f0cf512cbb5ab59eff0638440878d1cb..a7c51d2af75ad5e548b45ac1230420739cd70068 100644 (file)
--- a/common/ic-utils.c
+++ b/common/ic-utils.c
@@ -33,9 +33,13 @@
 #ifdef TZ_VER_3
 static int _ic_oic_feature = -1;
 static const char *IC_FEATURE_OIC = "http://tizen.org/feature/iot.oic";
+static const char *IC_FEATURE_OCF = "http://tizen.org/feature/iot.ocf";
+
 
 static int _ic_oic_security_feature = -1;
 static const char *IC_FEATURE_OIC_SECURITY = "http://tizen.org/feature/iot.oic.security";
+static const char *IC_FEATURE_OCF_SECURITY = "http://tizen.org/feature/iot.ocf.security";
+
 #endif
 
 // TODO: Can't access in user side daemon
@@ -146,8 +150,14 @@ bool ic_utils_check_oic_feature()
 #ifdef TZ_VER_3
        if (_ic_oic_feature < 0) {
                bool feature_supported = false;
-               system_info_get_platform_bool(IC_FEATURE_OIC, &feature_supported);
+               system_info_get_platform_bool(IC_FEATURE_OCF, &feature_supported);
                _ic_oic_feature = feature_supported ? 1 : 0;
+
+               // TODO: Remove this code when applied oic name changes
+               if (_ic_oic_feature == 0) {
+                       system_info_get_platform_bool(IC_FEATURE_OIC, &feature_supported);
+                       _ic_oic_feature = feature_supported ? 1 : 0;
+               }
        }
        return _ic_oic_feature;
 #else
@@ -160,8 +170,14 @@ bool ic_utils_check_oic_security_feature()
 #ifdef TZ_VER_3
        if (_ic_oic_security_feature < 0) {
                bool feature_supported = false;
-               system_info_get_platform_bool(IC_FEATURE_OIC_SECURITY, &feature_supported);
+               system_info_get_platform_bool(IC_FEATURE_OCF_SECURITY, &feature_supported);
                _ic_oic_security_feature = feature_supported ? 1 : 0;
+
+               // TODO: Remove this code when applied oic name changes
+               if (_ic_oic_security_feature == 0) {
+                       system_info_get_platform_bool(IC_FEATURE_OIC_SECURITY, &feature_supported);
+                       _ic_oic_security_feature = feature_supported ? 1 : 0;
+               }
        }
        return _ic_oic_security_feature;
 #else

diff --git a/doc/iotcon_doc.h b/doc/iotcon_doc.h
index 56fc73ea727f7098f50d3e13b5c5085471fb19fe..dea385968359ee4b61a79a370302733086fc3b1e 100644 (file)
--- a/doc/iotcon_doc.h
+++ b/doc/iotcon_doc.h
@@ -28,10 +28,10 @@
  *
  * @section CAPI_IOT_CONNECTIVITY_MODULE_OVERVIEW Overview
  * The iotcon module provides various features based on IoTivity project.\n
- * The IoTivity project is sponsored by the Open Interconnect Consortium
+ * The IoTivity project is sponsored by the Open Connectivity Foundation
  * a group of industry leaders who will be developing a standard specification and
  * certification program to address these challenges.\n
- * See http://iotivity.org and http://openinterconnect.org for more information.
+ * See http://iotivity.org and http://openconnectivity.org for more information.
  *
  * @subsection CAPI_IOT_CONNECTIVITY_MODULE_RESOURCE Resource
  * A Resource is a component in a server that can be viewed and controlled by another client.\n

diff --git a/lib/include/iotcon-constant.h b/lib/include/iotcon-constant.h
index 6190bb3ee8733be928db1e8b776d1852c64824ba..3c156a12da8e2477395a365513962b7a2b6354e7 100644 (file)
--- a/lib/include/iotcon-constant.h
+++ b/lib/include/iotcon-constant.h
@@ -209,7 +209,7 @@ typedef enum {
 typedef enum {
        IOTCON_DEVICE_INFO_NAME = 0, /**< Indicates human friendly name for device */
        IOTCON_DEVICE_INFO_SPEC_VER, /**< Indicates spec version of the core specification */
-       IOTCON_DEVICE_INFO_ID, /**< Indicates unique identifier for OIC device */
+       IOTCON_DEVICE_INFO_ID, /**< Indicates unique identifier for OCF device */
        IOTCON_DEVICE_INFO_DATA_MODEL_VER, /**< Indicates version of the specs this device data model is implemented to */
 } iotcon_device_info_e;
 

diff --git a/lib/include/iotcon.h b/lib/include/iotcon.h
index 6f69e580dfd613703f8785f8115ef5a2ee3214e7..8780ec76d8e1a746e38eb66b050b0c3f81ada00a 100644 (file)
--- a/lib/include/iotcon.h
+++ b/lib/include/iotcon.h
@@ -40,9 +40,9 @@ extern "C" {
  *
  * It is recommended to design feature related codes in your application for reliability.\n
  *
- * If the feature(http://tizen.org/feature/iot.oic.security) for OIC security architecture
+ * If the feature(http://tizen.org/feature/iot.ocf.security) for OCF security architecture
  * is applied, you MUST call iotcon_secure_initialize() instead of iotcon_initialize().
- * Then applications communicate with each other based on OIC security architecture.
+ * Then applications communicate with each other based on OCF security architecture.
  *
  * You can check if a device supports the related features for this API by using @ref CAPI_SYSTEM_SYSTEM_INFO_MODULE, thereby controlling the procedure of your application.\n
  *
@@ -55,7 +55,7 @@ extern "C" {
 
 /**
  * @brief Initializes IoTCon with secure mode.
- * @details Call this function to start IoTCon above OIC security architecture.
+ * @details Call this function to start IoTCon above OCF security architecture.
  *
  * @since_tizen 3.0
  * @privlevel public