provisioning: Rename some C++ headers to avoid collision with CSDK ones

The name clash only happens
 on case insensitive filesystems (ie HPFS on MacOS),
 there is ambiguity with C header ie:
  ./resource/csdk/security/provisioning/include/ocprovisioningmanager.h
  ./resource/include/OCProvisioningManager.h

Renaming to .hpp suffix prevent the problem.

Note, one other approach would be to use namespaces

Like:
   #include <iotivity/csdk/ocprovisioningmanager.h> vs
   #include <iotivity/oc/ocprovisioningmanager.h> or similar

Change-Id: Ie311344a98fd056e5b54f329819090a36a901589
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14747
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/14747/3
Reviewed-on: https://gerrit.iotivity.org/gerrit/15099
Reviewed-by: Kevin Kane <kkane@microsoft.com>

diff --git a/android/android_api/base/jni/JniDisplayPinListener.h b/android/android_api/base/jni/JniDisplayPinListener.h
index b4fdf9f..b3a3d44 100644 (file)
--- a/android/android_api/base/jni/JniDisplayPinListener.h
+++ b/android/android_api/base/jni/JniDisplayPinListener.h
@@ -19,7 +19,7 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #include <jni.h>
 #include "JniOcStack.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
 
 #ifndef _Included_org_iotivity_base_DisplayPinListener
 #define _Included_org_iotivity_base_DisplayPinListener

diff --git a/android/android_api/base/jni/JniOcCloudProvisioning.h b/android/android_api/base/jni/JniOcCloudProvisioning.h
index 58693c7..52edbe2 100644 (file)
--- a/android/android_api/base/jni/JniOcCloudProvisioning.h
+++ b/android/android_api/base/jni/JniOcCloudProvisioning.h
@@ -21,7 +21,7 @@
 */
 
 #include "JniOcStack.h"
-#include "OCCloudProvisioning.h"
+#include "OCCloudProvisioning.hpp"
 #include "JniOcCloudResultListener.h"
 #include "JniGetAclIdByDeviceListener.h"
 #include <mutex>

diff --git a/android/android_api/base/jni/JniOcProvisioning.h b/android/android_api/base/jni/JniOcProvisioning.h
index bad4a8d..9c293fb 100644 (file)
--- a/android/android_api/base/jni/JniOcProvisioning.h
+++ b/android/android_api/base/jni/JniOcProvisioning.h
@@ -20,7 +20,7 @@
 * //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 */
 #include "JniOcStack.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
 #include "JniSecureUtils.h"
 #include "oxmjustworks.h"
 #include "oxmrandompin.h"

diff --git a/android/android_api/base/jni/JniOcSecureResource.h b/android/android_api/base/jni/JniOcSecureResource.h
index 213f20d..55218e6 100644 (file)
--- a/android/android_api/base/jni/JniOcSecureResource.h
+++ b/android/android_api/base/jni/JniOcSecureResource.h
@@ -22,7 +22,7 @@
 
 #include "JniOcStack.h"
 #include "JniProvisionResultListner.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
 #include <mutex>
 
 #ifndef _Included_org_iotivity_base_OcSecureResource

diff --git a/android/android_api/base/jni/JniPinCheckListener.h b/android/android_api/base/jni/JniPinCheckListener.h
index 74d150d..988401b 100644 (file)
--- a/android/android_api/base/jni/JniPinCheckListener.h
+++ b/android/android_api/base/jni/JniPinCheckListener.h
@@ -21,7 +21,7 @@
 */
 
 #include "JniOcStack.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
 
 #ifndef _Included_org_iotivity_base_PinCheckListener
 #define _Included_org_iotivity_base_PinCheckListener

diff --git a/android/android_api/base/jni/JniProvisionResultListner.h b/android/android_api/base/jni/JniProvisionResultListner.h
index 59a0945..d3d4ac6 100644 (file)
--- a/android/android_api/base/jni/JniProvisionResultListner.h
+++ b/android/android_api/base/jni/JniProvisionResultListner.h
@@ -21,7 +21,7 @@
 */
 #include <jni.h>
 #include "JniOcStack.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
 
 #ifndef _Included_org_iotivity_base_OcProvisioning_JniProvisionResultListner
 #define _Included_org_iotivity_base_OcProvisioning_JniProvisionResultListner

