build: install experimental logging headers 51/23051/10
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 9 Jun 2017 13:51:56 +0000 (15:51 +0200)
committerPhil Coval <philippe.coval@osg.samsung.com>
Wed, 24 Jan 2018 08:53:55 +0000 (08:53 +0000)
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/21195
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
339 files changed:
bridging/common/ConcurrentIotivityUtils.cpp
bridging/common/curlClient.cpp
bridging/common/messageHandler.cpp
bridging/common/pipeHandler.cpp
bridging/common/pluginIf.cpp
bridging/common/pluginServer.cpp
bridging/include/IotivityWorkItem.h
bridging/mini_plugin_manager/miniPluginManager.cpp
bridging/plugins/hue_plugin/hue_auth_spec.cpp
bridging/plugins/hue_plugin/hue_file.cpp
bridging/plugins/hue_plugin/hue_objects/hue_bridge.cpp
bridging/plugins/hue_plugin/hue_objects/hue_light.cpp
bridging/plugins/hue_plugin/hue_resource.cpp
bridging/plugins/lifx_plugin/lifxResource.cpp
bridging/plugins/lifx_plugin/lifx_objects/lifx.cpp
bridging/plugins/lyric_plugin/honeywellHelpers.cpp
bridging/plugins/lyric_plugin/honeywellResource.cpp
bridging/plugins/lyric_plugin/honeywell_objects/honeywell.cpp
bridging/plugins/lyric_plugin/honeywell_objects/honeywellLyric.cpp
bridging/plugins/lyric_plugin/honeywell_objects/honeywellThermostat.cpp
bridging/plugins/nest_plugin/nestResource.cpp
bridging/plugins/nest_plugin/nest_objects/nest.cpp
bridging/plugins/nest_plugin/nest_objects/nestThermostat.cpp
bridging/plugins/stub_plugin/stub_plugin.cpp
java/jni/JniCaInterface.c
java/jni/JniOcStack.h
plugins/samples/linux/IotivityandZigbeeClient.c
plugins/samples/linux/IotivityandZigbeeServer.c
plugins/src/plugininterface.c
plugins/src/pluginlist.c
plugins/zigbee_wrapper/src/zigbee_wrapper.c
plugins/zigbee_wrapper/telegesis_wrapper/src/telegesis_socket.c
plugins/zigbee_wrapper/telegesis_wrapper/src/telegesis_wrapper.c
plugins/zigbee_wrapper/telegesis_wrapper/src/twsocketlist.c
resource/IPCA/samples/ElevatorServer/elevatorserver.cpp
resource/IPCA/src/app.cpp
resource/IPCA/src/inc/ipcainternal.h
resource/IPCA/src/ipca.cpp
resource/IPCA/src/ocfframework.cpp
resource/IPCA/unittests/IPCAElevatorClient.cpp
resource/IPCA/unittests/ipcaunittests.cpp
resource/IPCA/unittests/mockOCProvision.cpp
resource/IPCA/unittests/testelevatorserver.cpp
resource/c_common/SConscript
resource/c_common/ocrandom/include/experimental/ocrandom.h [moved from resource/c_common/ocrandom/include/ocrandom.h with 100% similarity]
resource/c_common/ocrandom/src/ocrandom.c
resource/c_common/ocrandom/test/android/randomtest.cpp
resource/c_common/ocrandom/test/arduino/randomtest.cpp
resource/c_common/ocrandom/test/randomtest.cpp
resource/c_common/octhread/src/posix/octhread.c
resource/c_common/octhread/src/windows/octhread.c
resource/c_common/oic_malloc/src/oic_malloc.c
resource/c_common/oic_platform/src/oic_platform.c
resource/c_common/oic_platform/src/others/oic_otherplatforms.c
resource/c_common/oic_platform/src/windows/oic_winplatform.cpp
resource/c_common/windows/src/win_sleep.c
resource/csdk/connectivity/common/inc/cacommonutil.h
resource/csdk/connectivity/common/src/caremotehandler.c
resource/csdk/connectivity/common/src/cathreadpool_pthreads.c
resource/csdk/connectivity/common/src/uarraylist.c
resource/csdk/connectivity/common/src/ulinklist.c
resource/csdk/connectivity/common/src/uqueue.c
resource/csdk/connectivity/inc/caadapterutils.h
resource/csdk/connectivity/inc/cafragmentation.h
resource/csdk/connectivity/src/adapter_util/ca_adapter_net_ssl.c
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.c
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.c
resource/csdk/connectivity/src/bt_edr_adapter/caedradapter.c
resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrclient.c
resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrdevicelist.c
resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.c
resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrserver.c
resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrutils.c
resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c
resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.c
resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c
resource/csdk/connectivity/src/bt_le_adapter/android/calestate.c
resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.c
resource/csdk/connectivity/src/bt_le_adapter/arduino/cableclient.cpp
resource/csdk/connectivity/src/bt_le_adapter/arduino/cablenwmonitor.cpp
resource/csdk/connectivity/src/bt_le_adapter/arduino/cableserver.cpp
resource/csdk/connectivity/src/bt_le_adapter/linux/advertisement.c
resource/csdk/connectivity/src/bt_le_adapter/linux/caleinterface.c
resource/csdk/connectivity/src/bt_le_adapter/linux/central.c
resource/csdk/connectivity/src/bt_le_adapter/linux/characteristic.c
resource/csdk/connectivity/src/bt_le_adapter/linux/client.c
resource/csdk/connectivity/src/bt_le_adapter/linux/descriptor.c
resource/csdk/connectivity/src/bt_le_adapter/linux/peripheral.c
resource/csdk/connectivity/src/bt_le_adapter/linux/server.c
resource/csdk/connectivity/src/bt_le_adapter/linux/service.c
resource/csdk/connectivity/src/bt_le_adapter/linux/utils.c
resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.h
resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver.h
resource/csdk/connectivity/src/cablockwisetransfer.c
resource/csdk/connectivity/src/caconnectivitymanager.c
resource/csdk/connectivity/src/cainterfacecontroller.c
resource/csdk/connectivity/src/camessagehandler.c
resource/csdk/connectivity/src/canetworkconfigurator.c
resource/csdk/connectivity/src/caprotocolmessage.c
resource/csdk/connectivity/src/caqueueingthread.c
resource/csdk/connectivity/src/caretransmission.c
resource/csdk/connectivity/src/ip_adapter/android/caifaddrs.c
resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c
resource/csdk/connectivity/src/ip_adapter/arduino/caipadapterutils_eth.cpp
resource/csdk/connectivity/src/ip_adapter/arduino/caipadapterutils_eth.h
resource/csdk/connectivity/src/ip_adapter/arduino/caipclient_eth.cpp
resource/csdk/connectivity/src/ip_adapter/arduino/caipclient_wifi.cpp
resource/csdk/connectivity/src/ip_adapter/arduino/caipnwmonitor_eth.cpp
resource/csdk/connectivity/src/ip_adapter/arduino/caipnwmonitor_wifi.cpp
resource/csdk/connectivity/src/ip_adapter/arduino/caipserver_eth.cpp
resource/csdk/connectivity/src/ip_adapter/arduino/caipserver_wifi.cpp
resource/csdk/connectivity/src/ip_adapter/caipadapter.c
resource/csdk/connectivity/src/ip_adapter/linux/caipnwmonitor.c
resource/csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c
resource/csdk/connectivity/src/ip_adapter/windows/caipnwmonitor.c
resource/csdk/connectivity/src/nfc_adapter/canfcadapter.c
resource/csdk/connectivity/src/ra_adapter/caraadapter.c
resource/csdk/connectivity/src/tcp_adapter/arduino/catcpadapterutils_eth.cpp
resource/csdk/connectivity/src/tcp_adapter/arduino/catcpadapterutils_eth.h
resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c
resource/csdk/connectivity/test/ssladapter_test.cpp
resource/csdk/connectivity/util/inc/caconnectionmanager.h
resource/csdk/connectivity/util/src/btpairing/android/cabtpairing.c
resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleautoconnector.c
resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleconnectionmanager.c
resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerdevice.c
resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/camanagerleutil.c
resource/csdk/connectivity/util/src/camanager/bt_le_manager/tizen/caleconnectionmanager.c
resource/csdk/connectivity/util/src/camanager/caconnectionmanager.c
resource/csdk/connectivity/util/src/camanager/camanagerutil.c
resource/csdk/connectivity/util/src/camanager/camessagearbiter.c
resource/csdk/connectivity/util/src/camanager/capolicymanager.c
resource/csdk/connectivity/util/src/cautilinterface.c
resource/csdk/logger/SConscript
resource/csdk/logger/include/experimental/logger.h [moved from resource/csdk/logger/include/logger.h with 99% similarity]
resource/csdk/logger/include/experimental/logger_types.h [moved from resource/csdk/logger/include/logger_types.h with 100% similarity]
resource/csdk/logger/include/trace.h
resource/csdk/logger/src/logger.c
resource/csdk/logger/src/trace.c
resource/csdk/logger/test/android/loggertests.cpp
resource/csdk/logger/test/arduino/ArduinoLoggerTest.cpp
resource/csdk/logger/test/loggertests.cpp
resource/csdk/resource-directory/samples/rd_publishingClient.cpp
resource/csdk/resource-directory/samples/rd_queryClient.cpp
resource/csdk/resource-directory/src/internal/rd_database.c
resource/csdk/resource-directory/src/rd_client.c
resource/csdk/resource-directory/src/rd_server.c
resource/csdk/resource-directory/unittests/rddatabase.cpp
resource/csdk/resource-directory/unittests/rdtests.cpp
resource/csdk/routing/SConscript
resource/csdk/routing/src/routingmanager.c
resource/csdk/routing/src/routingmanagerinterface.c
resource/csdk/routing/src/routingmessageparser.c
resource/csdk/routing/src/routingtablemanager.c
resource/csdk/routing/src/routingutility.c
resource/csdk/security/include/internal/acl_logging.h
resource/csdk/security/include/internal/crl_logging.h
resource/csdk/security/include/internal/policyengine.h
resource/csdk/security/provisioning/sample/autoprovisioningclient.c
resource/csdk/security/provisioning/sample/certgenerator.cpp
resource/csdk/security/provisioning/sample/cloud/cloudAuth.c
resource/csdk/security/provisioning/sample/cloud/cloudCommon.c
resource/csdk/security/provisioning/sample/cloud/cloudDiscovery.c
resource/csdk/security/provisioning/sample/cloud/cloudResource.c
resource/csdk/security/provisioning/sample/cloud/cloudWrapper.c
resource/csdk/security/provisioning/sample/cloudClient.c
resource/csdk/security/provisioning/sample/cloudServer.c
resource/csdk/security/provisioning/sample/provisioningclient.c
resource/csdk/security/provisioning/sample/sampleserver_justworks.cpp
resource/csdk/security/provisioning/sample/sampleserver_mfg.cpp
resource/csdk/security/provisioning/sample/sampleserver_mvjustworks.cpp
resource/csdk/security/provisioning/sample/sampleserver_preconfpin.cpp
resource/csdk/security/provisioning/sample/sampleserver_randompin.cpp
resource/csdk/security/provisioning/sample/subownerclient.c
resource/csdk/security/provisioning/src/cloud/aclgroup.c
resource/csdk/security/provisioning/src/cloud/aclid.c
resource/csdk/security/provisioning/src/cloud/aclinvite.c
resource/csdk/security/provisioning/src/cloud/crl.c
resource/csdk/security/provisioning/src/cloud/csr.c
resource/csdk/security/provisioning/src/cloud/utils.c
resource/csdk/security/provisioning/src/credentialgenerator.c
resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/otmcontextlist.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/provisioning/src/oxmjustworks.c
resource/csdk/security/provisioning/src/oxmmanufacturercert.c
resource/csdk/security/provisioning/src/oxmpreconfpin.c
resource/csdk/security/provisioning/src/oxmrandompin.c
resource/csdk/security/provisioning/src/pmutility.c
resource/csdk/security/provisioning/src/provisioningdatabasemanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/provisioning/unittest/otmunittest.cpp
resource/csdk/security/provisioning/unittest/sampleserver.cpp
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/amaclresource.c
resource/csdk/security/src/certhelpers.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/crlresource.c
resource/csdk/security/src/csrresource.c
resource/csdk/security/src/deviceonboardingstate.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/occertutility.c
resource/csdk/security/src/ocsecurity.c
resource/csdk/security/src/oxmpincommon.c
resource/csdk/security/src/oxmverifycommon.c
resource/csdk/security/src/pbkdf2.c
resource/csdk/security/src/pkix_interface.c
resource/csdk/security/src/policyengine.c
resource/csdk/security/src/psinterface.c
resource/csdk/security/src/pstatresource.c
resource/csdk/security/src/resourcemanager.c
resource/csdk/security/src/rolesresource.c
resource/csdk/security/src/secureresourcemanager.c
resource/csdk/security/src/srmutility.c
resource/csdk/security/tool/json2cbor.c
resource/csdk/security/tool/svrdbeditor_src/svrdbeditorcred.c
resource/csdk/security/unittest/aclresourcetest.cpp
resource/csdk/security/unittest/amaclresourcetest.cpp
resource/csdk/security/unittest/credentialresource.cpp
resource/csdk/security/unittest/crlresourcetest.cpp
resource/csdk/security/unittest/doxmresource.cpp
resource/csdk/security/unittest/iotvticalendartest.cpp
resource/csdk/stack/SConscript
resource/csdk/stack/include/experimental/payload_logging.h [moved from resource/csdk/stack/include/payload_logging.h with 99% similarity]
resource/csdk/stack/include/internal/ocstackinternal.h
resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/ocserver.cpp
resource/csdk/stack/samples/linux/OCSample/occlient.c
resource/csdk/stack/samples/linux/OCSample/ocserver.c
resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocremoteaccessclient.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocrouting.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp
resource/csdk/stack/samples/linux/secure/common.cpp
resource/csdk/stack/samples/linux/secure/ocamsservice.cpp
resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp
resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp
resource/csdk/stack/samples/tizen/SimpleClientServer/occlient.cpp
resource/csdk/stack/samples/tizen/SimpleClientServer/ocrouting.cpp
resource/csdk/stack/samples/tizen/SimpleClientServer/ocserver.cpp
resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
resource/csdk/stack/src/occlientcb.c
resource/csdk/stack/src/occollection.c
resource/csdk/stack/src/occonnectionmanager.c
resource/csdk/stack/src/ocendpoint.c
resource/csdk/stack/src/ocobserve.c
resource/csdk/stack/src/ocpayload.c
resource/csdk/stack/src/ocpayloadconvert.c
resource/csdk/stack/src/ocpayloadparse.c
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocserverrequest.c
resource/csdk/stack/src/ocsqlite3helper.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/src/oicgroup.c
resource/csdk/stack/src/oickeepalive.c
resource/csdk/stack/src/oicresourcedirectory.c
resource/csdk/stack/test/android/stacktests.cpp
resource/csdk/stack/test/arduino/ArduinoStackTest.cpp
resource/csdk/stack/test/arduino/ocserver.cpp
resource/csdk/stack/test/cbortests.cpp
resource/csdk/stack/test/stacktests.cpp
resource/examples/groupclient.cpp
resource/include/OCSerialization.h
resource/provisioning/examples/cloudAuth.cpp
resource/provisioning/examples/cloudClient.cpp
resource/provisioning/examples/cloudWrapper.cpp
resource/provisioning/examples/provisioningclient.cpp
resource/provisioning/examples/subownerclient.cpp
resource/provisioning/src/OCProvisioningManager.cpp
resource/src/CAManager.cpp
resource/src/InProcClientWrapper.cpp
resource/src/InProcServerWrapper.cpp
resource/src/OCPlatform_impl.cpp
resource/src/OCRepresentation.cpp
resource/unittests/OCRepresentationEncodingTest.cpp
service/coap-http-proxy/samples/proxy_client.c
service/coap-http-proxy/src/CoapHttpHandler.c
service/coap-http-proxy/src/CoapHttpMap.c
service/coap-http-proxy/src/CoapHttpParser.c
service/coap-http-proxy/unittests/CoAPHttpUnitTest.cpp
service/easy-setup/enrollee/src/easysetup.c
service/easy-setup/enrollee/src/resourcehandler.c
service/easy-setup/enrollee/src/resourcehandler.h
service/easy-setup/enrollee/unittests/ESMediatorSimulator.h
service/easy-setup/mediator/richsdk/inc/ESRichCommon.h
service/easy-setup/mediator/richsdk/src/CloudResource.cpp
service/easy-setup/mediator/richsdk/src/EasySetup.cpp
service/easy-setup/mediator/richsdk/src/EnrolleeResource.cpp
service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp
service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp
service/easy-setup/mediator/richsdk/unittests/ESMediatorTest.cpp
service/easy-setup/sampleapp/enrollee/arduino/enrolleewifi.cpp
service/easy-setup/sampleapp/enrollee/linux/easysetup_x.c
service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/easysetup_wifi_conn.c
service/notification/cpp-wrapper/examples/linux/notificationserviceprovider.cpp
service/notification/examples/linux/notificationprovider.c
service/notification/src/common/NSConstants.h
service/notification/src/common/NSUtil.h
service/notification/src/consumer/NSConsumerScheduler.c
service/notification/src/provider/NSProviderCallbackResponse.h
service/notification/src/provider/NSProviderListener.h
service/notification/src/provider/NSProviderNotification.h
service/notification/src/provider/NSProviderResource.h
service/notification/src/provider/NSProviderScheduler.h
service/notification/src/provider/NSProviderSubscription.h
service/notification/src/provider/NSProviderSystem.h
service/resource-container/src/InternalTypes.h
service/resource-encapsulation/src/common/utils/include/ScopeLogger.h
service/resource-encapsulation/src/resourceBroker/include/BrokerTypes.h
service/resource-encapsulation/src/resourceCache/include/CacheTypes.h
service/resource-encapsulation/src/resourceCache/src/DataCache.cpp
service/resource-encapsulation/src/resourceCache/src/ResourceCacheManager.cpp
service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp
service/scene-manager/src/RemoteSceneUtils.h
service/scene-manager/src/SceneUtils.cpp
service/simulator/src/client/get_request_generator.cpp
service/simulator/src/client/post_request_generator.cpp
service/simulator/src/client/put_request_generator.cpp
service/simulator/src/client/request_automation_manager.cpp
service/simulator/src/client/request_sender.cpp
service/simulator/src/client/simulator_remote_resource_impl.cpp
service/simulator/src/common/request_model.cpp
service/simulator/src/common/request_model_builder.cpp
service/simulator/src/common/resource_model_schema_builder.cpp
service/simulator/src/common/simulator_resource_model.cpp
service/simulator/src/server/resource_update_automation.cpp
service/simulator/src/server/resource_update_automation_mngr.cpp
service/simulator/src/server/simulator_collection_resource_impl.cpp
service/simulator/src/server/simulator_resource_factory.cpp
service/simulator/src/server/simulator_single_resource_impl.cpp
tools/tizen/iotivity.spec

