Remove '/.well-known' from URI 09/10309/2
authorJaehong Jo <jaehong.jo@samsung.com>
Thu, 11 Aug 2016 23:15:02 +0000 (08:15 +0900)
committerJee Hyeok Kim <jihyeok13.kim@samsung.com>
Fri, 12 Aug 2016 01:04:15 +0000 (01:04 +0000)
According to a OCF spec

Change-Id: I54167589ba4fc03282944ecf4ba06e24d83b1de7
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10309
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
resource/csdk/stack/include/octypes.h

index c31affd..7432863 100644 (file)
@@ -69,20 +69,16 @@ extern "C" {
 #define OC_RSRVD_GATEWAY_URI                  "/oic/gateway"
 #endif
 
-#ifdef WITH_MQ
 /** MQ Broker URI.*/
-#define OC_RSRVD_WELL_KNOWN_MQ_URI            "/.well-known/ocf/ps"
-#endif
+#define OC_RSRVD_WELL_KNOWN_MQ_URI            "/ocf/ps"
 
 #ifdef WITH_PRESENCE
 
 /** Presence URI through which the OIC devices advertise their presence.*/
 #define OC_RSRVD_PRESENCE_URI                 "/oic/ad"
 
-#ifdef WITH_CLOUD
 /** Presence URI through which the OCF devices advertise their device presence.*/
-#define OCF_RSRVD_DEVICE_PRESENCE_URI         "/.well-known/ocf/prs"
-#endif
+#define OCF_RSRVD_DEVICE_PRESENCE_URI         "/ocf/prs"
 
 /** Sets the default time to live (TTL) for presence.*/
 #define OC_DEFAULT_PRESENCE_TTL_SECONDS (60)
@@ -363,13 +359,13 @@ extern "C" {
 /** Cloud Account */
 
 /** Account URI.*/
-#define OC_RSRVD_ACCOUNT_URI               "/.well-known/ocf/account"
+#define OC_RSRVD_ACCOUNT_URI               "/ocf/account"
 
 /** Account session URI.*/
-#define OC_RSRVD_ACCOUNT_SESSION_URI       "/.well-known/ocf/account/session"
+#define OC_RSRVD_ACCOUNT_SESSION_URI       "/ocf/account/session"
 
 /** Account token refresh URI.*/
-#define OC_RSRVD_ACCOUNT_TOKEN_REFRESH_URI "/.well-known/ocf/account/tokenrefresh"
+#define OC_RSRVD_ACCOUNT_TOKEN_REFRESH_URI "/ocf/account/tokenrefresh"
 
 /** Defines auth provider. */
 #define OC_RSRVD_AUTHPROVIDER              "authprovider"