diff --git a/android/android_api/base/jni/JniSecureUtils.h b/android/android_api/base/jni/JniSecureUtils.h
index c7226a5..f6d757e 100644 (file)
--- a/android/android_api/base/jni/JniSecureUtils.h
+++ b/android/android_api/base/jni/JniSecureUtils.h
@@ -21,7 +21,7 @@
 */
 
 #include "JniOcStack.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
 
 class JniSecureUtils
 {

diff --git a/resource/docs/cpp-doc/Doxyfile b/resource/docs/cpp-doc/Doxyfile
index 964164f..3a6f5ae 100644 (file)
--- a/resource/docs/cpp-doc/Doxyfile
+++ b/resource/docs/cpp-doc/Doxyfile
@@ -666,7 +666,7 @@ INPUT                  = . \
                          ../../include/OCResourceRequest.h \
                          ../../include/OCResourceResponse.h \
                          ../../include/OCResource.h \
-                         ../../include/OCProvisioningManager.h \
+                         ../../include/OCProvisioningManager.hpp \
                          ../../csdk/stack/include/octypes.h \
                          ../../csdk/stack/include/ocstackconfig.h \
                          guides \

diff --git a/resource/include/OCCloudProvisioning.h b/resource/include/OCCloudProvisioning.hpp
similarity index 100%
rename from resource/include/OCCloudProvisioning.h
rename to resource/include/OCCloudProvisioning.hpp

diff --git a/resource/include/OCProvisioningManager.h b/resource/include/OCProvisioningManager.hpp
similarity index 100%
rename from resource/include/OCProvisioningManager.h
rename to resource/include/OCProvisioningManager.hpp

diff --git a/resource/provisioning/examples/cloudClient.cpp b/resource/provisioning/examples/cloudClient.cpp
index 3d67d2d..642fe81 100644 (file)
--- a/resource/provisioning/examples/cloudClient.cpp
+++ b/resource/provisioning/examples/cloudClient.cpp
@@ -33,7 +33,7 @@
 #include "cloudAuth.h"
 #include "cloudWrapper.h"
 #include "OCApi.h"
-#include "OCCloudProvisioning.h"
+#include "OCCloudProvisioning.hpp"
 
 #ifdef __unix__
 #include <unistd.h> //for unlink

diff --git a/resource/provisioning/examples/cloudWrapper.cpp b/resource/provisioning/examples/cloudWrapper.cpp
index d7be8fb..8a56411 100644 (file)
--- a/resource/provisioning/examples/cloudWrapper.cpp
+++ b/resource/provisioning/examples/cloudWrapper.cpp
@@ -22,7 +22,7 @@
 
 #include "logger.h"
 #include "occloudprovisioning.h"
-#include "OCCloudProvisioning.h"
+#include "OCCloudProvisioning.hpp"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "utils.h"

diff --git a/resource/provisioning/examples/cloudWrapper.h b/resource/provisioning/examples/cloudWrapper.h
index 51e5538..9fb74f6 100644 (file)
--- a/resource/provisioning/examples/cloudWrapper.h
+++ b/resource/provisioning/examples/cloudWrapper.h
@@ -21,7 +21,7 @@
 #define OC_CLOUD_WRAPPER_H
 
 #include "occloudprovisioning.h"
-#include "OCCloudProvisioning.h"
+#include "OCCloudProvisioning.hpp"
 
 using namespace OC;
 /**

diff --git a/resource/provisioning/examples/provisioningclient.cpp b/resource/provisioning/examples/provisioningclient.cpp
index 03cab4b..c843a8f 100644 (file)
--- a/resource/provisioning/examples/provisioningclient.cpp
+++ b/resource/provisioning/examples/provisioningclient.cpp
@@ -33,7 +33,7 @@
 #include "oic_string.h"
 #include "OCPlatform.h"
 #include "OCApi.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
 #include "oxmjustworks.h"
 #include "oxmrandompin.h"
 #include "aclresource.h"

diff --git a/resource/provisioning/src/OCCloudProvisioning.cpp b/resource/provisioning/src/OCCloudProvisioning.cpp
index 2e6d4a8..295704d 100644 (file)
--- a/resource/provisioning/src/OCCloudProvisioning.cpp
+++ b/resource/provisioning/src/OCCloudProvisioning.cpp
@@ -19,7 +19,7 @@
  * *****************************************************************/
 
 #include "ocstack.h"
-#include "OCCloudProvisioning.h"
+#include "OCCloudProvisioning.hpp"
 
 namespace OC
 {

diff --git a/resource/provisioning/src/OCProvisioningManager.cpp b/resource/provisioning/src/OCProvisioningManager.cpp
index 80421c3..6ab5f6b 100644 (file)
--- a/resource/provisioning/src/OCProvisioningManager.cpp
+++ b/resource/provisioning/src/OCProvisioningManager.cpp
@@ -21,7 +21,7 @@
 #include "ocstack.h"
 #include "srmutility.h"
 #include "base64.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
 
 namespace OC
 {

diff --git a/resource/provisioning/unittests/OCCloudProvisioningTest.cpp b/resource/provisioning/unittests/OCCloudProvisioningTest.cpp
index 81b0ac2..d459277 100755 (executable)
--- a/resource/provisioning/unittests/OCCloudProvisioningTest.cpp
+++ b/resource/provisioning/unittests/OCCloudProvisioningTest.cpp
@@ -24,8 +24,8 @@
 #include <OCPlatform_impl.h>
 #include <oxmjustworks.h>
 #include <oxmrandompin.h>
-#include <OCProvisioningManager.h>
-#include "OCCloudProvisioning.h"
+#include <OCProvisioningManager.hpp>
+#include <OCCloudProvisioning.hpp>
 #include <gtest/gtest.h>
 
 #define TIMEOUT 5

diff --git a/resource/provisioning/unittests/OCProvisioningTest.cpp b/resource/provisioning/unittests/OCProvisioningTest.cpp
index 5642dda..628b3d0 100644 (file)
--- a/resource/provisioning/unittests/OCProvisioningTest.cpp
+++ b/resource/provisioning/unittests/OCProvisioningTest.cpp
@@ -25,7 +25,7 @@
 #include <oxmjustworks.h>
 #include <oxmrandompin.h>
 #include <srmutility.h>
-#include <OCProvisioningManager.h>
+#include <OCProvisioningManager.hpp>
 #include <gtest/gtest.h>
 
 #define TIMEOUT 5

diff --git a/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.h b/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.h
index db9fc7b..2e9b3fa 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.h
+++ b/service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.h
@@ -26,7 +26,7 @@
 #include <condition_variable>
 
 #include "ESRichCommon.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
 
 namespace OIC
 {

diff --git a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator_cpp.cpp b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator_cpp.cpp
index 144685d..9452a3e 100755 (executable)
--- a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator_cpp.cpp
+++ b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator_cpp.cpp
@@ -23,7 +23,7 @@
 
 #include "OCPlatform.h"
 #include "OCApi.h"
-#include "OCProvisioningManager.h"
+#include "OCProvisioningManager.hpp"
 
 #include "EasySetup.h"
 #include "ESRichCommon.h"