build: install experimental logging headers

Functions in payload_logging.h can be used in examples,
so it's installed in "experimental" sub namespace
along dependencies.

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: If3a9e4309601c356ab9a2faaa9fbe26283408633
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21195Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

bridging/common/ConcurrentIotivityUtils.cpp

@@ -23,7 +23,7 @@
 #include "octypes.h"
 #include "ConcurrentIotivityUtils.h"
 #include "ocpayload.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "CONCURRENT_IOTIVITY_UTILS"
 

bridging/common/curlClient.cpp

@@ -21,7 +21,7 @@
 
 #include "curlClient.h"
 #include <iostream>
-#include "logger.h"
+#include "experimental/logger.h"
 
 using namespace std;
 using namespace OC::Bridging;

bridging/common/messageHandler.cpp

@@ -33,7 +33,7 @@
 #include "pluginIf.h"
 #include "pluginServer.h"
 #include "cbor.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "StringConstants.h"
 
 #define TAG "MESSAGE_HANDLER"

bridging/common/pipeHandler.cpp

@@ -34,7 +34,7 @@
 #endif
 #include "platform_features.h"
 #include "oic_malloc.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "PIPE_HANDLER"
 

bridging/common/pluginIf.cpp

@@ -33,7 +33,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include "messageHandler.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "mpmErrorCode.h"
 #include "pluginIf.h"

bridging/common/pluginServer.cpp

@@ -38,7 +38,7 @@
 #include "oic_malloc.h"
 #include "pluginIf.h"
 #include "ocpayload.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "WorkQueue.h"
 #include "ConcurrentIotivityUtils.h"
 #include <iostream>

bridging/include/IotivityWorkItem.h

@@ -25,7 +25,7 @@
 #include "ocstack.h"
 #include "octypes.h"
 #include "ocpayload.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include <string>
 
 #define LOG "IOTIVITY_WORK_ITEM"

bridging/mini_plugin_manager/miniPluginManager.cpp

@@ -40,7 +40,7 @@
 #include "pluginIf.h"
 #include "miniPluginManager.h"
 #include "messageHandler.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 pthread_t readResponsethreadhandle;
 

bridging/plugins/hue_plugin/hue_auth_spec.cpp

@@ -39,7 +39,7 @@
 #include "hue_defs.h"
 #include "curlClient.h"
 #include "cJSON.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "HUE_AUTH"
 

bridging/plugins/hue_plugin/hue_file.cpp

@@ -32,7 +32,7 @@
 #include "cJSON.h"
 #include <pthread.h>
 #include <map>
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "HUE_FILE"
 

bridging/plugins/hue_plugin/hue_objects/hue_bridge.cpp

@@ -21,7 +21,7 @@
 
 #include "hue_bridge.h"
 #include "curlClient.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

bridging/plugins/hue_plugin/hue_objects/hue_light.cpp

@@ -30,7 +30,7 @@
 #include "writer.h"
 #include "curlClient.h"
 #include "JsonHelper.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "HUE_LIGHT"
 using namespace rapidjson;

bridging/plugins/hue_plugin/hue_resource.cpp

@@ -44,7 +44,7 @@
 #include <iostream>
 #include <map>
 #include <mutex>
-#include "logger.h"
+#include "experimental/logger.h"
 #include "mpmErrorCode.h"
 #include "pluginServer.h"
 #include "hue_light.h"

bridging/plugins/lifx_plugin/lifxResource.cpp

@@ -34,7 +34,7 @@
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "lifx.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ConcurrentIotivityUtils.h"
 
 using namespace std;

bridging/plugins/lifx_plugin/lifx_objects/lifx.cpp

@@ -32,7 +32,7 @@
 #include <stdexcept>
 #include <iostream>
 #include "lifx.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "LIFX"
 using namespace OC::Bridging;

bridging/plugins/lyric_plugin/honeywellHelpers.cpp

@@ -20,7 +20,7 @@
 //
 
 #include "honeywellHelpers.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include <stdlib.h> // realloc
 #include <string.h> // memcpy
 #include <sstream> // ostringstream

bridging/plugins/lyric_plugin/honeywellResource.cpp

@@ -51,7 +51,7 @@
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "honeywellLyric.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ConcurrentIotivityUtils.h"
 #include "octypes.h"
 #include "ocstack.h"

