[IOT-1089] Merge remote-tracking branch 'origin/master' into generic-java

Change-Id: Ib37bdbb2955bdb0edc136786f1abf5a11c1489d6
Signed-off-by: George Nash <george.nash@intel.com>

diff --cc auto_build.py
index 8d48f38,a1fdd37..83bf4ab
--- 1/auto_build.py
--- 2/auto_build.py
+++ b/auto_build.py
@@@ -53,13 -53,11 +53,13 @@@ def build_all(flag, extra_option_str)
          build_linux_unsecured_with_mq(flag, extra_option_str)
          build_linux_unsecured_with_tcp(flag, extra_option_str)
          build_linux_secured_with_tcp(flag, extra_option_str)
 +        build_linux_unsecured_with_java(flag, extra_option_str)
 +        build_linux_secured_with_java(flag, extra_option_str)
          build_simulator(flag, extra_option_str)
  
-     build_android(flag, extra_option_str)
-     build_arduino(flag, extra_option_str)
-     build_tizen(flag, extra_option_str)
+         build_android(flag, extra_option_str)
+         build_arduino(flag, extra_option_str)
+         build_tizen(flag, extra_option_str)
  
      if platform.system() == "Windows":
          build_windows(flag, extra_option_str)

diff --cc build_common/SConscript
Simple merge

diff --cc build_common/external_libs.scons
Simple merge

diff --cc java/examples-android/devicediscoveryserver/src/main/java/org/iotivity/base/examples/DeviceDiscoveryServer.java
Simple merge

diff --cc java/examples-android/provisioningclient/src/main/assets/oic_svr_db_client.dat
index 1c157a9,6b67286..6b67286
Binary files differ

diff --cc java/examples-android/provisioningclient/src/main/assets/oic_svr_db_client.json
Simple merge

diff --cc java/examples-android/provisioningclient/src/main/java/org/iotivity/base/examples/provisioningclient/ProvisioningClient.java
Simple merge

diff --cc java/examples-android/simpleclient/src/main/assets/oic_svr_db_client.dat
index 8e96f40,c6c73ed..c6c73ed
Binary files differ

diff --cc java/examples-android/simpleclient/src/main/assets/oic_svr_db_client.json
Simple merge

diff --cc java/examples-android/simpleserver/src/main/assets/oic_svr_db_server.dat
index 0c337c5,b5eae8f..b5eae8f
Binary files differ

diff --cc java/examples-android/simpleserver/src/main/assets/oic_svr_db_server.json
Simple merge

diff --cc java/iotivity-android/src/main/java/org/iotivity/base/OcPlatform.java
Simple merge

diff --cc java/jni/JniOcCloudProvisioning.cpp
Simple merge

diff --cc java/jni/JniOcPlatform.cpp
Simple merge

diff --cc java/jni/JniOcPlatform.h
Simple merge

diff --cc java/jni/JniOcProvisioning.cpp
Simple merge

diff --cc java/jni/JniOcSecureResource.cpp
index b01059e,2c6274b..174e618
--- 1/java/jni/JniOcSecureResource.cpp
--- 2/android/android_api/base/jni/JniOcSecureResource.cpp
+++ b/java/jni/JniOcSecureResource.cpp
@@@ -209,7 -209,7 +209,7 @@@ OCStackResult JniOcSecureResource::prov
              resultCallback);
  }
  
