[IOT-1089]Merge remote-tracking branch 'origin/master' into generic-java 15/12915/21
authorGeorge Nash <george.nash@intel.com>
Mon, 7 Nov 2016 18:44:56 +0000 (10:44 -0800)
committerGeorge Nash <george.nash@intel.com>
Mon, 7 Nov 2016 20:11:20 +0000 (12:11 -0800)
commit591b1b494a9fab232da9d85c34b36dee9da6f33a
tree52161ad627d95f7b45b8afe12f0e8d89e75bc36f
parent4db16ede72d261191df17c72e0e78e624126b688
parent15faca00048706ebc546512155d43b6bda5e0127
[IOT-1089]Merge remote-tracking branch 'origin/master' into generic-java

To merge the master branch new jni and java source files were moved
into the java folder. Build scripts were also updated to use the new
files.

Change-Id: Iaaf4897b53ec9b22cecd797afb5d3611f6fdc38e
Signed-off-by: George Nash <george.nash@intel.com>
227 files changed:
SConstruct
auto_build.py
build_common/SConscript
build_common/external_libs.scons
build_common/linux/SConscript
build_docs.sh
java/SConscript
java/common/src/main/java/org/iotivity/base/AclGroupType.java
java/common/src/main/java/org/iotivity/base/EncodingType.java
java/common/src/main/java/org/iotivity/base/ErrorCode.java
java/common/src/main/java/org/iotivity/base/OcAccountManager.java
java/common/src/main/java/org/iotivity/base/OcCloudProvisioning.java
java/common/src/main/java/org/iotivity/base/OcDeviceInfo.java
java/common/src/main/java/org/iotivity/base/OcDirectPairDevice.java
java/common/src/main/java/org/iotivity/base/OcHeaderOption.java
java/common/src/main/java/org/iotivity/base/OcPrmType.java
java/common/src/main/java/org/iotivity/base/OcProvisioning.java
java/common/src/main/java/org/iotivity/base/OcRepresentation.java
java/common/src/main/java/org/iotivity/base/OcResource.java
java/common/src/main/java/org/iotivity/base/OcSecureResource.java
java/common/src/main/java/org/iotivity/base/OicSecAce.java
java/common/src/main/java/org/iotivity/base/OicSecAcl.java
java/common/src/main/java/org/iotivity/base/OicSecPdAcl.java
java/common/src/main/java/org/iotivity/base/OicSecResr.java
java/common/src/main/java/org/iotivity/base/OicSecValidity.java
java/common/src/main/java/org/iotivity/ca/OicCipher.java
java/examples-android/DirectPairing/.classpath
java/examples-android/DirectPairing/DirectPairing.iml
java/examples-android/DirectPairing/build.gradle
java/examples-android/DirectPairing/project.properties
java/examples-android/DirectPairing/src/main/AndroidManifest.xml
java/examples-android/DirectPairing/src/main/assets/oic_svr_db_client_directpairing.dat
java/examples-android/DirectPairing/src/main/java/org/iotivity/base/examples/DirectPairing/ExpandableListAdapter.java
java/examples-android/DirectPairing/src/main/java/org/iotivity/base/examples/DirectPairing/Led.java
java/examples-android/DirectPairing/src/main/java/org/iotivity/base/examples/DirectPairing/MainActivity.java
java/examples-android/DirectPairing/src/main/java/org/iotivity/base/examples/DirectPairing/StringConstants.java
java/examples-android/DirectPairing/src/main/res/drawable-hdpi/arrow_down.png
java/examples-android/DirectPairing/src/main/res/drawable-hdpi/arrow_right.png
java/examples-android/DirectPairing/src/main/res/drawable-hdpi/ic_launcher.png
java/examples-android/DirectPairing/src/main/res/drawable-mdpi/ic_launcher.png
java/examples-android/DirectPairing/src/main/res/drawable-xhdpi/ic_launcher.png
java/examples-android/DirectPairing/src/main/res/drawable-xxhdpi/ic_launcher.png
java/examples-android/DirectPairing/src/main/res/layout/activity_main.xml
java/examples-android/DirectPairing/src/main/res/layout/custom_list_view.xml
java/examples-android/DirectPairing/src/main/res/layout/group_indicator.xml
java/examples-android/DirectPairing/src/main/res/layout/list_group.xml
java/examples-android/DirectPairing/src/main/res/layout/list_item.xml
java/examples-android/DirectPairing/src/main/res/menu/main.xml
java/examples-android/DirectPairing/src/main/res/values-v11/styles.xml
java/examples-android/DirectPairing/src/main/res/values-v14/styles.xml
java/examples-android/DirectPairing/src/main/res/values-w820dp/dimens.xml
java/examples-android/DirectPairing/src/main/res/values/dimens.xml
java/examples-android/DirectPairing/src/main/res/values/strings.xml
java/examples-android/DirectPairing/src/main/res/values/styles.xml
java/examples-android/cloudprovisioningclient/build.gradle
java/examples-android/cloudprovisioningclient/cloudprovisioningclient.iml
java/examples-android/cloudprovisioningclient/proguard-rules.pro
java/examples-android/cloudprovisioningclient/src/main/AndroidManifest.xml
java/examples-android/cloudprovisioningclient/src/main/assets/oic_svr_db_client.dat
java/examples-android/cloudprovisioningclient/src/main/assets/oic_svr_db_client.json
java/examples-android/cloudprovisioningclient/src/main/java/org/iotivity/base/examples/cloudprovisioningclient/CloudProvisioningClient.java
java/examples-android/cloudprovisioningclient/src/main/java/org/iotivity/base/examples/cloudprovisioningclient/LoginActivity.java
java/examples-android/cloudprovisioningclient/src/main/java/org/iotivity/base/examples/cloudprovisioningclient/StringConstants.java
java/examples-android/cloudprovisioningclient/src/main/res/drawable/dash_nil_border.xml
java/examples-android/cloudprovisioningclient/src/main/res/drawable/round_button.xml
java/examples-android/cloudprovisioningclient/src/main/res/layout/activity_login.xml
java/examples-android/cloudprovisioningclient/src/main/res/layout/main_activity.xml
java/examples-android/cloudprovisioningclient/src/main/res/layout/setting_layout.xml
java/examples-android/cloudprovisioningclient/src/main/res/menu/menu_cloud_provision.xml
java/examples-android/cloudprovisioningclient/src/main/res/mipmap-hdpi/ic_launcher.png
java/examples-android/cloudprovisioningclient/src/main/res/mipmap-mdpi/ic_launcher.png
java/examples-android/cloudprovisioningclient/src/main/res/mipmap-xhdpi/ic_launcher.png
java/examples-android/cloudprovisioningclient/src/main/res/mipmap-xxhdpi/ic_launcher.png
java/examples-android/cloudprovisioningclient/src/main/res/values-v21/styles.xml
java/examples-android/cloudprovisioningclient/src/main/res/values-w820dp/dimens.xml
java/examples-android/cloudprovisioningclient/src/main/res/values/dimens.xml
java/examples-android/cloudprovisioningclient/src/main/res/values/strings.xml
java/examples-android/cloudprovisioningclient/src/main/res/values/styles.xml
java/examples-android/devicediscoveryclient/src/main/java/org/iotivity/base/examples/DeviceDiscoveryClient.java
java/examples-android/devicediscoveryserver/.idea/compiler.xml
java/examples-android/devicediscoveryserver/.idea/copyright/profiles_settings.xml
java/examples-android/devicediscoveryserver/.idea/encodings.xml
java/examples-android/devicediscoveryserver/.idea/gradle.xml
java/examples-android/devicediscoveryserver/.idea/misc.xml
java/examples-android/devicediscoveryserver/.idea/modules.xml
java/examples-android/devicediscoveryserver/.idea/runConfigurations.xml
java/examples-android/devicediscoveryserver/.idea/workspace.xml
java/examples-android/devicediscoveryserver/gradle.properties
java/examples-android/devicediscoveryserver/gradle/wrapper/gradle-wrapper.jar
java/examples-android/devicediscoveryserver/gradle/wrapper/gradle-wrapper.properties
java/examples-android/devicediscoveryserver/gradlew
java/examples-android/devicediscoveryserver/gradlew.bat
java/examples-android/devicediscoveryserver/local.properties
java/examples-android/devicediscoveryserver/src/main/java/org/iotivity/base/examples/DeviceDiscoveryServer.java
java/examples-android/fridgeclient/src/main/java/org/iotivity/base/examples/FridgeClient.java
java/examples-android/fridgegroupclient/src/main/java/org/iotivity/base/examples/FridgeGroupClient.java
java/examples-android/groupclient/src/main/java/org/iotivity/base/examples/GroupClient.java
java/examples-android/groupserver/src/main/java/org/iotivity/base/examples/GroupServer.java
java/examples-android/presenceclient/src/main/java/org/iotivity/base/examples/PresenceClient.java
java/examples-android/provisioningclient/src/main/assets/oic_svr_db_client.dat
java/examples-android/provisioningclient/src/main/assets/oic_svr_db_client.json
java/examples-android/provisioningclient/src/main/assets/rootca.crt
java/examples-android/provisioningclient/src/main/java/org/iotivity/base/examples/provisioningclient/ProvisioningClient.java
java/examples-android/provisioningclient/src/main/java/org/iotivity/base/examples/provisioningclient/StringConstants.java
java/examples-android/settings.gradle
java/examples-android/simplebase/src/main/AndroidManifest.xml
java/examples-android/simplebase/src/main/java/org/iotivity/base/examples/BluetoothFragment.java
java/examples-android/simplebase/src/main/java/org/iotivity/base/examples/CloudFragment.java
java/examples-android/simplebase/src/main/java/org/iotivity/base/examples/Common.java
java/examples-android/simplebase/src/main/java/org/iotivity/base/examples/DrawerFragment.java
java/examples-android/simplebase/src/main/java/org/iotivity/base/examples/LoginActivity.java
java/examples-android/simplebase/src/main/java/org/iotivity/base/examples/MessageFragment.java
java/examples-android/simplebase/src/main/java/org/iotivity/base/examples/SimpleBase.java
java/examples-android/simplebase/src/main/res/layout/activity_login.xml
java/examples-android/simplebase/src/main/res/layout/fragment_cloud.xml
java/examples-android/simplebase/src/main/res/layout/input.xml
java/examples-android/simplebase/src/main/res/values/strings.xml
java/examples-android/simpleclient/src/main/assets/oic_svr_db_client.dat
java/examples-android/simpleclient/src/main/assets/oic_svr_db_client.json
java/examples-android/simpleclient/src/main/java/org/iotivity/base/examples/SimpleClient.java
java/examples-android/simpleserver/src/main/assets/oic_svr_db_server.dat
java/examples-android/simpleserver/src/main/assets/oic_svr_db_server.json
java/examples-android/simpleserver/src/main/java/org/iotivity/base/examples/Light.java
java/examples-java/gradlew
java/iotivity-android/build.gradle
java/iotivity-android/src/androidTest/java/org/iotivity/base/OcRepresentationTest.java
java/iotivity-android/src/androidTest/java/org/iotivity/base/SmokeTest.java
java/iotivity-android/src/main/java/org/iotivity/base/OcPlatform.java
java/iotivity-android/src/main/java/org/iotivity/ca/CaBtPairingInterface.java
java/iotivity-android/src/main/java/org/iotivity/ca/CaEdrInterface.java
java/iotivity-android/src/main/java/org/iotivity/ca/CaInterface.java
java/iotivity-android/src/main/java/org/iotivity/ca/CaIpInterface.java
java/iotivity-android/src/main/java/org/iotivity/ca/CaLeClientInterface.java
java/iotivity-android/src/main/java/org/iotivity/ca/CaNfcInterface.java
java/jni/JniCaInterface.c
java/jni/JniCaInterface.h
java/jni/JniDisplayPinListener.cpp
java/jni/JniDisplayPinListener.h
java/jni/JniEntityHandler.cpp
java/jni/JniGetAclIdByDeviceListener.cpp
java/jni/JniGetAclIdByDeviceListener.h
java/jni/JniListenerManager.h
java/jni/JniOcAccountManager.cpp
java/jni/JniOcAccountManager.h
java/jni/JniOcCloudProvisioning.cpp
java/jni/JniOcCloudProvisioning.h
java/jni/JniOcCloudResultListener.cpp
java/jni/JniOcCloudResultListener.h
java/jni/JniOcDirectPairDevice.cpp
java/jni/JniOcDirectPairDevice.h
java/jni/JniOcPlatform.cpp
java/jni/JniOcPlatform.h
java/jni/JniOcPresenceHandle.cpp
java/jni/JniOcPresenceHandle.h
java/jni/JniOcProvisioning.cpp
java/jni/JniOcProvisioning.h
java/jni/JniOcRepresentation.cpp
java/jni/JniOcRepresentation.h
java/jni/JniOcRequestHandle.cpp
java/jni/JniOcResource.cpp
java/jni/JniOcResource.h
java/jni/JniOcResourceHandle.cpp
java/jni/JniOcResourceIdentifier.cpp
java/jni/JniOcResourceRequest.cpp
java/jni/JniOcResourceResponse.cpp
java/jni/JniOcSecureResource.cpp
java/jni/JniOcSecureResource.h
java/jni/JniOcStack.cpp
java/jni/JniOcStack.h
java/jni/JniOnDPDevicesFoundListener.cpp
java/jni/JniOnDPDevicesFoundListener.h
java/jni/JniOnDeleteListener.cpp
java/jni/JniOnDeleteListener.h
java/jni/JniOnDeleteResourceListener.cpp
java/jni/JniOnDeleteResourceListener.h
java/jni/JniOnDeviceInfoListener.cpp
java/jni/JniOnDirectPairingListener.cpp
java/jni/JniOnDirectPairingListener.h
java/jni/JniOnGetListener.cpp
java/jni/JniOnGetListener.h
java/jni/JniOnMQSubscribeListener.cpp
java/jni/JniOnMQSubscribeListener.h
java/jni/JniOnMQTopicFoundListener.cpp
java/jni/JniOnMQTopicFoundListener.h
java/jni/JniOnObserveListener.cpp
java/jni/JniOnObserveListener.h
java/jni/JniOnPlatformInfoListener.cpp
java/jni/JniOnPostListener.cpp
java/jni/JniOnPostListener.h
java/jni/JniOnPresenceListener.cpp
java/jni/JniOnPublishResourceListener.cpp
java/jni/JniOnPublishResourceListener.h
java/jni/JniOnPutListener.cpp
java/jni/JniOnResourceFoundListener.cpp
java/jni/JniOnResourceFoundListener.h
java/jni/JniPinCheckListener.cpp
java/jni/JniProvisionResultListner.cpp
java/jni/JniProvisionResultListner.h
java/jni/JniSecureUtils.cpp
java/jni/JniSecureUtils.h
java/jni/JniUtils.cpp
java/jni/JniUtils.h
java/jni/SConscript
resource/csdk/connectivity/api/cautilinterface.h
resource/csdk/connectivity/inc/caadapterutils.h
resource/csdk/connectivity/src/adapter_util/caadapterutils.c
resource/csdk/connectivity/util/src/cautilinterface.c
resource/docs/javadocGen.sh
service/easy-setup/Build_Instructions_Android_Arduino.txt
service/easy-setup/mediator/richsdk/SConscript
service/easy-setup/mediator/richsdk/android/EasySetupCore/build.gradle
service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/Android.mk
service/easy-setup/mediator/richsdk/android/build.gradle
service/easy-setup/sampleapp/mediator/android/EasySetup/app/build.gradle
service/notification/SConscript
service/notification/android/notification-service/build.gradle
service/notification/android/notification-service/src/main/jni/Android.mk
service/notification/cpp-wrapper/consumer/SConscript
service/notification/cpp-wrapper/provider/SConscript
service/resource-container/examples/android/RCSampleClientApp/README
service/resource-container/examples/android/RCSampleServerApp/README
service/resource-encapsulation/examples/android/RESampleClientApp/README
service/resource-encapsulation/examples/android/RESampleServerApp/README
service/resource-encapsulation/src/common/primitiveResource/unittests/ResourceAttributesTest.cpp
service/resource-hosting/android/resource_hosting/jni/Android.mk
service/things-manager/sdk/java/jni/Android.mk
service/things-manager/sdk/java/jni/SConscript