bridging/plugins/lyric_plugin/honeywell_objects/honeywell.cpp

@@ -32,7 +32,7 @@
 #include "document.h"
 #include "stringbuffer.h"
 #include "writer.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include <math.h>  // for fmin
 #include <sstream> // for stringstream
 #include <map>

bridging/plugins/lyric_plugin/honeywell_objects/honeywellLyric.cpp

@@ -30,7 +30,7 @@
 #include "document.h"
 #include "stringbuffer.h"
 #include "writer.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include <math.h>  // for fmin
 #include <sstream> // for stringstream
 #include <map>

bridging/plugins/lyric_plugin/honeywell_objects/honeywellThermostat.cpp

@@ -31,7 +31,7 @@
 #include "writer.h"
 #include "stringbuffer.h"
 #include "curlClient.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "../honeywellHelpers.h"
 
 #define LOG_TAG "HONEYWELL_THERMOSTAT"

bridging/plugins/nest_plugin/nestResource.cpp

@@ -37,7 +37,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <time.h>
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ConcurrentIotivityUtils.h"
 #include "messageHandler.h"
 #include "ocpayload.h"

bridging/plugins/nest_plugin/nest_objects/nest.cpp

@@ -29,7 +29,7 @@
 #include "stringbuffer.h"
 #include "writer.h"
 #include "JsonHelper.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 using namespace rapidjson;
 using namespace OC::Bridging;

bridging/plugins/nest_plugin/nest_objects/nestThermostat.cpp

@@ -28,7 +28,7 @@
 #include "writer.h"
 #include "stringbuffer.h"
 #include "curlClient.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "NEST_THERMOSTAT"
 

bridging/plugins/stub_plugin/stub_plugin.cpp

@@ -27,7 +27,7 @@
 #include <set>
 #include <assert.h>
 #include <pluginServer.h>
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "STUB_PLUGIN"
 

java/jni/JniCaInterface.c

@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #include <jni.h>
-#include "logger.h"
+#include "experimental/logger.h"
 #include <stdio.h>
 #include "caadapterutils.h"
 #include "cainterface.h"

java/jni/JniOcStack.h

@@ -24,7 +24,7 @@
 #ifdef __ANDROID__
 #include <android/log.h>
 #else
-#include "logger.h"
+#include "experimental/logger.h"
 #endif
 
 #include "OCApi.h"

plugins/samples/linux/IotivityandZigbeeClient.c

@@ -34,9 +34,9 @@
 #include <unistd.h>
 #include <errno.h>
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "oic_string.h"
 
 #define DEFAULT_CONTEXT_VALUE       (0x99)

plugins/samples/linux/IotivityandZigbeeServer.c

@@ -21,7 +21,7 @@
 #include "IotivityandZigbeeServer.h"
 #include <signal.h>
 #include <ocstack.h>
-#include <logger.h>
+#include "experimental/logger.h"
 #include "oic_string.h"
 #include "oic_malloc.h"
 

plugins/src/plugininterface.c

@@ -32,7 +32,7 @@
 #include "oic_malloc.h"
 #include "ocstack.h"
 #include "ocpayload.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include <string.h>
 #include <stdlib.h>

plugins/src/pluginlist.c

@@ -28,7 +28,7 @@
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "pluginlist"
 

plugins/zigbee_wrapper/src/zigbee_wrapper.c

@@ -52,7 +52,7 @@
 #include "ocpayload.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define HexPrepend "0x"
 

plugins/zigbee_wrapper/telegesis_wrapper/src/telegesis_socket.c

@@ -30,7 +30,7 @@
 #include "twsocketlist.h"
 #include "oic_string.h"
 #include "oic_malloc.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "Telegesis_Socket"
 

plugins/zigbee_wrapper/telegesis_wrapper/src/telegesis_wrapper.c

@@ -33,7 +33,7 @@
 
 #include "oic_string.h"
 #include "oic_malloc.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include "twtypes.h"
 #include "telegesis_socket.h"

plugins/zigbee_wrapper/telegesis_wrapper/src/twsocketlist.c

@@ -28,7 +28,7 @@
  */
 
 #include "twsocketlist.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 
 #include <sys/stat.h>