index 0c77e4b..c39e110 100644 (file)
@@ -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"
 
index 658619b..6acefa3 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "curlClient.h"
 #include <iostream>
-#include "logger.h"
+#include "experimental/logger.h"
 
 using namespace std;
 using namespace OC::Bridging;
index 904e8c6..1fd7f13 100644 (file)
@@ -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"
index 60a71a1..766d1ed 100644 (file)
@@ -34,7 +34,7 @@
 #endif
 #include "platform_features.h"
 #include "oic_malloc.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "PIPE_HANDLER"
 
index e4b5353..cd49127 100644 (file)
@@ -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"
index 2dfee8a..7af1597 100644 (file)
@@ -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>
index b6cbcaf..d74255a 100644 (file)
@@ -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"
index 12ba830..5bc1304 100644 (file)
@@ -40,7 +40,7 @@
 #include "pluginIf.h"
 #include "miniPluginManager.h"
 #include "messageHandler.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 pthread_t readResponsethreadhandle;
 
index 35d2af7..dbf97c2 100644 (file)
@@ -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"
 
index f9a5701..f669c0d 100644 (file)
@@ -32,7 +32,7 @@
 #include "cJSON.h"
 #include <pthread.h>
 #include <map>
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "HUE_FILE"
 
index 2846cac..493ceb5 100644 (file)
@@ -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>
index 41e7ac6..ad4263f 100644 (file)
@@ -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;
index ca7bcf0..1b6a3c9 100644 (file)
@@ -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"
index 8a33916..bd0caef 100644 (file)
@@ -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;
index cc10d5d..5e1fabf 100644 (file)
@@ -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;
index 07e81be..32608b1 100644 (file)
@@ -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
index f2043f3..976da8d 100644 (file)
@@ -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"
index e14acb1..111f7f5 100644 (file)
@@ -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>
index 3c9d1dd..93f32d9 100644 (file)
@@ -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>
index cd74b89..e34179b 100644 (file)
@@ -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"
index c6b4fd8..4bb1335 100644 (file)
@@ -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"
index 8b40848..d45421a 100644 (file)
@@ -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;
index d6f6a04..6389bd2 100644 (file)
@@ -28,7 +28,7 @@
 #include "writer.h"
 #include "stringbuffer.h"
 #include "curlClient.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "NEST_THERMOSTAT"
 