--#if defined(__WITH_TLS__)
++#if defined(__WITH_DTLS__) || defined(__WITH_TLS__)
  OCStackResult JniOcSecureResource::provisionTrustCertChain(JNIEnv* env, jint type, jint credId,
          jobject jListener)
  {

diff --cc java/jni/JniOcStack.cpp
Simple merge

diff --cc java/jni/JniOnMQSubscribeListener.h
Simple merge

diff --cc service/notification/SConscript
index ec507bd,f7f8edf..614971c
--- 1/service/notification/SConscript
--- 2/service/notification/SConscript
+++ b/service/notification/SConscript
@@@ -124,9 -132,8 +132,9 @@@ if target_os == 'linux'
  # Go to build c++ wrapper
  SConscript('cpp-wrapper/SConscript')
  
 +
  if target_os == 'android':
      SConscript('android/SConscript')
+ 
+ # Go to build sample apps
+ SConscript('examples/SConscript')

diff --cc service/notification/cpp-wrapper/consumer/SConscript
index cedb793,e18ce7c..e80b72a
--- 1/service/notification/cpp-wrapper/consumer/SConscript
--- 2/service/notification/cpp-wrapper/consumer/SConscript
+++ b/service/notification/cpp-wrapper/consumer/SConscript
@@@ -103,8 -103,10 +103,10 @@@ notification_env.UserInstallTargetLib(c
  # Source files and Targets for Consumer Jni
  ######################################################################
  if target_os == 'android':
+       Import('notificationJniCommonSharedObjs')
+ 
        notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../../../extlibs/boost/boost_1_58_0'])
 -      notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../../../android/android_api/base/jni'])
 +      notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../../../java/jni'])
        notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../android/notification-service/src/main/jni/common'])
        notification_jni_consumer_env.AppendUnique(CPPPATH = ['../../android/notification-service/src/main/jni/consumer'])
  

diff --cc service/notification/cpp-wrapper/provider/SConscript
Simple merge

diff --cc service/notification/examples/android/NotiConsumerExample/build.gradle
index a1f101c,3970a2a..116ee62
--- 1/service/notification/examples/android/NotiConsumerExample/build.gradle
--- 2/service/notification/examples/android/NotiConsumerExample/build.gradle
+++ b/service/notification/examples/android/NotiConsumerExample/build.gradle
@@@ -1,23 -1,28 +1,28 @@@
- // Top-level build file where you can add configuration options common to all sub-projects/modules.\r
- \r
- buildscript {\r
-     repositories {\r
-         jcenter()\r
-     }\r
-     dependencies {\r
-         classpath 'com.android.tools.build:gradle:1.5.0'\r
- \r
-         // NOTE: Do not place your application dependencies here; they belong\r
-         // in the individual module build.gradle files\r
-     }\r
- }\r
- \r
- allprojects {\r
-     repositories {\r
-         jcenter()\r
-     }\r
- }\r
- \r
- task clean(type: Delete) {\r
-     delete rootProject.buildDir\r
- }\r
+ // Top-level build file where you can add configuration options common to all sub-projects/modules.
+ 
+ buildscript {
+     repositories {
+         jcenter()
+     }
+     dependencies {
+         classpath 'com.android.tools.build:gradle:1.3.0'
+ 
+         // NOTE: Do not place your application dependencies here; they belong
+         // in the individual module build.gradle files
+     }
+ }
+ 
+ allprojects {
+     repositories {
+         jcenter()
+ 
+         flatDir {
+             dirs '../../../../android/notification-service/build/outputs/aar'
 -            dirs '../../../../../../android/android_api/base/build/outputs/aar'
++            dirs '../../../../../../java/iotivity-android/build/outputs/aar/'
+         }
+     }
+ }
+ 
+ task clean(type: Delete) {
+     delete rootProject.buildDir
+ }

diff --cc service/notification/examples/android/NotiProviderExample/build.gradle
index a1f101c,3970a2a..116ee62
--- 1/service/notification/examples/android/NotiProviderExample/build.gradle
--- 2/service/notification/examples/android/NotiProviderExample/build.gradle
+++ b/service/notification/examples/android/NotiProviderExample/build.gradle
@@@ -1,23 -1,28 +1,28 @@@
- // Top-level build file where you can add configuration options common to all sub-projects/modules.\r
- \r
- buildscript {\r
-     repositories {\r
-         jcenter()\r
-     }\r
-     dependencies {\r
-         classpath 'com.android.tools.build:gradle:1.5.0'\r
- \r
-         // NOTE: Do not place your application dependencies here; they belong\r
-         // in the individual module build.gradle files\r
-     }\r
- }\r
- \r
- allprojects {\r
-     repositories {\r
-         jcenter()\r
-     }\r
- }\r
- \r
- task clean(type: Delete) {\r
-     delete rootProject.buildDir\r
- }\r
+ // Top-level build file where you can add configuration options common to all sub-projects/modules.
+ 
+ buildscript {
+     repositories {
+         jcenter()
+     }
+     dependencies {
+         classpath 'com.android.tools.build:gradle:1.3.0'
+ 
+         // NOTE: Do not place your application dependencies here; they belong
+         // in the individual module build.gradle files
+     }
+ }
+ 
+ allprojects {
+     repositories {
+         jcenter()
+ 
+         flatDir {
+             dirs '../../../../android/notification-service/build/outputs/aar'
 -            dirs '../../../../../../android/android_api/base/build/outputs/aar'
++            dirs '../../../../../../java/iotivity-android/build/outputs/aar/'
+         }
+     }
+ }
+ 
+ task clean(type: Delete) {
+     delete rootProject.buildDir
+ }

diff --cc service/resource-container/src/ResourceContainerImpl.cpp
index e22692d,e22692d..c7ed7a8
--- 1/service/resource-container/src/ResourceContainerImpl.cpp
--- 2/service/resource-container/src/ResourceContainerImpl.cpp
+++ b/service/resource-container/src/ResourceContainerImpl.cpp
@@@ -607,7 -607,7 +607,7 @@@ namespace OI
          std::list<std::unique_ptr<RCSBundleInfo>> ResourceContainerImpl::listBundles()
          {
              OIC_LOG_V(INFO, CONTAINER_TAG,
--                                 "list bundles (%d)", m_bundles.size());
++                                 "list bundles (%d)", static_cast<int>(m_bundles.size()));
              std::list<std::unique_ptr<RCSBundleInfo> > ret;
              for (std::map< std::string, shared_ptr<BundleInfoInternal> >::iterator it = m_bundles.begin();
                   it != m_bundles.end(); ++it)

diff --cc service/resource-encapsulation/examples/android/RESampleClientApp/build.gradle
index 6f0accc,555dac4..886c9e1
--- 1/service/resource-encapsulation/examples/android/RESampleClientApp/build.gradle
--- 2/service/resource-encapsulation/examples/android/RESampleClientApp/build.gradle
+++ b/service/resource-encapsulation/examples/android/RESampleClientApp/build.gradle
@@@ -17,7 -17,8 +17,8 @@@ allprojects 
          jcenter()
  
          flatDir {
-             dirs 'libs'
+             dirs '../../../../android/service/build/outputs/aar'
 -            dirs '../../../../../../android/android_api/base/build/outputs/aar'
++            dirs '../../../../../../java/iotivity-android/build/outputs/aar/'
          }
      }
  }

diff --cc service/resource-encapsulation/examples/android/RESampleServerApp/build.gradle
index 6f0accc,555dac4..886c9e1
--- 1/service/resource-encapsulation/examples/android/RESampleServerApp/build.gradle
--- 2/service/resource-encapsulation/examples/android/RESampleServerApp/build.gradle
+++ b/service/resource-encapsulation/examples/android/RESampleServerApp/build.gradle
@@@ -17,7 -17,8 +17,8 @@@ allprojects 
          jcenter()
  
          flatDir {
-             dirs 'libs'
+             dirs '../../../../android/service/build/outputs/aar'
 -            dirs '../../../../../../android/android_api/base/build/outputs/aar'
++            dirs '../../../../../../java/iotivity-android/build/outputs/aar/'
          }
      }
  }