resource/IPCA/samples/ElevatorServer/elevatorserver.cpp

@@ -17,7 +17,7 @@
  *
  ******************************************************************/
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "elevatorserver.h"
 
 using namespace OC;

resource/IPCA/src/app.cpp

@@ -19,7 +19,7 @@
 
 #include "oic_time.h"
 #include "ipcainternal.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 
 // Object that implements interface to IoTivity.
 // @future: Consider having an instance of this per app when there's mechanism to unregister

resource/IPCA/src/inc/ipcainternal.h

@@ -36,7 +36,7 @@
 #include "OCPlatform.h"
 #include "OCApi.h"
 #include "OCProvisioningManager.hpp"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include "oic_malloc.h"
 #include "ipca.h"

resource/IPCA/src/ipca.cpp

@@ -20,7 +20,7 @@
 #include "iotivity_config.h"
 #include "oic_malloc.h"
 #include "ipca.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "ipcainternal.h"
 
 #define OCFFactoryReset     "fr"

resource/IPCA/src/ocfframework.cpp

@@ -29,7 +29,7 @@ using namespace std::placeholders;
 #include "OCApi.h"
 #include "pinoxmcommon.h"
 #include "srmutility.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "oic_platform.h"
 
 #define TAG                "IPCA_OcfFramework"

resource/IPCA/unittests/IPCAElevatorClient.cpp

@@ -25,7 +25,7 @@
 #include <condition_variable>
 
 #include <gtest/gtest.h>
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "octypes.h"
 #include "oic_time.h"
 #include "ipca.h"

resource/IPCA/unittests/ipcaunittests.cpp

@@ -25,7 +25,7 @@
 #include <condition_variable>
 
 #include <gtest/gtest.h>
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "ipca.h"
 #include "testelevatorserver.h"
 #include "testelevatorclient.h"

resource/IPCA/unittests/mockOCProvision.cpp

@@ -20,7 +20,7 @@
 #include "OCPlatform.h"
 #include "OCApi.h"
 #include "OCProvisioningManager.hpp"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include "oic_malloc.h"
 

resource/IPCA/unittests/testelevatorserver.cpp

@@ -17,7 +17,7 @@
  *
  ******************************************************************/
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "OCApi.h"
 #include "testelevatorserver.h"
 #include "ipcatestdata.h"

resource/c_common/SConscript

@@ -224,6 +224,9 @@ common_env.UserInstallTargetHeader(
     'iotivity_commontypes.h', 'c_common', 'iotivity_commontypes.h')
 common_env.UserInstallTargetHeader(
     'iotivity_debug.h', 'c_common', 'iotivity_debug.h')
+common_env.UserInstallTargetHeader(
+    'ocrandom/include/experimental/ocrandom.h', 
+    'c_common/experimental', 'ocrandom.h')
 common_env.UserInstallTargetHeader(
     'platform_features.h', 'c_common', 'platform_features.h')
 common_env.UserInstallTargetHeader(

resource/c_common/ocevent/src/others/ocevent.c

@@ -26,7 +26,7 @@
 #include "oic_malloc.h"
 #include "oic_time.h"
 #include "octhread.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "iotivity_debug.h"
 
 #include <assert.h>

resource/c_common/ocevent/src/windows/ocevent.c

@@ -24,7 +24,7 @@
 
 #include "ocevent.h"
 #include "oic_malloc.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "iotivity_debug.h"
 
 #include <assert.h>

resource/c_common/ocrandom/src/ocrandom.c

@@ -31,7 +31,7 @@
 #endif
 
 #include "iotivity_config.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
@@ -54,7 +54,7 @@
 #include <windows.h>
 #endif
 
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include <stdio.h>
 #include <stdbool.h>
 #include <assert.h>

resource/c_common/ocrandom/test/android/randomtest.cpp

@@ -20,7 +20,7 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 extern "C" {
-    #include "ocrandom.h"
+    #include "experimental/ocrandom.h"
 }
 
 #include <gtest/gtest.h>

resource/c_common/ocrandom/test/arduino/randomtest.cpp

@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "math.h"
 #include <Arduino.h>
 

resource/c_common/ocrandom/test/randomtest.cpp

@@ -21,7 +21,7 @@
 
 
 extern "C" {