index b8f26c4..6fe1795 100644 (file)
@@ -27,7 +27,7 @@
 #include <set>
 #include <assert.h>
 #include <pluginServer.h>
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "STUB_PLUGIN"
 
index fab1cc0..9d45c0a 100644 (file)
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #include <jni.h>
-#include "logger.h"
+#include "experimental/logger.h"
 #include <stdio.h>
 #include "caadapterutils.h"
 #include "cainterface.h"
index 1123912..177e925 100644 (file)
@@ -24,7 +24,7 @@
 #ifdef __ANDROID__
 #include <android/log.h>
 #else
-#include "logger.h"
+#include "experimental/logger.h"
 #endif
 
 #include "OCApi.h"
index 04e061d..52fe5ba 100644 (file)
@@ -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)
index aa1e986..4d4dc6c 100644 (file)
@@ -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"
 
index f44c6db..dddcd0e 100644 (file)
@@ -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>
index ed2becc..6fe063f 100644 (file)
@@ -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"
 
index 279a9ba..ae7e7c2 100644 (file)
@@ -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"
 
index a42926d..efbb3b8 100644 (file)
@@ -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"
 
index eb811b7..8c537d4 100644 (file)
@@ -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"
index 0bfa9a8..d72513f 100644 (file)
@@ -28,7 +28,7 @@
  */
 
 #include "twsocketlist.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 
 #include <sys/stat.h>
index 23ad96f..b003c32 100644 (file)
@@ -17,7 +17,7 @@
  *
  ******************************************************************/
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "elevatorserver.h"
 
 using namespace OC;
index bf83cad..16c5eb9 100644 (file)
@@ -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
index 7158e62..a7503cd 100644 (file)
@@ -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"
index 00493cd..6f615d4 100644 (file)
@@ -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"
index 0a3b459..038402e 100644 (file)
@@ -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"
index f9e85d4..abbadbd 100644 (file)
@@ -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"
index c8d6f8c..98479d8 100644 (file)
@@ -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"
index 8bf968e..4e8dac9 100644 (file)
@@ -20,7 +20,7 @@
 #include "OCPlatform.h"
 #include "OCApi.h"
 #include "OCProvisioningManager.hpp"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include "oic_malloc.h"
 
index 2c8de51..1ab9c4c 100644 (file)
@@ -17,7 +17,7 @@
  *
  ******************************************************************/
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "OCApi.h"
 #include "testelevatorserver.h"
 #include "ipcatestdata.h"
