Merge branch '1.3-rel' into 1.4-rel 13/24813/1
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 20 Apr 2018 15:23:16 +0000 (17:23 +0200)
committerPhilippe Coval <philippe.coval@osg.samsung.com>
Fri, 20 Apr 2018 15:24:34 +0000 (17:24 +0200)
Change-Id: I43209c55d6b5a6b7dc8ef8b1de8f49f2f8e7eb9a
Bug: https://jira.iotivity.org/browse/IOT-2453
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
34 files changed:
1  2 
plugins/samples/linux/IotivityandZigbeeClient.c
plugins/samples/linux/IotivityandZigbeeServer.c
resource/IPCA/samples/ElevatorServer/elevatorserver.cpp
resource/csdk/resource-directory/samples/rd_publishingClient.cpp
resource/csdk/resource-directory/samples/rd_queryClient.cpp
resource/csdk/security/provisioning/sample/autoprovisioningclient.c
resource/csdk/security/provisioning/sample/certgenerator.cpp
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/unittest/sampleserver.cpp
resource/csdk/stack/samples/linux/OCSample/occlient.c
resource/csdk/stack/samples/linux/OCSample/ocserver.c
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/occlientbasicops.cpp
resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp
resource/csdk/stack/samples/tizen/SimpleClientServer/ocrouting.cpp
resource/csdk/stack/samples/tizen/SimpleClientServer/ocserver.cpp
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
service/coap-http-proxy/samples/proxy_client.c
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator.cpp
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/submediator.cpp

  #endif //ERROR
  #endif //HAVE_WINDOWS_H
  #include "platform_features.h"
+ /// This example is using experimental API, so there is no guarantee of support for future release,
+ /// nor any there any guarantee that breaking changes will not occur across releases.
  #include "experimental/logger.h"
 -
 +#include "credresource.h"
  
  #define TAG "SAMPLE_MANUFACTURER_CERT"
  
  #include "ocpayload.h"
  #include "oic_string.h"
  #include "srmutility.h"
- #include "experimental/doxmresource.h"
- #include "experimental/ocrandom.h"
 -#include "doxmresource.h"
  
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
  
+ /// This example is using experimental API, so there is no guarantee of support for future release,
+ /// nor any there any guarantee that breaking changes will not occur across releases.
+ #include "experimental/logger.h"
+ #include "experimental/ocrandom.h"
++#include "experimental/doxmresource.h"
  #define TAG "JW_UNITTEST"
  
  int gQuitFlag = 0;
  #ifdef HAVE_WINDOWS_H
  #include <windows.h>
  #endif
+ /// This example is using experimental API, so there is no guarantee of support for future release,
+ /// nor any there any guarantee that breaking changes will not occur across releases.
  #include "experimental/logger.h"
  
 +#define DEFAULT_CONTEXT_VALUE 0x99
  #define TAG ("occlient")
  
  int gQuitFlag = 0;
  #include "ocstack.h"
  #include "ocpayload.h"
  //#include "psinterface.h"
- #include "experimental/securevirtualresourcetypes.h"
- #include "experimental/doxmresource.h"
 -#include "doxmresource.h"
  #include "oic_malloc.h"
  #include "oic_string.h"
  #include "srmutility.h"
  #include "utils.h"
  #include "cloudAuth.h"
  
+ /// This example is using experimental API, so there is no guarantee of support for future release,
+ /// nor any there any guarantee that breaking changes will not occur across releases.
+ /// Here logging part is not critical.
+ #include "experimental/logger.h"
+ #include "experimental/payload_logging.h"
+ #include "experimental/securevirtualresourcetypes.h"
++#include "experimental/doxmresource.h"
  #define TAG "cloudAuth"
  
  #define LOGIN_OK 4