index 21c6035..be6e067 100644 (file)
@@ -221,6 +221,9 @@ common_env.InstallTarget(commonlib, 'c_common')
 common_env.UserInstallTargetLib(commonlib, 'c_common')
 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(
index 0b84ddd..c7a7890 100644 (file)
@@ -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>
index caf1cae..cbbe3de 100644 (file)
@@ -20,7 +20,7 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 extern "C" {
-    #include "ocrandom.h"
+    #include "experimental/ocrandom.h"
 }
 
 #include <gtest/gtest.h>
index b4440f6..65c1b68 100644 (file)
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "math.h"
 #include <Arduino.h>
 
index 6b24025..478c3fe 100644 (file)
@@ -21,7 +21,7 @@
 
 
 extern "C" {
-    #include "ocrandom.h"
+    #include "experimental/ocrandom.h"
 }
 
 #include <gtest/gtest.h>
index 587f9c9..a7483ec 100644 (file)
@@ -58,7 +58,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <oic_malloc.h>
-#include "logger.h"
+#include "experimental/logger.h"
 
 /**
  * TAG
index 36e7987..af2888d 100644 (file)
@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <oic_malloc.h>
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "iotivity_debug.h"
 
 #define TAG "OIC_UMUTEX"
index be1f472..e93c7ae 100644 (file)
@@ -32,7 +32,7 @@
 
 // Enable extra debug logging for malloc.  Comment out to disable
 #ifdef ENABLE_MALLOC_DEBUG
-#include "logger.h"
+#include "experimental/logger.h"
 #define TAG "OIC_MALLOC"
 #endif
 
index dadc843..0ab2547 100644 (file)
 #include <stdio.h>
 #include <errno.h>
 #include <mbedtls/md.h>
-#include "logger.h"
+#include "experimental/logger.h"
 #include "iotivity_debug.h"
 #include "oic_platform.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "oic_string.h"
 
 #define TAG "OIC_PLATFORM"
index 07466ee..c10bde9 100644 (file)
@@ -18,7 +18,7 @@
 ******************************************************************/
 #include "iotivity_config.h"
 #include "iotivity_debug.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_platform.h"
 
 #define TAG "OIC_PLATFORM"
index c785056..05109e5 100644 (file)
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <inttypes.h>
-#include "logger.h"
+#include "experimental/logger.h"
 #include "iotivity_debug.h"
 #include "oic_platform.h"
 #include "oic_string.h"
index 43d7194..1be3386 100644 (file)
@@ -22,7 +22,7 @@
 #include <errno.h>
 #include "win_sleep.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 #define TAG  "WIN_SLEEP"
 
 #define NS_PER_MS  (1000000)
index d7abf2d..337c62d 100644 (file)
@@ -22,7 +22,7 @@
 #define CA_COMMON_UTIL_H_
 
 #include "cacommon.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #ifdef __cplusplus
 extern "C"
index 72d72e9..f72b157 100644 (file)
@@ -23,7 +23,7 @@
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "caremotehandler.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "OIC_CA_REMOTE_HANDLER"
 
index 2caa716..5f05f71 100644 (file)
@@ -33,7 +33,7 @@
 #include <winsock2.h>
 #endif
 #include "cathreadpool.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "uarraylist.h"
 #include "octhread.h"
index b42794b..2f3c348 100644 (file)
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "uarraylist.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 
 #define TAG "OIC_UARRAYLIST"
index 7bcad43..aa338d9 100644 (file)
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "ulinklist.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "caadapterutils.h"
 
index 194300a..04b5ac8 100644 (file)
@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 
 /**
index b91581a..4fd7ad0 100644 (file)
@@ -47,7 +47,7 @@
 #endif
 
 #include "cacommon.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include <coap/pdu.h>
 #include "uarraylist.h"
 #include "cacommonutil.h"
index 72ad7b5..6062f82 100644 (file)
@@ -30,7 +30,7 @@
 #define CA_FRAGMENTATION_H_
 
 #include "cacommon.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 /**
  * The maximum port value for BLE packet format
index c1fd537..092addd 100644 (file)
@@ -33,7 +33,7 @@
 #include "cacommon.h"
 #include "caipinterface.h"
 #include "oic_malloc.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "experimental/byte_array.h"
 #include "octhread.h"
 #include "octimer.h"
index d29de99..405852c 100644 (file)
@@ -25,7 +25,7 @@
 #include "caedrinterface.h"
 #include "caedrutils.h"
 #include "caedrclient.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "cathreadpool.h" /* for thread pool */
index c2e17e9..82c1bb1 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "caedrinterface.h"
 #include "caedrnwmonitor.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "cathreadpool.h" /* for thread pool */
 #include "octhread.h"
index c0ca759..f177515 100644 (file)
@@ -25,7 +25,7 @@
 #include "caedrinterface.h"
 #include "caedrutils.h"
 #include "caedrserver.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "cathreadpool.h" /* for thread pool */
 #include "octhread.h"
index 6624642..6ef29f7 100644 (file)
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <android/log.h>
 #include "caedrutils.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "cathreadpool.h"
index 1fade67..124a70d 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "caedrinterface.h"
 #include "caadapterutils.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "caqueueingthread.h"
 #include "oic_malloc.h"
 #include "caremotehandler.h"
index 1124b93..3184088 100644 (file)
@@ -34,7 +34,7 @@
 #include "caedrendpoint.h"
 #include "caadapterutils.h"
 #include "caedrutils.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cacommon.h"
 #include "caedrdevicelist.h"
 
index cd84528..b92a868 100644 (file)
@@ -27,7 +27,7 @@
 #include "caedrdevicelist.h"
 #include "caadapterutils.h"
 #include "caedrutils.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 
 /**
index 319af2b..35541e5 100644 (file)
@@ -27,7 +27,7 @@
 #include "caedrendpoint.h"
 #include "caadapterutils.h"
 #include "caedrutils.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 CAResult_t CAEDRSendData(int serverFD, const char *addr, const void *data, uint32_t dataLength)
 {
index 3e13678..5a353cc 100644 (file)
@@ -30,7 +30,7 @@
 #include "caedrinterface.h"
 #include "caadapterutils.h"
 #include "caedrutils.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "octhread.h"
 #include "cacommon.h"
 #include "caedrdevicelist.h"
index 87bb469..cf5350b 100644 (file)
@@ -30,7 +30,7 @@
 #include "caleinterface.h"
 #include "caadapterutils.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "cathreadpool.h" /* for thread pool */
index 0e1bbf7..40ccd84 100644 (file)
@@ -21,7 +21,7 @@
 #include <jni.h>
 #include <stdio.h>
 #include <android/log.h>
-#include "logger.h"
+#include "experimental/logger.h"
 #include "calenwmonitor.h"
 #include "caleclient.h"
 #include "caleserver.h"
index 91eeef9..2fdf759 100644 (file)
@@ -29,7 +29,7 @@
 #include "caadapterutils.h"
 #include "calestate.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "cathreadpool.h"
 #include "octhread.h"
index 1b83c32..f0a35cd 100644 (file)
@@ -28,7 +28,7 @@
 #include "caadapterutils.h"
 #include "caleutils.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "cathreadpool.h" /* for thread pool */
index c694152..704b989 100644 (file)
@@ -23,7 +23,7 @@
 #include <android/log.h>
 
 #include "caleutils.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cathreadpool.h"
 #include "uarraylist.h"
 #include "caadapterutils.h"
index cf392be..e8659a7 100644 (file)
@@ -20,7 +20,7 @@
 
 
 //logger.h included first to avoid conflict with RBL library PROGMEM attribute
-#include "logger.h"
+#include "experimental/logger.h"
 #include "caleinterface.h"
 
 #define TAG "LEC"
index 1063d34..8614c42 100644 (file)
@@ -19,7 +19,7 @@
 ******************************************************************/
 
 //logger.h included first to avoid conflict with RBL library PROGMEM attribute
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include "caleinterface.h"
 
index c16186b..eb6d513 100644 (file)
@@ -20,7 +20,7 @@
 
 
 //logger.h included first to avoid conflict with RBL library PROGMEM attribute
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include "cableserver.h"
 
index 02b29c1..4aff2ce 100644 (file)
@@ -20,7 +20,7 @@
 #include "gatt_dbus.h"
 
 #include "cagattservice.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include <assert.h>
 
index 87d245c..24fd9cf 100644 (file)
@@ -27,7 +27,7 @@
 #include "cagattservice.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include <string.h>
 #include <strings.h>  // For strcasecmp().
index 7ca88e6..83420a5 100644 (file)
@@ -21,7 +21,7 @@
 #include "bluez.h"
 
 #include "cagattservice.h"  // For CA_GATT_SERVICE_UUID.
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include <stdbool.h>
 #include <assert.h>
index 03fc8c7..a480de2 100644 (file)
@@ -23,7 +23,7 @@
 #include "bluez.h"
 #include "server.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cagattservice.h"
 #include "caremotehandler.h"
 
index 83c8ee1..f60504b 100644 (file)
@@ -23,7 +23,7 @@
 #include "utils.h"
 
 #include "cagattservice.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 
index 9995427..d835402 100644 (file)
@@ -22,7 +22,7 @@
 #include "utils.h"
 #include "bluez.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cagattservice.h"
 
 #include <assert.h>
index 6b70b32..c9f90cf 100644 (file)
@@ -22,7 +22,7 @@
 #include "service.h"
 
 #include "oic_malloc.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include <string.h>
 #include <assert.h>
index 4eab0e8..8191963 100644 (file)
@@ -21,7 +21,7 @@
 #include "service.h"
 #include "peripheral.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include <assert.h>
 
index ac96709..d54b302 100644 (file)
@@ -22,7 +22,7 @@
 #include "bluez.h"
 
 #include "cagattservice.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 
 #include <stdio.h>
index 82536dc..f26f71e 100644 (file)
@@ -19,7 +19,7 @@
 #include "utils.h"
 #include "bluez.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include <assert.h>
 
index 6372429..5c81b7d 100644 (file)
@@ -40,7 +40,7 @@
 #include "caadapterutils.h"
 #include "caleutil.h"
 #include "caadapterinterface.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cathreadpool.h"
 #include "caleinterface.h"
 #include "oic_malloc.h"
index a3fe89f..d983e95 100644 (file)
@@ -36,7 +36,7 @@
 #include <bluetooth_internal.h>
 
 #include "caadapterinterface.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cathreadpool.h"
 #include "caleinterface.h"
 
index 5bbfe24..1ba98cd 100644 (file)
@@ -43,7 +43,7 @@
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "octhread.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "OIC_CA_BWT"
 
index 3c974b3..3f49c30 100644 (file)
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "cainterface.h"
 #include "caremotehandler.h"
 #include "camessagehandler.h"
 #include "caprotocolmessage.h"
 #include "canetworkconfigurator.h"
 #include "cainterfacecontroller.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #if defined(__WITH_DTLS__) || defined(__WITH_TLS__)
 #include "ca_adapter_net_ssl.h"
index ae7dcc1..abd4d94 100644 (file)
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "caadapterutils.h"
 #include "canetworkconfigurator.h"
index aae3458..2139eaa 100644 (file)
@@ -27,7 +27,7 @@
 #include "camessagehandler.h"
 #include "caremotehandler.h"
 #include "caprotocolmessage.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "trace.h"
 #ifndef WITH_UPSTREAM_LIBCOAP
 #include "coap/config.h"
index bb2cf4e..fa3ed31 100644 (file)
@@ -24,7 +24,7 @@
 #include "cainterfacecontroller.h"
 #include "cainterface.h"
 #include "uarraylist.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "OIC_CA_NW_CONFIG"
 
index 8d9abb9..28e67f4 100644 (file)
 #endif
 
 #include "caprotocolmessage.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "cacommonutil.h"
 #include "cablockwisetransfer.h"
 
index d5a67dd..40f5f89 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "caqueueingthread.h"
 #include "oic_malloc.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG PCF("OIC_CA_QING")
 
index 4435ef6..0e12e8f 100644 (file)
@@ -70,8 +70,8 @@
 #include "caprotocolmessage.h"
 #include "oic_malloc.h"
 #include "oic_time.h"
-#include "ocrandom.h"
-#include "logger.h"
+#include "experimental/ocrandom.h"
+#include "experimental/logger.h"
 
 #define TAG "OIC_CA_RETRANS"
 
index 2cef4a8..ed82278 100644 (file)
@@ -33,7 +33,7 @@
 #include <netinet/in.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
-#include "logger.h"
+#include "experimental/logger.h"
 #define TAG "OIC_CA_IFADDRS"
 #define VERIFY_NON_NULL(arg) { if (!arg) {OIC_LOG(ERROR, TAG, #arg " is NULL"); goto exit;} }
 
index 5e13fa4..83262f5 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "caadapterutils.h"
 #include "caipnwmonitor.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "org_iotivity_ca_CaIpInterface.h"
index 60317e5..ad14d23 100644 (file)
@@ -26,7 +26,7 @@
 #include <EthernetUdp.h>
 #include <IPAddress.h>
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cacommon.h"
 #include "caadapterinterface.h"
 #include "caadapterutils.h"
index 471193f..8a1465b 100644 (file)
@@ -33,7 +33,7 @@
 #include <EthernetUdp.h>
 #include <IPAddress.h>
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cacommon.h"
 #include "caadapterinterface.h"
 #include "caipadapter.h"
index 7c324ab..0210a53 100644 (file)
@@ -26,7 +26,7 @@
 #include <EthernetUdp.h>
 #include <IPAddress.h>
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cacommon.h"
 #include "caadapterinterface.h"
 #include "caipadapter.h"
index b1fa9c7..1a89e16 100644 (file)
@@ -27,7 +27,7 @@
 #include <utility/wifi_drv.h>
 #include <IPAddress.h>
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cacommon.h"
 #include "caadapterinterface.h"
 #include "caipadapter.h"
index eb3dcd0..de34bab 100644 (file)
@@ -32,7 +32,7 @@
 #include <EthernetUdp.h>
 #include <IPAddress.h>
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cacommon.h"
 #include "caipadapter.h"
 #include "caipnwmonitor.h"
index 93507ca..067b13a 100644 (file)
@@ -33,7 +33,7 @@
 #include <utility/wifi_drv.h>
 #include <IPAddress.h>
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cacommon.h"
 #include "caipadapter.h"
 #include "caipnwmonitor.h"
index 4dd0e60..b6c45f5 100644 (file)
@@ -27,7 +27,7 @@
 #include <EthernetUdp.h>
 #include <IPAddress.h>
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cacommon.h"
 #include "cainterface.h"
 #include "caadapterinterface.h"
index 98adcbb..37d6da8 100644 (file)
@@ -28,7 +28,7 @@
 #include <utility/wifi_drv.h>
 #include <IPAddress.h>
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cacommon.h"
 #include "cainterface.h"
 #include "caadapterinterface.h"
index 5d2cf9a..7e66e66 100644 (file)
@@ -34,7 +34,7 @@
 #include "octhread.h"
 #include "uarraylist.h"
 #include "caremotehandler.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "iotivity_debug.h"
index 596b4a7..20c8943 100644 (file)
@@ -42,7 +42,7 @@
 #include "caipnwmonitor.h"
 #include "octhread.h"
 #include "caadapterutils.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include <coap/utlist.h>
index 552c02d..831f30c 100644 (file)
@@ -36,7 +36,7 @@
 #include "caipinterface.h"
 #include "caipnwmonitor.h"
 #include "caadapterutils.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include <coap/utlist.h>
index 0e7f907..63812cb 100644 (file)
@@ -32,7 +32,7 @@
 #include <stdbool.h>
 #include "octhread.h"
 #include "caadapterutils.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "caipnwmonitor.h"
index 4d8fc17..92cd204 100644 (file)
@@ -22,7 +22,7 @@
 #include "octhread.h"
 #include "uarraylist.h"
 #include "caremotehandler.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 
index 2ce3cb8..7c2f5d4 100644 (file)
@@ -28,7 +28,7 @@
 #include "caadapterutils.h"
 #include "octhread.h"
 #include "uarraylist.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "caremotehandler.h"
index 7ecba20..74d31a1 100644 (file)
@@ -26,7 +26,7 @@
 #include <EthernetUdp.h>
 #include <IPAddress.h>
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cacommon.h"
 #include "caadapterinterface.h"
 #include "caadapterutils.h"
index 4ecbd84..584627e 100644 (file)
@@ -32,7 +32,7 @@
 #include <w5100.h>
 #include <IPAddress.h>
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cacommon.h"
 #include "caadapterinterface.h"
 #include "caipadapter.h"
index 7f70b7d..39a15e5 100644 (file)
@@ -38,7 +38,7 @@
 #include "octhread.h"
 #include "uarraylist.h"
 #include "caremotehandler.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #ifdef __WITH_TLS__
 #include "ca_adapter_net_ssl.h"
index 1d54125..bbf252e 100644 (file)
@@ -85,7 +85,7 @@
 #endif //ERROR
 #endif //HAVE_WINDOWS_H
 #include "platform_features.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 
 #define SEED "PREDICTED_SEED"
index f5c15a3..afc2cba 100644 (file)
@@ -31,7 +31,7 @@
 #include <coap/coap.h>
 #include "cathreadpool.h"
 #include "octhread.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "uarraylist.h"
 #include "cacommon.h"
 #include "caprotocolmessage.h"
index 0d24bad..5a865f2 100644 (file)
@@ -21,7 +21,7 @@
 #include "cabtpairinginterface.h"
 #include "cabtpairing.h"
 #include "cacommon.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include <jni.h>
 
 #define  TAG   "OIC_CA_BT_PAIRING"
index 161022e..8cf5a81 100644 (file)
@@ -25,7 +25,7 @@
 #include "camanagerdevice.h"
 #include "caleautoconnector.h"
 #include "cacommonutil.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "octhread.h"
 
 #define TAG "OIC_CA_LE_AUTO_CONN"
index 0f0c14f..097be79 100644 (file)
@@ -19,7 +19,7 @@
  ******************************************************************/
 
 #include <jni.h>
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cautilinterface.h"
 #include "camanagerleinterface.h"
 #include "camanagerleutil.h"
index 9e183f9..542c2e8 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <jni.h>
 #include "cacommon.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cacommonutil.h"
 #include "camanagerleutil.h"
 #include "uarraylist.h"
index 54fb2c3..499fb1f 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <jni.h>
 #include "cacommon.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cacommonutil.h"
 #include "camanagerleutil.h"
 #include "caleclient.h"
index 1a9e5b4..1cff6af 100644 (file)
@@ -29,7 +29,7 @@
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "octhread.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "caadapterutils.h"
 
 #include "caconnectionmanager.h"
index f12c715..13f618b 100644 (file)
@@ -26,8 +26,8 @@
 #include <assert.h>
 
 #include "caadapterutils.h"
-#include "logger.h"
-#include "ocrandom.h"
+#include "experimental/logger.h"
+#include "experimental/ocrandom.h"
 #include "oic_string.h"
 #include "oic_malloc.h"
 
index 59d6733..929e2dd 100644 (file)
@@ -29,7 +29,7 @@
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "octhread.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "caadapterutils.h"
 
 #include "camessagearbiter.h"
index 9acb412..842788b 100644 (file)
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include "oic_string.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include "caconnectionmanager.h"
 
index c8d1b1d..06aabae 100644 (file)
@@ -24,7 +24,7 @@
 #include "cautilinterface.h"
 #include "cainterfacecontroller.h"
 #include "cacommon.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #if defined(TCP_ADAPTER) && defined(WITH_CLOUD)
 #include "caconnectionmanager.h"
index bfdfd2c..64c37b2 100644 (file)
@@ -39,3 +39,7 @@ else:
 
 loggerlib = local_env.StaticLibrary('logger', logger_src)
 local_env.InstallTarget(loggerlib, 'logger')
+local_env.UserInstallTargetHeader('include/experimental/logger_types.h', 
+                                  'c_common/experimental', 'logger_types.h')
+local_env.UserInstallTargetHeader('include/experimental/logger.h',
+                                  'c_common/experimental', 'logger.h')
similarity index 99%
rename from resource/csdk/logger/include/logger.h
rename to resource/csdk/logger/include/experimental/logger.h
index d383068..0db0473 100644 (file)
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdbool.h>
-#include "logger_types.h"
+#include "experimental/logger_types.h"
 
 #ifdef __ANDROID__
 #include <android/log.h>
index cacf5dc..3635c74 100644 (file)
@@ -24,7 +24,7 @@
 #include <stddef.h>
 
 #ifdef __ANDROID__
-#include "logger.h"
+#include "experimental/logger.h"
 #elif defined(__TIZEN__)
 #ifdef OIC_SUPPORT_TIZEN_TRACE
 #include <ttrace.h>
index e7a80d8..82771c0 100644 (file)
@@ -51,9 +51,9 @@
 #include <windows.h>
 #endif
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "string.h"
-#include "logger_types.h"
+#include "experimental/logger_types.h"
 
 // log level
 static int g_level = DEBUG;
index 7e1a9b0..095d037 100644 (file)
@@ -58,7 +58,7 @@ void oic_trace_buffer(const char *name, const uint8_t * buffer, size_t bufferSiz
 
 #ifndef __TIZEN__
 
-#include "logger.h"
+#include "experimental/logger.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
index 52120c1..cc9f273 100644 (file)
@@ -20,7 +20,7 @@
 
 
 extern "C" {
-    #include "logger.h"
+    #include "experimental/logger.h"
 }
 
 static const char tag[] = "Android";
index 450e544..5f4f1a4 100644 (file)
@@ -21,7 +21,7 @@
 
 // Do not remove the include below
 #include "ArduinoLoggerTest.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define tag "Arduino"
 #define msg "Arduino Logger Test"
index 0a9e4bc..2e4ef11 100644 (file)
@@ -20,7 +20,7 @@
 
 
 extern "C" {
-    #include "logger.h"
+    #include "experimental/logger.h"
 }
 
 
index d7d5d3f..85beafa 100644 (file)
@@ -26,7 +26,7 @@
 #include "oic_string.h"
 
 #include "rd_client.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 
 #define TAG ("RD_PublishClient")
 #define DEFAULT_CONTEXT_VALUE 0x99
index 2785c5b..9b45b0f 100644 (file)
@@ -21,7 +21,7 @@
 #include <iostream>
 #include "octypes.h"
 #include "ocstack.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 
 bool g_foundResource = true;
 static int count = 0;
index 6365f37..72173c5 100644 (file)
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include "sqlite3.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocpayload.h"
 #include "octypes.h"
 #include "oic_malloc.h"
index 7cc046f..bc1f303 100644 (file)
@@ -30,7 +30,7 @@
 #include "ocstack.h"
 #include "ocpayload.h"
 #include "ocendpoint.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "cainterface.h"
 
 #define TAG "OIC_RD_CLIENT"
index cf9d638..ad9808a 100644 (file)
@@ -34,7 +34,7 @@
 #ifdef HAVE_IN6ADDR_H
 #include <in6addr.h>
 #endif
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "ocpayload.h"
 #include "octypes.h"
 #include "oic_string.h"
index 8b53d1a..05677b6 100644 (file)
@@ -25,11 +25,11 @@ extern "C"
     #include "rd_client.h"
     #include "rd_database.h"
     #include "ocstack.h"
-    #include "logger.h"
+    #include "experimental/logger.h"
     #include "oic_malloc.h"
     #include "oic_string.h"
     #include "ocpayload.h"
-    #include "payload_logging.h"
+    #include "experimental/payload_logging.h"
 }
 
 #include <gtest/gtest.h>
index ce80b9f..62d5089 100644 (file)
@@ -25,10 +25,10 @@ extern "C"
     #include "rd_server.h"
     #include "ocpayload.h"
     #include "ocstack.h"
-    #include "logger.h"
+    #include "experimental/logger.h"
     #include "oic_malloc.h"
     #include "oic_string.h"
-    #include "payload_logging.h"
+    #include "experimental/payload_logging.h"
     #include "cacommon.h"
     #include "coap/pdu.h"
 }
index 8c709bd..1688064 100644 (file)
@@ -3,14 +3,16 @@ import os
 
 local_env = env.Clone()
 
-local_env.AppendUnique(CPPPATH=[os.path.join(Dir('.').abspath, './include')])
+local_env.AppendUnique(CPPPATH=[
+    os.path.join(Dir('.').abspath, './include'),
+    os.path.join(Dir('.').abspath, './../logger/include'),
+])
 
 if env.get('ROUTING') == 'GW':
     local_env.AppendUnique(CPPPATH=[
         os.path.join(Dir('.').abspath, './../include'),
         os.path.join(Dir('.').abspath, './../stack/include'),
         os.path.join(Dir('.').abspath, './../stack/include/internal'),
-        os.path.join(Dir('.').abspath, './../logger'),
         os.path.join(Dir('.').abspath, './../../oc_logger/include'),
         os.path.join(Dir('.').abspath, './../../c_common/ocrandom/include'),
         os.path.join(Dir('.').abspath, './../connectivity/api'),
@@ -23,7 +25,6 @@ elif env.get('ROUTING') == 'EP':
         os.path.join(Dir('.').abspath, './../include'),
         os.path.join(Dir('.').abspath, './../stack/include'),
         os.path.join(Dir('.').abspath, './../stack/include/internal'),
-        os.path.join(Dir('.').abspath, './../logger'),
         os.path.join(Dir('.').abspath, './../../oc_logger/include'),
         os.path.join(Dir('.').abspath, './../connectivity/api'),
         os.path.join(Dir('.').abspath, './../connectivity/common/inc'),
index 3dc87b8..9179ba3 100644 (file)
 #include "routingmessageparser.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "ulinklist.h"
 #include "uarraylist.h"
 #include "ocstackinternal.h"
-#include "include/logger.h"
+#include "experimental/logger.h"
 
 /**
  * Logging tag for module name.
index 922f73f..a93d6c1 100644 (file)
@@ -25,8 +25,8 @@
 #include "routingmessageparser.h"
 #include "routingutility.h"
 #include "ocobserve.h"
-#include "include/logger.h"
-#include "ocrandom.h"
+#include "experimental/logger.h"
+#include "experimental/ocrandom.h"
 
 /**
  * Logging tag for module name.
index b4055af..a314f15 100644 (file)
@@ -27,7 +27,7 @@
 #include "ocpayloadcbor.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "include/logger.h"
+#include "experimental/logger.h"
 
 /**
  * Logging tag for module name.
index 88838c3..b3cae2e 100644 (file)
@@ -24,7 +24,7 @@
 #include "routingutility.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "include/logger.h"
+#include "experimental/logger.h"
 
 /**
  * Logging tag for module name.
index 1dca935..8e5504e 100644 (file)
@@ -23,7 +23,7 @@
 #include "routingutility.h"
 #include "routingmanager.h"
 #include "oic_malloc.h"
-#include "include/logger.h"
+#include "experimental/logger.h"
 
 /**
  * Logging tag for module name.
index 8382f1c..ddcb933 100644 (file)
@@ -21,9 +21,9 @@
 #ifndef ACL_LOGGING_H_
 #define ACL_LOGGING_H_
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "utlist.h"
 #include "experimental/securevirtualresourcetypes.h"
 
index d88793b..e4275a9 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef CRL_LOGGING_H_
 #define CRL_LOGGING_H_
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "experimental/securevirtualresourcetypes.h"
 
 #ifdef __cplusplus
index 44f2065..f24cbc7 100644 (file)
@@ -22,7 +22,7 @@
 #define IOTVT_SRM_PE_H
 
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "experimental/securevirtualresourcetypes.h"
 #include "secureresourcemanager.h"
 #include "cainterface.h"
index 9019a18..3484f59 100644 (file)
@@ -35,9 +35,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "utlist.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "ocprovisioningmanager.h"
@@ -50,6 +50,7 @@
 #include "ocsecurity.h"
 #include "ocstackinternal.h"
 #include "pmutility.h"
+#include "experimental/ocrandom.h"
 
 #ifdef _MSC_VER
 #include <io.h>
@@ -1020,7 +1021,6 @@ exit:
 /* Function to work around IOT-1927.  The ocrandom.h include is only required for the workaround.
  * @todo: when IOT-1927 is resolved remove this function
  */
-#include "ocrandom.h"
 int workAroundBug()
 {
     /* Remove credential for 31313131-3131-3131-3131-313131313131 */
index 4245b17..c2a9c08 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "ocstack.h"
 #include "oic_malloc.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "occertutility.h"
 
 #ifdef HAVE_WINDOWS_H
index 08665a4..2d45f3d 100644 (file)
@@ -19,8 +19,8 @@
  * *****************************************************************/
 
 #include "octypes.h"
-#include "logger.h"
-#include "payload_logging.h"
+#include "experimental/logger.h"
+#include "experimental/payload_logging.h"
 #include "ocstack.h"
 #include "ocpayload.h"
 #include "psinterface.h"
@@ -30,7 +30,7 @@
 #include "oic_string.h"
 #include "pmutility.h"
 #include "credresource.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "cacommonutil.h"
 
 #include "utils.h"
index ec2c9c2..07a7aa3 100644 (file)
 #include <string.h>
 
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "octhread.h"
 #include "cathreadpool.h"
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "aclresource.h"
 #include "acl_logging.h"
 #include "crl_logging.h"
index 34376fd..ef24622 100644 (file)
@@ -18,9 +18,9 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #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"
 #include "srmresourcestrings.h"
 #include "pmutility.h"
index 1481b5c..0e5f597 100644 (file)
@@ -20,7 +20,7 @@
 #include <string.h>
 #include "cloudCommon.h"
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocpayload.h"
 
 #include "cloudResource.h"
index 8aedec8..4b6b5bb 100644 (file)
@@ -17,7 +17,7 @@
  * limitations under the License.
  *
  * *****************************************************************/
-#include "logger.h"
+#include "experimental/logger.h"
 #include "occloudprovisioning.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
index 90af832..a819d5b 100644 (file)
@@ -18,7 +18,7 @@
  *
  * *****************************************************************/
 #include "cloudCommon.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "cloudClient"
 
index 6103006..8030777 100644 (file)
@@ -18,7 +18,7 @@
  *
  * *****************************************************************/
 #include "cloudCommon.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cloudResource.h"
 
 #define TAG "cloudServer"
index 363c87d..bd801ce 100644 (file)
@@ -25,9 +25,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "utlist.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "ocprovisioningmanager.h"
index 090a42f..a7bdf84 100644 (file)
@@ -43,7 +43,7 @@
 #endif //ERROR
 #endif //HAVE_WINDOWS_H
 #include "platform_features.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 
 #define TAG "SAMPLE_JUSTWORKS"
index c081220..3af2163 100644 (file)
@@ -43,7 +43,7 @@
 #endif //ERROR
 #endif //HAVE_WINDOWS_H
 #include "platform_features.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 
 #define TAG "SAMPLE_MANUFACTURER_CERT"
index 3e62601..23391d4 100644 (file)
@@ -44,7 +44,7 @@
 #endif //ERROR
 #endif //HAVE_WINDOWS_H
 #include "platform_features.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 
 #define TAG "SAMPLE_MV_JUSTWORKS"
index 2e7f9cd..52860f1 100644 (file)
@@ -43,7 +43,7 @@
 #endif //ERROR
 #endif //HAVE_WINDOWS_H
 #include "platform_features.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 
 #define TAG "SAMPLE_PRECONF_PIN"
index aaea020..42f1f0a 100644 (file)
@@ -43,7 +43,7 @@
 #endif //ERROR
 #endif //HAVE_WINDOWS_H
 #include "platform_features.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "SAMPLE_RANDOMPIN"
 
index d5282f5..261defd 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "platform_features.h"
 #include "utlist.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "ocprovisioningmanager.h"
index f15e0af..db9efb2 100644 (file)
@@ -24,7 +24,7 @@
 #include "utils.h"
 
 #include "oic_malloc.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocstack.h"
 #include "ocpayload.h"
 #include "pmutility.h"
index 37f29bd..8b546cb 100644 (file)
@@ -20,7 +20,7 @@
 #include "utils.h"
 
 #include "oic_malloc.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocstack.h"
 #include "ocpayload.h"
 #include "pmutility.h"
@@ -29,7 +29,7 @@
 #include "aclresource.h"
 #include "ocpayloadcbor.h"
 #include "acl_logging.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "utlist.h"
 
 #define TAG "OIC_CLOUD_ACL_ID"
index 690fa50..47cc033 100644 (file)
@@ -25,7 +25,7 @@
 #include "utils.h"
 
 #include "oic_malloc.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocstack.h"
 #include "ocpayload.h"
 #include "pmutility.h"
index 5520222..b029b6e 100644 (file)
 
 #include "utils.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocstack.h"
 #include "ocpayload.h"
 #include "pmutility.h"
 #include "oic_malloc.h"
 #include "crlresource.h"
 #include "ocpayloadcbor.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "cacommonutil.h"
 
 #define TAG "OIC_CLOUD_CRL"
index 9c4796d..96a484b 100644 (file)
@@ -20,7 +20,7 @@
 #include "iotivity_config.h"
 #include "utils.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include <stddef.h>
 #include <string.h>
 #include "oic_malloc.h"
@@ -28,7 +28,7 @@
 #include "cacommonutil.h"
 
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "doxmresource.h"
 #include "pmutility.h"
 #include "secureresourceprovider.h"
index 74083e6..5781a56 100644 (file)
@@ -19,8 +19,8 @@
  * *****************************************************************/
 #include "utils.h"
 
-#include "logger.h"
-#include "payload_logging.h"
+#include "experimental/logger.h"
+#include "experimental/payload_logging.h"
 #include "oic_malloc.h"
 #include "doxmresource.h"
 #include "srmutility.h"
index 58b418d..3339b5c 100644 (file)
@@ -23,9 +23,9 @@
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "credresource.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "srmutility.h"
 #include "stdbool.h"
 
index 91b0ae1..d258c85 100644 (file)
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include "utlist.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "cacommon.h"
 #include "provisioningdatabasemanager.h"
 #include "oxmrandompin.h"
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "oxmjustworks.h"
 #include "oxmpreconfpin.h"
 #include "oxmrandompin.h"
 #include "otmcontextlist.h"
 #include "ocstackinternal.h"
 #include "mbedtls/ssl_ciphersuites.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "secureresourceprovider.h"
 
 #define TAG "OIC_MULTIPLE_OTM"
index c679446..9ac33be 100644 (file)
@@ -28,7 +28,7 @@
 #include "multipleownershiptransfermanager.h"
 #endif //MULTIPLE_OWNER
 #include "oic_malloc.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "secureresourceprovider.h"
 #include "provisioningdatabasemanager.h"
 #include "credresource.h"
index dac3f5e..2e1d6e4 100644 (file)
@@ -18,7 +18,7 @@
  *
  * *****************************************************************/
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "octypes.h"
index 1bf497e..cc568a8 100644 (file)
@@ -44,7 +44,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "cacommon.h"
@@ -70,7 +70,7 @@
 #include "srmutility.h"
 #include "provisioningdatabasemanager.h"
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "pkix_interface.h"
 #include "oxmverifycommon.h"
 #include "psinterface.h"
index 2a3fd56..ff25171 100644 (file)
@@ -25,7 +25,7 @@
 #include "cacommon.h"
 #include "cainterface.h"
 #include "oic_malloc.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "pmtypes.h"
 #include "ownershiptransfermanager.h"
 #include "ocstackinternal.h"
index e170b76..ced8e69 100644 (file)
@@ -27,9 +27,9 @@
 #include "cacommon.h"
 #include "cainterface.h"
 #include "casecurityinterface.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "oic_malloc.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "pbkdf2.h"
 #include "base64.h"
 #include "oxmmanufacturercert.h"
index 06eca4e..97255df 100644 (file)
 #include "credresource.h"
 #include "cacommon.h"
 #include "cainterface.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "pbkdf2.h"
 #include "base64.h"
 #include "oxmpreconfpin.h"
index d43606e..7578e2a 100644 (file)
@@ -26,9 +26,9 @@
 #include "credresource.h"
 #include "cacommon.h"
 #include "cainterface.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "oic_malloc.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "pbkdf2.h"
 #include "base64.h"
 #include "oxmrandompin.h"
index 0009d3a..43d413f 100644 (file)
@@ -38,7 +38,7 @@
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "oic_time.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "utlist.h"
 #include "ocpayload.h"
 
index c6f14c6..9f5e044 100644 (file)
@@ -25,7 +25,7 @@
 #include <limits.h>
 
 #include "sqlite3.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "provisioningdatabasemanager.h"
 #include "pmutility.h"
index 101fc45..eb36742 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "ocprovisioningmanager.h"
 #include "secureresourceprovider.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "aclresource.h"
index 04c0388..30bb89e 100644 (file)
@@ -22,7 +22,7 @@
 #include "gtest/gtest.h"
 #include "ocstack.h"
 #include "utlist.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "ocprovisioningmanager.h"
@@ -37,7 +37,7 @@
 #include "doxmresource.h"
 #include "pmtypes.h"
 #include "pmutility.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 
 #define OTM_TIMEOUT 60
 #define DISCOVERY_TIMEOUT 10
index 379e4a3..acc6ef5 100644 (file)
 #include <time.h>
 
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocpayload.h"
 #include "oic_string.h"
 #include "srmutility.h"
 #include "doxmresource.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
index 179cb3d..627e774 100644 (file)
 #include "ocserverrequest.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "ocpayload.h"
 #include "utlist.h"
 #include "acl_logging.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "srmresourcestrings.h"
 #include "aclresource.h"
 #include "doxmresource.h"
index 7353e14..9095541 100644 (file)
@@ -24,7 +24,7 @@
 #include "oic_malloc.h"
 #include "ocpayload.h"
 #include "ocpayloadcbor.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "psinterface.h"
 #include "resourcemanager.h"
 #include "utlist.h"
index 89bc527..8b18e29 100644 (file)
 
 #include "iotivity_config.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include <stddef.h>
 #include <string.h>
 #include <assert.h>
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "cacommon.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "cacommonutil.h"
 
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "pmutility.h"
 #include "srmutility.h"
 
index 1c1f823..c411e54 100644 (file)
@@ -33,9 +33,9 @@
 #include <inttypes.h>
 
 #include "cainterface.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "ocstack.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "base64.h"
 #include "ocserverrequest.h"
 #include "oic_malloc.h"
index 1364fef..89072a5 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "utlist.h"
 #include "crl_logging.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "psinterface.h"
 #include "resourcemanager.h"
 #include "srmresourcestrings.h"
index 7d6929e..b4d3f44 100644 (file)
@@ -31,9 +31,9 @@
 #include <inttypes.h>
 #include "oic_string.h"
 #include "cainterface.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "ocstack.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "cacommon.h"
 #include "srmresourcestrings.h"
 #include "ocpayload.h"
index d37bead..90da5e5 100644 (file)
@@ -21,7 +21,7 @@
 #include "deviceonboardingstate.h"
 #include "srmutility.h"
 #include "octypes.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "srmresourcestrings.h"
 #include "aclresource.h"
 #include "amaclresource.h"
index 1778927..ffca833 100644 (file)
@@ -28,9 +28,9 @@
 
 #include "ocstack.h"
 #include "oic_malloc.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "utlist.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "ocpayload.h"
 #include "ocpayloadcbor.h"
 #include "cainterface.h"
index d5e3da3..18c8422 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "iotivity_config.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include <stddef.h>
 #include <string.h>
 #include <assert.h>
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "cacommon.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "cacommonutil.h"
 
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "pmutility.h"
 #include "srmutility.h"
 #include "srmresourcestrings.h"
index 6c455b4..02f6894 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "iotivity_config.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include <stddef.h>
 #include <string.h>
 #include "oic_malloc.h"
index f48b1c7..b18ae4b 100644 (file)
@@ -24,8 +24,8 @@
 #include "ocstack.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "ocrandom.h"
-#include "logger.h"
+#include "experimental/ocrandom.h"
+#include "experimental/logger.h"
 #include "pinoxmcommon.h"
 #include "pbkdf2.h"
 #include "base64.h"
index 9bd9f6e..a890cc9 100644 (file)
@@ -19,7 +19,7 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "base64.h"
 #include "srmresourcestrings.h"
 #include "cainterface.h"
index 66a224a..ecd5511 100644 (file)
@@ -18,7 +18,7 @@
 *
 ******************************************************************/
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "mbedtls/pkcs5.h"
 #include "mbedtls/md.h"
 #include <inttypes.h>
index 1fad524..874d105 100644 (file)
@@ -22,7 +22,7 @@
 #include "credresource.h"
 #include "crlresource.h"
 #include "srmresourcestrings.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "OIC_SRM_PKIX_INTERFACE"
 
index 91780e6..08c7603 100644 (file)
 
 #include "utlist.h"
 #include "oic_malloc.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "policyengine.h"
 #include "resourcemanager.h"
 #include "srmresourcestrings.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "aclresource.h"
 #include "srmutility.h"
 #include "doxmresource.h"
index 04a67ac..18397bf 100644 (file)
 #include <inttypes.h>
 
 #include "cainterface.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocpayload.h"
 #include "ocpayloadcbor.h"
 #include "ocstack.h"
 #include "oic_malloc.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "resourcemanager.h"
 #include "secureresourcemanager.h"
 #include "srmresourcestrings.h"
index 6aa44fa..3445203 100644 (file)
@@ -28,7 +28,7 @@
 #include "oic_malloc.h"
 #include "ocpayload.h"
 #include "ocpayloadcbor.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "resourcemanager.h"
 #include "pstatresource.h"
 #include "doxmresource.h"
index 1030c28..c8bfac0 100644 (file)
@@ -27,7 +27,7 @@
 #include "amaclresource.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "utlist.h"
 #include "psinterface.h"
 
index ce4b144..af24c06 100644 (file)
@@ -32,9 +32,9 @@
 #include <inttypes.h>
 #include "oic_string.h"
 #include "cainterface.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "ocstack.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "cacommon.h"
 #include "srmresourcestrings.h"
 #include "ocpayload.h"
index 59184ce..21eef1f 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <string.h>
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "cainterface.h"
 #include "resourcemanager.h"
 #include "credresource.h"
@@ -31,7 +31,7 @@
 #include "secureresourcemanager.h"
 #include "srmresourcestrings.h"
 #include "ocresourcehandler.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 
 #if defined( __WITH_TLS__) || defined(__WITH_DTLS__)
 #include "pkix_interface.h"
index 2cc815d..358d31b 100644 (file)
 
 #include "srmutility.h"
 #include "srmresourcestrings.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "base64.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "doxmresource.h"
 
 #define TAG  "OIC_SRM_UTILITY"
index 25dde3e..fbe5f9a 100644 (file)
@@ -30,7 +30,7 @@
 #include "oic_string.h"
 #include "ocpayload.h"
 #include "ocpayloadcbor.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "secureresourcemanager.h"
 #include "srmresourcestrings.h"
 #include "srmutility.h"
index bda1675..07a2d82 100644 (file)
@@ -35,7 +35,7 @@
 #include "octypes.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include "srmresourcestrings.h"
 #include "pinoxmcommon.h"
index ff2f13d..fc5600c 100644 (file)
 #include "pstatresource.h"
 #include "srmtestcommon.h"
 #include "srmutility.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "doxmresource.h"
 #include "ocpayload.h"
 #include "ocpayloadcbor.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "security_internals.h"
 #include "acl_logging.h"
 
index b825539..b7ba43b 100644 (file)
@@ -24,7 +24,7 @@
 #include "ocpayload.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "psinterface.h"
 #include "secureresourcemanager.h"
 #include "srmresourcestrings.h"
index 3164178..37ae440 100644 (file)
@@ -29,7 +29,7 @@
 #include "srmutility.h"
 #include "psinterface.h"
 #include "security_internals.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG "SRM-CRED-UT"
 
index 1f29a3f..3ba78c6 100644 (file)
@@ -20,7 +20,7 @@
 #ifdef __WITH_DTLS__
 
 #include <gtest/gtest.h>
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocpayload.h"
 #include "ocstack.h"
 #include "oic_malloc.h"
index 57d9883..1a8ab28 100644 (file)
@@ -27,7 +27,7 @@
 #include "srmresourcestrings.h"
 #include "doxmresource.h"
 #include "security_internals.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 
 #define TAG  "SRM-DOXM"
 
index 7909b69..c79baee 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <gtest/gtest.h>
 #include "iotvticalendar.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #define TAG  "CALENDAR-UT"
 
index e027f27..1755368 100644 (file)
@@ -277,3 +277,5 @@ liboctbstack_env.UserInstallTargetLib(octbstack_libs, 'octbstack')
 
 liboctbstack_env.UserInstallTargetHeader('include/ocstackconfig.h', 'resource/stack', 'ocstackconfig.h')
 liboctbstack_env.UserInstallTargetHeader('include/ocpayload.h', 'resource/stack', 'ocpayload.h')
+liboctbstack_env.UserInstallTargetHeader('include/experimental/payload_logging.h',
+                                         'resource/stack/experimental', 'payload_logging.h')
@@ -32,7 +32,7 @@
 #define __STDC_LIMIT_MACROS
 #endif
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "ocpayload.h"
 #include "ocstack.h"
index 06e4664..318c0f4 100644 (file)
@@ -38,7 +38,7 @@
 #include "ocstack.h"
 #include "ocstackconfig.h"
 #include "occlientcb.h"
-#include <ocrandom.h>
+#include "experimental/ocrandom.h"
 
 #include "cacommon.h"
 #include "cainterface.h"
index 55ed42c..8e756a0 100644 (file)
@@ -21,7 +21,7 @@
 // Do not remove the include below
 #include "Arduino.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocstack.h"
 #include "ocpayload.h"
 #include <string.h>
index d97e170..c4b21b7 100644 (file)
@@ -31,7 +31,7 @@
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
 #endif
-#include <logger.h>
+#include "experimental/logger.h"
 
 #define TAG ("occlient")
 
index a087b6b..2bf66a2 100644 (file)
@@ -33,7 +33,7 @@
 #endif
 #include <signal.h>
 #include <stdbool.h>
-#include <logger.h>
+#include "experimental/logger.h"
 
 #define TAG ("ocserver")
 
index 2127852..b40c593 100644 (file)
 #include <sstream>
 #include <getopt.h>
 #include <coap/pdu.h>
-#include "logger.h"
 #include "occlient.h"
-#include "payload_logging.h"
 #include "common.h"
+#include "experimental/logger.h"
+#include "experimental/payload_logging.h"
 
 #define VERIFY_SUCCESS(op)                          \
 do                                                  \
index 1e136e2..6a95c88 100644 (file)
 #include <getopt.h>
 
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "occlientbasicops.h"
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "common.h"
index 7e42020..10f3c14 100644 (file)
@@ -34,8 +34,8 @@
 #include <sstream>
 #include <getopt.h>
 #include "ocpayload.h"
-#include "payload_logging.h"
-#include "logger.h"
+#include "experimental/payload_logging.h"
+#include "experimental/logger.h"
 #include "common.h"
 #include "oic_string.h"
 
index c4b762b..27df395 100644 (file)
 #include <sstream>
 #include <getopt.h>
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "occlientslow.h"
 #include "oic_string.h"
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "common.h"
 
 // Tracking user input
index b4c4970..bc42936 100644 (file)
@@ -27,9 +27,9 @@
 #include <iostream>
 #include <sstream>
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "ocremoteaccessclient.h"
 #include "common.h"
 
index 0df6a43..6f1444f 100644 (file)
@@ -28,7 +28,7 @@
 #include <pthread.h>
 #include <array>
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocpayload.h"
 
 #define TAG "ocrouting"
index d860593..480f7fb 100644 (file)
 #include <array>
 #include "oic_malloc.h"
 #include <getopt.h>
-#include "logger.h"
 #include "ocserver.h"
 #include "common.h"
 #include "oic_string.h"
+#include "experimental/logger.h"
 
 #define VERIFY_SUCCESS(op)                          \
 do                                                  \
index 2af8e5e..9fe8616 100644 (file)
@@ -33,7 +33,7 @@
 #include <pthread.h>
 #endif
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocserverbasicops.h"
 #include "ocpayload.h"
 
index ac9ea30..26752d7 100644 (file)
@@ -35,7 +35,7 @@
 #include <pthread.h>
 #endif
 #include <ocstack.h>
-#include <logger.h>
+#include "experimental/logger.h"
 #include <getopt.h>
 #include "ocpayload.h"
 #include "common.h"
index 5eb1605..f572df0 100644 (file)
 #include "ocstack.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocserverslow.h"
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 
 volatile sig_atomic_t gQuitFlag = 0;
 
index 71519de..8e26c55 100644 (file)
@@ -20,7 +20,7 @@
 #include "common.h"
 
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
index 819c059..2f6d6ca 100644 (file)
@@ -14,7 +14,7 @@
 #include <pthread.h>
 #endif
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "common.h"
 
 #define TAG  PCF("SRM-AMSS")
index 85ba287..3f59797 100644 (file)
 #include <sstream>
 #include <getopt.h>
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "occlientbasicops.h"
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "oic_string.h"
 #include "common.h"
 
index 6c2c360..5280c33 100644 (file)
@@ -33,7 +33,7 @@
 #include <pthread.h>
 #endif
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocpayload.h"
 #include "ocserverbasicops.h"
 #include "common.h"
index 46ef9f0..8642b66 100644 (file)
 #include <iostream>
 #include <sstream>
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "occlient.h"
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 
 using namespace std;
 
index bbe304c..a5ac05d 100644 (file)
@@ -29,7 +29,7 @@
 #include <array>
 #include <iostream>
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocpayload.h"
 
 using namespace std;
index fbb8fd6..66be2ed 100644 (file)
@@ -31,7 +31,7 @@
 #include <array>
 #include "oic_malloc.h"
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocpayload.h"
 #include "ocserver.h"
 using namespace std;
index ba36041..759f2e5 100644 (file)
@@ -108,8 +108,7 @@ cp -rf resource/csdk/stack/include/ocstack.h* %{DEST_INC_DIR}/
 cp resource/csdk/security/include/experimental/*.h* %{DEST_INC_DIR}/experimental/
 cp -rf resource/csdk/stack/include/ocstackconfig.h* %{DEST_INC_DIR}/
 cp -rf resource/csdk/include/octypes.h* %{DEST_INC_DIR}/
-cp -rf resource/csdk/logger/include/logger.h* %{DEST_INC_DIR}/
-cp -rf resource/csdk/logger/include/logger_types.h* %{DEST_INC_DIR}/
+cp resource/csdk/logger/include/experimental/*.h* %{DEST_INC_DIR}/experimental/
 cp resource/oc_logger/include/oc_logger.hpp %{DEST_INC_DIR}/
 cp resource/oc_logger/include/oc_log_stream.hpp %{DEST_INC_DIR}/
 cp resource/oc_logger/include/oc_logger.h %{DEST_INC_DIR}/
@@ -122,7 +121,7 @@ cp resource/c_common/platform_features.h %{DEST_INC_DIR}
 cp %{BUILD_DIR}/resource/c_common/iotivity_config.h %{DEST_INC_DIR}
 cp resource/c_common/*/include/*.h %{DEST_INC_DIR}
 cp resource/c_common/experimental/*.h* %{DEST_INC_DIR}/experimental/
-cp resource/csdk/stack/include/payload_logging.h %{DEST_INC_DIR}
+cp resource/csdk/stack/include/experimental/payload_logging.h %{DEST_INC_DIR}/experimental/
 cp extlibs/tinycbor/tinycbor/src/cbor.h %{DEST_INC_DIR}
 cp -f com.oic.ri.pc %{DEST_LIB_DIR}/pkgconfig/
 
index af43b3d..e066bf1 100644 (file)
@@ -21,7 +21,7 @@
 #include "iotivity_config.h"
 #include "occlientcb.h"
 #include <coap/coap.h>
-#include "logger.h"
+#include "experimental/logger.h"
 #include "trace.h"
 #include "oic_malloc.h"
 #include <string.h>
index 7c68bc0..4ab38eb 100644 (file)
@@ -33,7 +33,7 @@
 #include "ocstackinternal.h"
 #include "oicgroup.h"
 #include "oic_string.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "cainterface.h"
 #define TAG "OIC_RI_COLLECTION"
 
index d8a9652..c548016 100644 (file)
@@ -31,8 +31,8 @@
 #include "octypes.h"
 #include "ocstack.h"
 #include "ocstackinternal.h"
-#include "ocrandom.h"
-#include "logger.h"
+#include "experimental/ocrandom.h"
+#include "experimental/logger.h"
 #include "occonnectionmanager.h"
 #include "ocpayload.h"
 #include "oic_string.h"
index a829fd0..cf718db 100644 (file)
@@ -19,7 +19,7 @@
  ******************************************************************/
 
 #include "ocendpoint.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include <string.h>
index 3b6b9e1..b973383 100644 (file)
 #include "ocstackinternal.h"
 #include "ocobserve.h"
 #include "ocresourcehandler.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "ocpayload.h"
 #include "ocserverrequest.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include <coap/utlist.h>
 #include <coap/pdu.h>
index 0c37982..dda821e 100644 (file)
@@ -31,7 +31,7 @@
 #include "oic_string.h"
 #include "ocstackinternal.h"
 #include "ocresource.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocendpoint.h"
 #include "cacommon.h"
 #include "ocstack.h"
index 514f702..6a8d5b1 100644 (file)
@@ -27,9 +27,9 @@
 #include <stdlib.h>
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocpayload.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "ocresourcehandler.h"
 #include "cbor.h"
 #include "ocendpoint.h"
index 03c798b..3837c6a 100644 (file)
@@ -34,7 +34,7 @@
 #include "oic_malloc.h"
 #include "ocpayloadcbor.h"
 #include "ocstackinternal.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "platform_features.h"
 #include "ocendpoint.h"
 
index 13533f3..11a064e 100644 (file)
 #include "occollection.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocpayload.h"
 #include "secureresourcemanager.h"
 #include "cacommon.h"
 #include "cainterface.h"
 #include "oickeepalive.h"
 #include "platform_features.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "ocendpoint.h"
 #include "ocstackinternal.h"
 #include "oickeepalive.h"
index 6ed60b1..07a6aa9 100644 (file)
@@ -27,7 +27,7 @@
 #include "oic_string.h"
 #include "ocpayload.h"
 #include "ocpayloadcbor.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #if defined (ROUTING_GATEWAY) || defined (ROUTING_EP)
 #include "routingutility.h"
index 0336bf8..543fada 100644 (file)
@@ -20,7 +20,7 @@
 #ifdef UWP_APP
 #include <inttypes.h>
 #include "ocsqlite3helper.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "oic_platform.h"
 #include "oic_malloc.h"
 #include "sqlite3.h"
index ac2e664..cff0147 100644 (file)
 #include "ocresourcehandler.h"
 #include "occlientcb.h"
 #include "ocobserve.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "trace.h"
 #include "ocserverrequest.h"
 #include "secureresourcemanager.h"
index 49dcab4..6e9ad51 100644 (file)
@@ -31,7 +31,7 @@
 #include "oic_string.h"
 #include "octhread.h"
 #include "occollection.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "octimer.h"
 
 #define TAG "OIC_RI_GROUP"
index b07b88d..8dd3487 100644 (file)
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "oic_time.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "uarraylist.h"
 #include "ocstackinternal.h"
 #include "ocpayloadcbor.h"
 #include "ocpayload.h"
 #include "ocresourcehandler.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 /**
  * Logging tag for module name.
index 07bf6ea..e9880cc 100644 (file)
@@ -28,8 +28,8 @@
 
 #include "octypes.h"
 #include "ocstack.h"
-#include "ocrandom.h"
-#include "logger.h"
+#include "experimental/ocrandom.h"
+#include "experimental/logger.h"
 #include "ocpayload.h"
 #include "ocendpoint.h"
 #include "oic_malloc.h"
index 03fb61a..88ab457 100644 (file)
@@ -20,7 +20,7 @@
 
 
 extern "C" {
-    #include "logger.h"
+    #include "experimental/logger.h"
     #include "ocstack.h"
     #include "ocstackinternal.h"
 }
index 72e9ce9..fa8d91a 100644 (file)
@@ -22,7 +22,7 @@
 // Do not remove the include below
 #include "ArduinoStackTest.h"
 
-#include "logger.h"
+#include "experimental/logger.h"
 #include "ocstack.h"
 #include "ocstackinternal.h"
 #include <string.h>
index 6f9f30b..c16399d 100644 (file)
@@ -2,7 +2,7 @@
 #include <SPI.h>
 #include <Ethernet.h>
 #include <ocstack.h>
-#include <logger.h>
+#include "experimental/logger.h"
 
 static uint8_t ETHERNET_MAC[] = {0x90, 0xA2, 0xDA, 0x0F, 0x2B, 0x72 };
 
index 3aa1b39..f828272 100644 (file)
@@ -25,7 +25,7 @@ extern "C"
     #include "ocstack.h"
     #include "ocpayload.h"
     #include "ocpayloadcbor.h"
-    #include "logger.h"
+    #include "experimental/logger.h"
     #include "oic_malloc.h"
 }
 
index ad9aa68..ccfab80 100644 (file)
@@ -24,7 +24,7 @@ extern "C"
     #include "ocpayload.h"
     #include "ocstack.h"
     #include "ocstackinternal.h"
-    #include "logger.h"
+    #include "experimental/logger.h"
     #include "oic_malloc.h"
     #include "oic_string.h"
     #include "oic_time.h"
index ef146ab..de50526 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "OCPlatform.h"
 #include "OCApi.h"
-#include "logger.h"
+#include "experimental/logger.h"
 
 #include <functional>
 #include <pthread.h>
index d4ed9f3..a839289 100644 (file)
@@ -22,7 +22,7 @@
 #include <sstream>
 #include <cstring>
 #include "ocpayload.h"
-#include "ocrandom.h"
+#include "experimental/ocrandom.h"
 #include "oic_string.h"
 
 namespace OC
index 110fc5d..3e09481 100644 (file)
@@ -19,8 +19,8 @@
  * *****************************************************************/
 
 #include "octypes.h"
-#include "logger.h"
-#include "payload_logging.h"
+#include "experimental/logger.h"
+#include "experimental/payload_logging.h"
 #include "ocstack.h"
 #include "ocpayload.h"
 //#include "psinterface.h"
@@ -31,7 +31,7 @@
 #include "srmutility.h"
 #include "pmutility.h"
 #include "credresource.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 
 #include "utils.h"
 #include "cloudAuth.h"
index 91d9c28..aa98f60 100644 (file)
 #include <string.h>
 
 #include "ocstack.h"
-#include "logger.h"
+#include "experimental/logger.h"
 #include "octhread.h"
 #include "cathreadpool.h"
 #include "ocpayload.h"
-#include "payload_logging.h"
+#include "experimental/payload_logging.h"
 #include "ocprovisioningmanager.h"
 
 #include "utils.h"