From 8c01dff2c5bc5496f7dc1632c498943ec6ecb015 Mon Sep 17 00:00:00 2001 From: Youngjae Shin Date: Mon, 31 Aug 2015 14:35:18 +0900 Subject: [PATCH] Imported Upstream version 0.9.2 --- .gitignore | 17 + NOTICE.md | 17 +- Readme.scons.txt | 57 +- android/BuildInstructionsForAndroidAPI.txt | 4 +- android/android_api/base/base.iml | 1 - android/android_api/base/jni/Android.mk | 4 +- android/android_api/base/jni/JniOcPlatform.cpp | 3411 +++++++++++--------- android/android_api/base/jni/JniOcPlatform.h | 37 +- .../android_api/base/jni/JniOcRepresentation.cpp | 18 +- android/android_api/base/jni/JniOcRepresentation.h | 10 +- android/android_api/base/jni/JniOcSecurity.cpp | 60 + android/android_api/base/jni/JniOcSecurity.h | 43 + .../base/jni/JniOnPlatformInfoListener.cpp | 114 + .../base/jni/JniOnPlatformInfoListener.h | 42 + android/android_api/base/jni/JniUtils.cpp | 381 ++- android/android_api/base/jni/JniUtils.h | 441 ++- .../org/iotivity/base/OcRepresentationTest.java | 1168 ++++--- .../java/org/iotivity/base/SmokeTest.java | 323 +- .../src/main/java/org/iotivity/base/ErrorCode.java | 198 +- .../java/org/iotivity/base/OcConnectivityType.java | 163 +- .../main/java/org/iotivity/base/OcDeviceInfo.java | 139 +- .../main/java/org/iotivity/base/OcPlatform.java | 1699 +++++----- .../java/org/iotivity/base/OcPlatformInfo.java | 156 + .../java/org/iotivity/base/OcRepresentation.java | 712 ++-- .../main/java/org/iotivity/base/OcResource.java | 1151 +++---- .../main/java/org/iotivity/base/OcStackConfig.java | 33 + .../java/org/iotivity/base/PlatformConfig.java | 33 +- .../java/org/iotivity/base/ResourceProperty.java | 6 +- .../main/java/org/iotivity/ca/CaEdrInterface.java | 87 + .../main/java/org/iotivity/ca/CaIpInterface.java | 52 +- .../java/org/iotivity/ca/CaLeClientInterface.java | 295 ++ .../java/org/iotivity/ca/CaLeServerInterface.java | 181 ++ .../main/java/org/iotivity/ca/CaWiFiInterface.java | 72 - .../fridgeclient/src/main/AndroidManifest.xml | 55 +- .../base/examples/fridgeclient/FridgeClient.java | 725 ++--- .../examples/fridgeclient/StringConstants.java | 66 +- .../fridgeserver/src/main/AndroidManifest.xml | 11 + .../base/examples/fridgeserver/DeviceResource.java | 375 ++- android/examples/guiclient/.gitignore | 1 + android/examples/guiclient/build.gradle | 25 + android/examples/guiclient/guiclient.iml | 92 + .../examples/guiclient/proguard-rules.pro | 10 +- .../guiclient/src/main/AndroidManifest.xml | 35 + .../guiclient/ExpandableResourceListAdapter.java | 382 +++ .../java/org/iotivity/guiclient/MainActivity.java | 336 ++ .../org/iotivity/guiclient/OcAttributeInfo.java | 176 + .../org/iotivity/guiclient/OcProtocolStrings.java | 50 + .../org/iotivity/guiclient/OcResourceInfo.java | 375 +++ .../main/java/org/iotivity/guiclient/OcWorker.java | 524 +++ .../org/iotivity/guiclient/OcWorkerListener.java | 56 + .../src/main/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 9397 bytes .../src/main/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 5237 bytes .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 14383 bytes .../src/main/res/drawable-xxhdpi/ic_launcher.png | Bin 0 -> 19388 bytes .../main/res/drawable/android_resource_icon.png | Bin 0 -> 5998 bytes .../src/main/res/drawable/attribute_icon.png | Bin 0 -> 22671 bytes .../src/main/res/drawable/ic_action_discard.png | Bin 0 -> 450 bytes .../main/res/drawable/ic_action_discard_dark.png | Bin 0 -> 454 bytes .../src/main/res/drawable/ic_action_refresh.png | Bin 0 -> 663 bytes .../src/main/res/drawable/iotivity_hex_icon.png | Bin 0 -> 10630 bytes .../guiclient/src/main/res/drawable/led_icon.png | Bin 0 -> 5058 bytes .../guiclient/src/main/res/drawable/light_icon.png | Bin 0 -> 7831 bytes .../src/main/res/drawable/thermometer_icon.png | Bin 0 -> 5923 bytes .../layout/actionbar_indeterminate_progress.xml | 12 + .../src/main/res/layout/activity_main.xml | 30 + .../res/layout/attribute_layout_on_off_switch.xml | 58 + .../res/layout/attribute_layout_progress_bar.xml | 56 + .../main/res/layout/attribute_layout_slider.xml | 58 + .../main/res/layout/resource_list_item_layout.xml | 46 + .../guiclient/src/main/res/menu/menu_main.xml | 18 + .../guiclient/src/main/res/values-large/refs.xml | 12 + .../guiclient/src/main/res/values-sw600dp/refs.xml | 12 + .../src/main/res/values-w820dp/dimens.xml | 6 + .../guiclient/src/main/res/values/dimens.xml | 6 + .../guiclient/src/main/res/values/refs.xml | 12 + .../guiclient/src/main/res/values/strings.xml | 29 + .../guiclient/src/main/res/values/styles.xml | 8 + android/examples/settings.gradle | 2 +- .../simpleclient/src/main/AndroidManifest.xml | 10 + .../src/main/assets/oic_svr_db_client.json | 49 + .../base/examples/simpleclient/SimpleClient.java | 958 +++--- .../examples/simpleclient/StringConstants.java | 6 +- .../simpleserver/src/main/AndroidManifest.xml | 10 + .../src/main/assets/oic_svr_db_server.json | 55 + .../base/examples/simpleserver/LightResource.java | 2 +- .../base/examples/simpleserver/SimpleServer.java | 79 +- .../examples/simpleserver/StringConstants.java | 5 +- arduino.scons | 2 + auto_build.sh | 192 +- build_common/SConscript | 68 +- build_common/android/SConscript | 2 +- build_common/arduino/SConscript | 17 +- build_common/darwin/SConscript | 55 +- build_common/external_libs.scons | 8 + build_common/tizen/SConscript | 30 +- build_docs.sh | 52 + examples/OICMiddle/Client.cpp | 2 +- examples/OICMiddle/LineInput.cpp | 4 +- examples/OICMiddle/OICMiddle.cpp | 8 + examples/OICMiddle/OICMiddle.h | 1 + examples/OICMiddle/RestInput.cpp | 9 +- examples/OICMiddle/RestInput.h | 4 +- examples/OICMiddle/SConstruct | 81 - examples/OICMiddle/WrapResource.cpp | 2 +- examples/OICSensorBoard/Makefile | 34 + examples/OICSensorBoard/OICSensorBoardREADME.pdf | Bin 299033 -> 0 bytes examples/OICSensorBoard/README | 14 + examples/OICSensorBoard/SConstruct | 84 - examples/OICSensorBoard/client.cpp | 8 +- examples/OICSensorBoard/sensors.h | 39 +- examples/OICSensorBoard/server.cpp | 1 + extlibs/android/sdk/SConscript | 2 +- extlibs/arduino/SConscript | 153 +- extlibs/boost/SConscript | 12 +- extlibs/buildDependencies.sh | 13 +- extlibs/cereal/SConscript | 41 - extlibs/gtest/SConscript | 23 +- extlibs/raxmpp/SConscript | 60 + extlibs/tinycbor/SConscript | 46 + ...anonymous-ecdh-cipher-suite-into-tinydtls.patch | 1164 +++++++ extlibs/tinydtls/SConscript | 5 +- extlibs/tinydtls/aes/rijndael.h | 1 + extlibs/tinydtls/crypto.c | 170 +- extlibs/tinydtls/crypto.h | 15 +- extlibs/tinydtls/dtls.c | 339 +- extlibs/tinydtls/dtls.h | 52 +- extlibs/tinydtls/ecc/Makefile.contiki | 0 extlibs/tinydtls/ecc/Makefile.ecc | 0 extlibs/tinydtls/ecc/test_helper.c | 79 - extlibs/tinydtls/ecc/test_helper.h | 51 - extlibs/tinydtls/ecc/testecc.c | 226 -- extlibs/tinydtls/ecc/testfield.c | 290 -- extlibs/tinydtls/global.h | 6 + extlibs/tinydtls/tests/dtls-client.c | 43 +- extlibs/tinydtls/tests/dtls-server.c | 21 +- extlibs/tinydtls/tinydtls.h | 2 +- extlibs/tinydtls/uthash.h | 74 +- extlibs/tinydtls/utlist.h | 20 +- extra_options.scons | 1 - gbsbuild.sh | 4 +- resource/SConscript | 13 +- resource/android/SConscript | 1 + resource/c_common/SConscript | 53 + .../oic_malloc/include}/oic_malloc.h | 22 +- .../oic_malloc}/src/oic_malloc.c | 23 + resource/c_common/oic_malloc/test/SConscript | 55 + .../oic_malloc/test/linux/oic_malloc_tests.cpp} | 68 +- resource/c_common/oic_string/include/oic_string.h | 97 + resource/c_common/oic_string/src/oic_string.c | 98 + resource/c_common/oic_string/test/SConscript | 55 + .../oic_string/test/linux/oic_string_tests.cpp | 541 ++++ resource/csdk/SConscript | 23 +- resource/csdk/connectivity/SConscript | 14 +- resource/csdk/connectivity/SConstruct | 62 - resource/csdk/connectivity/api/cacommon.h | 225 +- resource/csdk/connectivity/api/cainterface.h | 200 +- resource/csdk/connectivity/build/How_To_Build.txt | 2 + resource/csdk/connectivity/build/SConscript | 28 +- .../csdk/connectivity/build/android/SConscript | 2 +- .../csdk/connectivity/build/android/jni/Android.mk | 64 +- .../build/arduino/arduinomega.properties | 2 +- resource/csdk/connectivity/build/common.mk | 60 - resource/csdk/connectivity/build/tizen/gbsbuild.sh | 28 +- .../build/tizen/packaging/com.oic.ca.spec | 3 + .../csdk/connectivity/build/tizen/scons/SConscript | 1 + resource/csdk/connectivity/common/SConscript | 26 +- .../{ => common}/inc/caremotehandler.h | 30 +- resource/csdk/connectivity/common/inc/logger.h | 11 +- resource/csdk/connectivity/common/inc/uarraylist.h | 7 + .../csdk/connectivity/common/src/camutex_noop.c | 112 + .../csdk/connectivity/common/src/caremotehandler.c | 358 ++ resource/csdk/connectivity/common/src/logger.c | 7 +- resource/csdk/connectivity/common/src/oic_logger.c | 9 +- resource/csdk/connectivity/common/src/uarraylist.c | 15 +- resource/csdk/connectivity/common/src/uqueue.c | 1 - .../csdk/connectivity/inc/caadapterinterface.h | 31 +- resource/csdk/connectivity/inc/caadapternetdtls.h | 112 +- resource/csdk/connectivity/inc/caadapterutils.h | 74 +- resource/csdk/connectivity/inc/caedradapter.h | 24 +- .../connectivity/inc/caedradapter_singlethread.h | 6 +- resource/csdk/connectivity/inc/caedrinterface.h | 28 +- .../inc/{camsgparser.h => cafragmentation.h} | 46 +- .../csdk/connectivity/inc/cainterfacecontroller.h | 47 +- .../inc/cainterfacecontroller_singlethread.h | 23 +- resource/csdk/connectivity/inc/caipadapter.h | 37 +- .../connectivity/inc/caipadapter_singlethread.h | 128 - resource/csdk/connectivity/inc/caipinterface.h | 266 +- .../connectivity/inc/caipinterface_singlethread.h | 307 -- resource/csdk/connectivity/inc/caleadapter.h | 69 +- .../connectivity/inc/caleadapter_singlethread.h | 427 --- resource/csdk/connectivity/inc/caleinterface.h | 55 +- .../connectivity/inc/caleinterface_singlethread.h | 216 -- resource/csdk/connectivity/inc/camessagehandler.h | 10 +- .../inc/camessagehandler_singlethread.h | 10 +- .../csdk/connectivity/inc/canetworkconfigurator.h | 10 +- resource/csdk/connectivity/inc/caprotocolmessage.h | 43 +- resource/csdk/connectivity/inc/caraadapter.h | 131 + resource/csdk/connectivity/inc/caretransmission.h | 31 +- .../inc/caretransmission_singlethread.h | 155 - resource/csdk/connectivity/inc/ifaddrs.h | 59 + .../csdk/connectivity/lib/libcoap-4.1.1/SConscript | 1 + .../csdk/connectivity/lib/libcoap-4.1.1/config.h | 4 +- .../connectivity/lib/libcoap-4.1.1/examples/rd.c | 6 +- resource/csdk/connectivity/lib/libcoap-4.1.1/pdu.c | 2 +- resource/csdk/connectivity/lib/libcoap-4.1.1/pdu.h | 2 +- resource/csdk/connectivity/lib/libcoap-4.1.1/uri.c | 40 +- resource/csdk/connectivity/lib/libcoap-4.1.1/uri.h | 11 +- .../csdk/connectivity/samples/android/SConscript | 1 + .../android/sample_service/AndroidManifest.xml | 4 +- .../samples/android/sample_service/jni/Android.mk | 9 +- .../android/sample_service/jni/ResourceModel.c | 652 ++-- .../jni/org_iotivity_ca_service_RMInterface.h | 118 + .../jni/org_iotivity_service_RMInterface.h | 134 - .../sample_service/res/layout/activity_main.xml | 180 +- .../android/sample_service/res/menu/main.xml | 2 +- .../android/sample_service/res/values/strings.xml | 14 +- .../src/org/iotivity/ca/CaEdrInterface.java | 87 + .../src/org/iotivity/ca/CaIpInterface.java | 50 +- .../src/org/iotivity/ca/CaLeClientInterface.java | 295 ++ .../src/org/iotivity/ca/CaLeServerInterface.java | 180 ++ .../src/org/iotivity/{ => ca}/service/DLog.java | 4 +- .../iotivity/{ => ca}/service/MainActivity.java | 215 +- .../org/iotivity/{ => ca}/service/RMInterface.java | 6 +- .../src/org/iotivity/jar/CALeInterface.java | 343 -- .../src/org/iotivity/jar/caipinterface.java | 55 - .../csdk/connectivity/samples/arduino/SConscript | 2 +- .../csdk/connectivity/samples/arduino/casample.cpp | 511 +-- resource/csdk/connectivity/samples/linux/README | 30 +- .../csdk/connectivity/samples/linux/SConscript | 14 +- resource/csdk/connectivity/samples/linux/sample.sh | 36 - .../csdk/connectivity/samples/linux/sample_main.c | 697 ++-- .../csdk/connectivity/samples/tizen/SConscript | 29 +- .../csdk/connectivity/samples/tizen/casample.c | 647 ++-- .../samples/tizen/packaging/com.oic.ca.sample.spec | 2 +- .../connectivity/samples/tizen/scons/SConscript | 6 + resource/csdk/connectivity/src/SConscript | 116 +- .../src/adapter_util/caadapternetdtls.c | 557 +++- .../connectivity/src/adapter_util/caadapterutils.c | 485 +-- .../{camsgparser.c => cafragmentation.c} | 26 +- .../csdk/connectivity/src/adapter_util/ifaddrs.c | 725 +++++ .../connectivity/src/bt_edr_adapter/SConscript | 65 +- .../src/bt_edr_adapter/android/SConscript | 15 + .../src/bt_edr_adapter/android/caedrclient.c | 66 +- .../src/bt_edr_adapter/android/caedrnwmonitor.c | 10 +- .../src/bt_edr_adapter/android/caedrserver.c | 3 +- .../src/bt_edr_adapter/android/caedrutils.c | 3 +- .../android/org_iotivity_ca_CaEdrInterface.h} | 39 +- .../android/org_iotivity_jar_caedrinterface.h | 31 - .../connectivity/src/bt_edr_adapter/caedradapter.c | 167 +- .../src/bt_edr_adapter/linux/SConscript | 9 + .../src/bt_edr_adapter/linux/caedradapter.c | 16 +- .../src/bt_edr_adapter/tizen/SConscript | 21 + .../src/bt_edr_adapter/tizen/caedrclient.c | 10 + .../src/bt_edr_adapter/tizen/caedrendpoint.c | 2 +- .../src/bt_edr_adapter/tizen/caedrnwmonitor.c | 5 +- .../csdk/connectivity/src/bt_le_adapter/SConscript | 86 +- .../src/bt_le_adapter/android/SConscript | 15 + .../src/bt_le_adapter/android/caleclient.c | 231 +- .../src/bt_le_adapter/android/caleclient.h | 14 - .../src/bt_le_adapter/android/calenwmonitor.c | 10 +- .../src/bt_le_adapter/android/caleserver.c | 137 +- .../src/bt_le_adapter/android/caleserver.h | 7 + .../src/bt_le_adapter/android/caleutils.h | 6 +- .../android/org_iotivity_ca_CaLeClientInterface.h | 161 + .../android/org_iotivity_ca_CaLeServerInterface.h | 149 + .../android/org_iotivity_jar_caleclientinterface.h | 141 - .../android/org_iotivity_jar_caleserverinterface.h | 129 - .../src/bt_le_adapter/arduino/SConscript | 14 + .../src/bt_le_adapter/arduino/cableclient.cpp | 61 + .../src/bt_le_adapter/arduino/cablenwmonitor.cpp | 15 +- .../src/bt_le_adapter/arduino/cableserver.cpp | 174 +- .../src/bt_le_adapter/arduino/cableserver.h | 27 +- .../connectivity/src/bt_le_adapter/caleadapter.c | 2350 +++++++------- .../src/bt_le_adapter/caleadapter_singlethread.c | 429 --- .../src/bt_le_adapter/linux/SConscript | 9 + .../src/bt_le_adapter/linux/caleadapter.c | 16 +- .../src/bt_le_adapter/tizen/SConscript | 20 + .../src/bt_le_adapter/tizen/cableclient.c | 79 +- .../src/bt_le_adapter/tizen/cableclient.h | 2 +- .../src/bt_le_adapter/tizen/cableserver.c | 73 +- .../src/bt_le_adapter/tizen/cableserver.h | 2 +- .../src/bt_le_adapter/tizen/cableutil.c | 39 +- .../src/bt_le_adapter/tizen/cableutil.h | 6 +- .../csdk/connectivity/src/caconnectivitymanager.c | 322 +- .../src/caconnectivitymanager_singlethread.c | 245 -- .../csdk/connectivity/src/cainterfacecontroller.c | 207 +- .../src/cainterfacecontroller_singlethread.c | 512 --- resource/csdk/connectivity/src/camessagehandler.c | 538 +-- .../src/camessagehandler_singlethread.c | 254 +- .../csdk/connectivity/src/canetworkconfigurator.c | 98 +- resource/csdk/connectivity/src/caprotocolmessage.c | 161 +- resource/csdk/connectivity/src/caqueueingthread.c | 22 +- resource/csdk/connectivity/src/caremotehandler.c | 532 --- resource/csdk/connectivity/src/caretransmission.c | 265 +- .../src/caretransmission_singlethread.c | 440 --- .../csdk/connectivity/src/ip_adapter/SConscript | 73 +- .../connectivity/src/ip_adapter/android/SConscript | 12 + .../src/ip_adapter/android/caipnwmonitor.c | 915 +----- .../android/org_iotivity_ca_CaIpInterface.h | 40 +- .../connectivity/src/ip_adapter/arduino/SConscript | 20 + .../ip_adapter/arduino/caipadapterutils_eth.cpp | 1 - .../src/ip_adapter/arduino/caipadapterutils_eth.h | 2 +- .../src/ip_adapter/arduino/caipclient_eth.cpp | 33 +- .../src/ip_adapter/arduino/caipclient_wifi.cpp | 28 +- .../src/ip_adapter/arduino/caipnwmonitor.cpp | 63 - .../src/ip_adapter/arduino/caipnwmonitor_eth.cpp | 105 + .../src/ip_adapter/arduino/caipnwmonitor_wifi.cpp | 109 + .../src/ip_adapter/arduino/caipserver_eth.cpp | 136 +- .../src/ip_adapter/arduino/caipserver_wifi.cpp | 125 +- .../csdk/connectivity/src/ip_adapter/caipadapter.c | 736 ++--- .../src/ip_adapter/caipadapter_singlethread.c | 487 --- .../csdk/connectivity/src/ip_adapter/caipclient.c | 147 - .../csdk/connectivity/src/ip_adapter/caipserver.c | 1354 ++++---- .../src/ip_adapter/linux/caipnwmonitor.c | 632 +--- .../connectivity/src/ip_adapter/tizen/SConscript | 12 + .../src/ip_adapter/tizen/caipnwmonitor.c | 635 +--- .../csdk/connectivity/src/ra_adapter/SConscript | 31 + .../csdk/connectivity/src/ra_adapter/caraadapter.c | 427 +++ resource/csdk/connectivity/test/SConscript | 17 +- .../csdk/connectivity/test/ca_api_unittest.cpp | 404 +-- .../connectivity/test/caprotocolmessagetest.cpp | 31 +- resource/csdk/doc/Doxyfile | 3 +- resource/csdk/logger/src/logger.c | 5 +- resource/csdk/ocmalloc/include/ocmalloc.h | 94 - resource/csdk/ocmalloc/src/ocmalloc.c | 106 - resource/csdk/ocmalloc/test/linux/README | 35 - resource/csdk/ocrandom/include/ocrandom.h | 6 +- resource/csdk/ocrandom/test/SConscript | 14 +- resource/csdk/ocrandom/test/android/randomtest.cpp | 3 +- resource/csdk/ocrandom/test/arduino/randomtest.cpp | 3 +- resource/csdk/ocrandom/test/linux/randomtest.cpp | 5 +- ...-building-and-running-secure-IoTivity-stack.txt | 17 + resource/csdk/security/SConscript | 106 + resource/csdk/security/include/base64.h | 88 + .../csdk/security/include/internal/aclresource.h | 71 + .../csdk/security/include/internal/credresource.h | 133 + .../csdk/security/include/internal/doxmresource.h | 102 + .../csdk/security/include/internal/policyengine.h | 88 + .../{ocsecurityinternal.h => psinterface.h} | 40 +- .../csdk/security/include/internal/pstatresource.h | 71 + .../security/include/internal/resourcemanager.h | 56 + .../include/internal/secureresourcemanager.h | 101 + .../security/include/internal/srmresourcestrings.h | 92 + resource/csdk/security/include/ocsecurityconfig.h | 103 - .../security/include/securevirtualresourcetypes.h | 418 +++ resource/csdk/security/include/srmutility.h | 104 + resource/csdk/security/provisioning/SConscript | 91 + .../include/internal/credentialgenerator.h | 48 + .../provisioning/include/provisioningmanager.h | 159 + .../sample/README-Provisioning-Tool.txt | 23 + .../csdk/security/provisioning/sample/SConscript | 77 + .../provisioning/sample/oic_svr_db_prov_tool.json | 43 + .../sample/oic_svr_db_unowned_server.json | 43 + .../provisioning/sample/provisioningclient.c | 326 ++ .../provisioning/src/credentialgenerator.c | 76 + .../provisioning/src/provisioningmanager.c | 1669 ++++++++++ .../csdk/security/provisioning/unittest/SConscript | 83 + .../provisioning/unittest/provisioningmanager.cpp | 58 + resource/csdk/security/src/aclresource.c | 599 ++++ resource/csdk/security/src/base64.c | 255 ++ resource/csdk/security/src/credresource.c | 753 +++++ resource/csdk/security/src/doxmresource.c | 719 +++++ resource/csdk/security/src/ocsecurity.c | 237 -- resource/csdk/security/src/policyengine.c | 373 +++ resource/csdk/security/src/psinterface.c | 200 ++ resource/csdk/security/src/pstatresource.c | 401 +++ resource/csdk/security/src/resourcemanager.c | 115 + resource/csdk/security/src/secureresourcemanager.c | 286 ++ resource/csdk/security/src/srmresourcestrings.c | 87 + resource/csdk/security/src/srmutility.c | 86 + resource/csdk/security/unittest/SConscript | 105 + .../csdk/security/unittest/aclresourcetest.cpp | 252 ++ resource/csdk/security/unittest/base64tests.cpp | 260 ++ .../csdk/security/unittest/credentialresource.cpp | 260 ++ resource/csdk/security/unittest/doxmresource.cpp | 173 + resource/csdk/security/unittest/oic_svr_db.json | 45 + resource/csdk/security/unittest/oic_unittest.json | 37 + .../csdk/security/unittest/oic_unittest_acl1.json | 53 + .../unittest/oic_unittest_default_acl.json | 21 + resource/csdk/security/unittest/policyengine.cpp | 110 + resource/csdk/security/unittest/pstatresource.cpp | 162 + .../security/unittest/securityresourcemanager.cpp | 156 + resource/csdk/security/unittest/srmutility.cpp | 71 + resource/csdk/stack/README | 26 +- resource/csdk/stack/include/internal/occlientcb.h | 7 +- resource/csdk/stack/include/internal/ocobserve.h | 19 +- .../include/internal/ocpayloadcbor.h} | 33 +- resource/csdk/stack/include/internal/ocresource.h | 12 +- .../stack/include/internal/ocresourcehandler.h | 48 +- .../csdk/stack/include/internal/ocserverrequest.h | 45 +- .../csdk/stack/include/internal/ocstackinternal.h | 31 +- resource/csdk/stack/include/ocpayload.h | 384 +++ resource/csdk/stack/include/ocpresence.h | 47 + resource/csdk/stack/include/ocstack.h | 123 +- resource/csdk/stack/include/ocstackconfig.h | 8 +- resource/csdk/stack/include/octypes.h | 569 +++- .../arduino/SimpleClientServer/ocserver/SConscript | 5 +- .../SimpleClientServer/ocserver/ocserver.cpp | 45 +- .../samples/linux/SimpleClientServer/SConscript | 16 +- .../samples/linux/SimpleClientServer/common.cpp | 2 + .../samples/linux/SimpleClientServer/occlient.cpp | 247 +- .../samples/linux/SimpleClientServer/occlient.h | 14 +- .../linux/SimpleClientServer/occlientbasicops.cpp | 351 +- .../linux/SimpleClientServer/occlientbasicops.h | 10 + .../linux/SimpleClientServer/occlientcoll.cpp | 163 +- .../linux/SimpleClientServer/occlientslow.cpp | 131 +- .../linux/SimpleClientServer/occlientslow.h | 13 + .../SimpleClientServer/ocremoteaccessclient.cpp | 523 +++ .../SimpleClientServer/ocremoteaccessclient.h | 93 + .../samples/linux/SimpleClientServer/ocserver.cpp | 305 +- .../samples/linux/SimpleClientServer/ocserver.h | 23 +- .../linux/SimpleClientServer/ocserverbasicops.cpp | 192 +- .../linux/SimpleClientServer/ocserverbasicops.h | 14 +- .../linux/SimpleClientServer/ocservercoll.cpp | 293 +- .../linux/SimpleClientServer/ocserverslow.cpp | 173 +- .../csdk/stack/samples/linux/secure/SConscript | 12 +- .../csdk/stack/samples/linux/secure/common.cpp | 43 +- resource/csdk/stack/samples/linux/secure/common.h | 3 - .../stack/samples/linux/secure/gen_sec_bin.cpp | 171 - .../samples/linux/secure/occlientbasicops.cpp | 247 +- .../stack/samples/linux/secure/occlientbasicops.h | 10 + .../samples/linux/secure/ocserverbasicops.cpp | 194 +- .../stack/samples/linux/secure/ocserverbasicops.h | 12 +- .../samples/linux/secure/oic_svr_db_client.json | 49 + .../samples/linux/secure/oic_svr_db_server.json | 55 + resource/csdk/stack/src/occlientcb.c | 55 +- resource/csdk/stack/src/occollection.c | 177 +- resource/csdk/stack/src/ocobserve.c | 139 +- resource/csdk/stack/src/ocpayload.c | 1402 ++++++++ resource/csdk/stack/src/ocpayloadconvert.c | 760 +++++ resource/csdk/stack/src/ocpayloadparse.c | 869 +++++ resource/csdk/stack/src/ocresource.c | 1091 +++---- resource/csdk/stack/src/ocserverrequest.c | 322 +- resource/csdk/stack/src/ocstack.c | 2182 ++++++------- resource/csdk/stack/src/oicgroup.c | 94 +- resource/csdk/stack/test/SConscript | 22 +- resource/csdk/stack/test/linux/occlient.c | 10 +- resource/csdk/stack/test/stacktests.cpp | 308 +- resource/docs/Doxyfile | 9 +- resource/docs/devdocs.doxyfile | 8 +- resource/docs/devdox/dot/ca_arch.gv | 2 +- resource/examples/SConscript | 8 +- resource/examples/devicediscoveryclient.cpp | 80 +- resource/examples/devicediscoveryserver.cpp | 33 +- resource/examples/fridgeclient.cpp | 38 +- resource/examples/fridgeserver.cpp | 4 +- resource/examples/garageclient.cpp | 49 +- resource/examples/groupclient.cpp | 4 +- resource/examples/groupserver.cpp | 47 +- resource/examples/oic_svr_db_client.json | 49 + resource/examples/oic_svr_db_server.json | 55 + resource/examples/presenceclient.cpp | 29 +- resource/examples/roomclient.cpp | 46 +- resource/examples/simpleclient.cpp | 20 +- resource/examples/simpleclientHQ.cpp | 49 +- resource/examples/simpleclientserver.cpp | 34 +- resource/examples/simpleserver.cpp | 8 +- resource/examples/threadingsample.cpp | 6 +- resource/include/IClientWrapper.h | 49 +- resource/include/IServerWrapper.h | 9 - resource/include/InProcClientWrapper.h | 60 +- resource/include/InProcServerWrapper.h | 10 - resource/include/InitializeException.h | 1 - resource/include/OCApi.h | 49 +- resource/include/OCException.h | 2 +- resource/include/OCPlatform.h | 7 +- resource/include/OCPlatform_impl.h | 4 +- resource/include/OCRepresentation.h | 61 +- resource/include/OCResource.h | 24 +- resource/include/OCResourceRequest.h | 2 +- resource/include/OCResourceResponse.h | 4 +- resource/include/OCSerialization.h | 276 +- resource/include/OicJsonSerializer.hpp | 847 ----- resource/include/OutOfProcClientWrapper.h | 61 +- resource/include/ResourceInitException.h | 1 - resource/include/StringConstants.h | 11 +- resource/oc_logger/SConscript | 1 + resource/oc_logger/c/oc_logger.c | 8 +- resource/patches/cereal_gcc46.patch | 485 --- resource/src/InProcClientWrapper.cpp | 353 +- resource/src/InProcServerWrapper.cpp | 120 +- resource/src/OCException.cpp | 4 + resource/src/OCPlatform.cpp | 36 +- resource/src/OCPlatform_impl.cpp | 21 +- resource/src/OCRepresentation.cpp | 966 +++--- resource/src/OCResource.cpp | 176 +- resource/src/OCResourceRequest.cpp | 26 +- resource/src/OCUtilities.cpp | 3 +- resource/src/SConscript | 3 +- resource/unit_tests.scons | 12 + resource/unittests/OCExceptionTest.cpp | 4 + resource/unittests/OCPlatformTest.cpp | 167 +- resource/unittests/OCResourceResponseTest.cpp | 12 +- resource/unittests/OCResourceTest.cpp | 4 +- resource/unittests/SConscript | 29 +- service/SConscript | 7 +- .../android/resource_hosting}/.classpath | 5 +- .../android/resource_hosting}/.project | 0 .../android/resource_hosting/AndroidManifest.xml | 17 + .../android/resource_hosting/jni/Android.mk | 65 + .../android/resource_hosting}/jni/Application.mk | 0 .../resource_hosting/jni/ResourceHosing_JNI.cpp} | 47 +- .../resource_hosting/jni/ResourceHosing_JNI.h} | 22 +- .../android/resource_hosting/project.properties | 14 + .../iotivity/ResourceHosting/ResourceHosting.java | 88 + .../NotificationManager/include/hosting.h | 11 +- .../NotificationManager/src/HostingObject.cpp | 248 ++ .../NotificationManager/src/HostingObject.h | 88 + .../NotificationManager/src/RequestObject.cpp | 62 + .../NotificationManager/src/RequestObject.h | 58 + .../NotificationManager/src/ResourceHosting.cpp | 254 ++ .../NotificationManager/src/ResourceHosting.h | 102 + .../NotificationManager/src/hosting.c | 1550 --------- .../NotificationManager/src/hosting.cpp | 68 + .../NotificationManager/src/requestHandler.c | 208 -- .../NotificationManager/src/virtualResource.c | 406 --- .../NotificationManager/src/virtualResource.h | 302 -- service/notification-manager/SConscript | 36 +- .../ResourceHostingSampleApp/ic_launcher-web.png | Bin 51394 -> 0 bytes .../ResourceHostingSampleApp/jni/Android.mk | 31 - .../android/ResourceHostingSampleApp/jni/armeabi | Bin 185600 -> 0 bytes .../example/sample/consumer/SampleConsumer.java | 24 +- .../example/sample/provider/SampleProvider.java | 39 +- .../sample/provider/TemperatureResource.java | 18 +- .../AndroidManifest.xml | 2 +- .../project.properties | 0 .../res/drawable-hdpi/ic_launcher.png | Bin .../res/drawable-mdpi/ic_launcher.png | Bin .../res/drawable-xhdpi/ic_launcher.png | Bin .../res/drawable-xxhdpi/ic_launcher.png | Bin .../res/layout/activity_main.xml | 0 .../res/values-v11/styles.xml | 0 .../res/values-v14/styles.xml | 0 .../res/values/strings.xml | 0 .../res/values/styles.xml | 0 .../ResourceHostingSampleApp.java} | 85 +- .../SampleApp/linux/SConscript | 42 +- .../linux/notificationManager/{main.c => main.cpp} | 27 +- .../linux/sampleConsumer/SampleConsumer.cpp | 16 +- .../linux/sampleProvider/SampleProvider.cpp | 2 +- .../SampleApp/tizen/NMSampleApp/.cproject | 4 +- .../SampleApp/tizen/NMSampleApp/src/main.cpp | 27 +- service/protocol-plugin/lib/cpluff/SConscript | 1 + service/protocol-plugin/plugin-manager/SConscript | 8 +- .../plugin-manager/src/Android/jni/Android.mk | 15 +- .../src/Android/jni/PluginManager.cpp | 21 +- .../plugin-manager/src/Android/jni/PluginManager.h | 12 +- .../plugin-manager/src/Android/jni/SConscript | 4 +- .../src/org/iotivity/service/ppm/FelixManager.java | 54 +- .../org/iotivity/service/ppm/FoundResource.java | 2 +- .../src/org/iotivity/service/ppm/MainActivity.java | 121 +- .../org/iotivity/service/ppm/OnGetBelkinplug.java | 2 +- .../src/org/iotivity/service/ppm/OnGetGear.java | 2 +- .../src/org/iotivity/service/ppm/OnGetHuebulb.java | 2 +- .../org/iotivity/service/ppm/OnPutBelkinplug.java | 2 +- .../src/org/iotivity/service/ppm/OnPutGear.java | 2 +- .../src/org/iotivity/service/ppm/OnPutHuebulb.java | 2 +- .../org/iotivity/service/ppm/PluginManager.java | 4 +- .../protocol-plugin/plugin-manager/src/Config.cpp | 42 +- .../protocol-plugin/plugin-manager/src/Config.h | 2 + .../plugin-manager/src/CpluffAdapter.cpp | 17 +- .../plugin-manager/src/CpluffAdapter.h | 3 - .../plugin-manager/src/FelixAdapter.cpp | 20 +- .../plugin-manager/src/FelixAdapter.h | 3 - .../plugin-manager/src/PluginManager.cpp | 23 +- .../plugin-manager/src/PluginManagerImpl.cpp | 7 +- .../plugin-manager/src/PluginManagerImpl.h | 1 + .../plugins/Android/plugin.gear.noti/.project | 28 + .../src/oic/plugin/gear/noti/Activator.java | 5 +- .../oic/plugin/gear/noti/EntityHandlerNoti.java | 44 +- .../plugins/Android/plugin.hue/.project | 28 + .../plugin.hue/src/oic/plugin/hue/Activator.java | 4 +- .../src/oic/plugin/hue/EntityHandlerHue.java | 58 +- .../plugins/Android/plugin.wemo/.project | 28 + .../plugin.wemo/src/oic/plugin/wemo/Activator.java | 4 +- .../src/oic/plugin/wemo/EntityHandlerWemo.java | 51 +- service/protocol-plugin/plugins/SConscript | 4 +- .../plugins/mqtt-fan/lib/SConscript | 1 + .../plugins/mqtt-fan/lib/cpp/SConscript | 1 + .../protocol-plugin/sample-app/linux/SConscript | 3 + .../sample-app/linux/mqtt/mqttclient.cpp | 6 +- .../sample-app/tizen/PPMSampleApp/.cproject | 6 +- .../tizen/PPMSampleApp/src/ppmsampleapp.cpp | 48 +- service/resource-encapsulation/README | 14 + service/resource-encapsulation/SConscript | 107 + service/resource-encapsulation/examples/SConscript | 8 + .../examples/linux/SConscript | 70 + .../examples/linux/SampleResourceClient.cpp | 432 +++ .../examples/linux/SampleResourceServer.cpp | 250 ++ .../resource-encapsulation/include/RCSAddress.h | 51 + .../resource-encapsulation/include/RCSBundleInfo.h | 141 + .../include/RCSDiscoveryManager.h | 89 + .../resource-encapsulation/include/RCSException.h | 150 + .../include/RCSRemoteResourceObject.h | 350 ++ .../resource-encapsulation/include/RCSRequest.h | 64 + .../include/RCSResourceAttributes.h | 770 +++++ .../include/RCSResourceContainer.h | 156 + .../include/RCSResourceObject.h | 514 +++ .../resource-encapsulation/include/RCSResponse.h | 286 ++ .../resource-encapsulation/src/common/SConscript | 130 + .../src/common/expiryTimer/include/ExpiryTimer.h | 70 + .../src/common/expiryTimer/src/ExpiryTimer.cpp | 119 + .../src/common/expiryTimer/src/ExpiryTimerImpl.cpp | 227 ++ .../src/common/expiryTimer/src/ExpiryTimerImpl.h | 128 + .../expiryTimer/unittests/ExpiryTimerTest.cpp | 332 ++ .../common/primitiveResource/include/AssertUtils.h | 222 ++ .../primitiveResource/include/PresenceSubscriber.h | 88 + .../primitiveResource/include/PrimitiveResource.h | 98 + .../include/PrimitiveResourceImpl.h | 179 + .../primitiveResource/include/RCSAddressDetail.h | 49 + .../include/ResourceAttributesConverter.h | 154 + .../include/ResourceAttributesUtils.h | 46 + .../primitiveResource/include/ResponseStatement.h | 74 + .../primitiveResource/src/PresenceSubscriber.cpp | 122 + .../primitiveResource/src/PrimitiveResource.cpp | 63 + .../common/primitiveResource/src/RCSAddress.cpp | 71 + .../common/primitiveResource/src/RCSException.cpp | 114 + .../src/RCSResourceAttributes.cpp | 604 ++++ .../primitiveResource/src/ResponseStatement.cpp | 82 + .../unittests/PresenceSubscriberTest.cpp | 164 + .../unittests/PrimitiveResourceTest.cpp | 209 ++ .../unittests/ResourceAttributesTest.cpp | 436 +++ .../src/common/utils/include/ScopeLogger.h | 91 + .../src/common/utils/include/UnitTestHelper.h | 48 + .../src/resourceBroker/include/BrokerTypes.h | 119 + .../src/resourceBroker/include/DeviceAssociation.h | 58 + .../src/resourceBroker/include/DevicePresence.h | 76 + .../src/resourceBroker/include/ResourceBroker.h | 83 + .../src/resourceBroker/include/ResourcePresence.h | 91 + .../src/resourceBroker/src/DeviceAssociation.cpp | 103 + .../src/resourceBroker/src/DevicePresence.cpp | 178 + .../src/resourceBroker/src/ResourceBroker.cpp | 239 ++ .../src/resourceBroker/src/ResourcePresence.cpp | 327 ++ .../unittest/DeviceAssociationUnitTest.cpp | 107 + .../unittest/DevicePresenceUnitTest.cpp | 151 + .../unittest/ResourceBrokerUnitTest.cpp | 205 ++ .../unittest/ResourcePresenceUnitTest.cpp | 252 ++ .../src/resourceBroker/unittest/SConscript | 87 + .../src/resourceCache/include/CacheTypes.h | 92 + .../src/resourceCache/include/DataCache.h | 101 + .../resourceCache/include/ResourceCacheManager.h | 101 + .../src/resourceCache/src/DataCache.cpp | 346 ++ .../src/resourceCache/src/ResourceCacheManager.cpp | 295 ++ .../src/resourceCache/unittests/DataCacheTest.cpp | 262 ++ .../resourceCache/unittests/ResourceCacheTest.cpp | 307 ++ .../src/resourceCache/unittests/SConscript | 85 + .../src/resourceClient/RCSDiscoveryManager.cpp | 74 + .../src/resourceClient/RCSRemoteResourceObject.cpp | 342 ++ .../src/resourceContainer/SConscript | 212 ++ .../bundle-api/include/BundleActivator.h | 93 + .../bundle-api/include/BundleResource.h | 121 + .../bundle-api/include/NotificationReceiver.h | 63 + .../bundle-api/include/ProtocolBridgeConnector.h | 70 + .../bundle-api/include/ProtocolBridgeResource.h | 83 + .../include/ResourceContainerBundleAPI.h | 106 + .../bundle-api/include/SoftSensorResource.h | 99 + .../src/resourceContainer/bundle-java-api/pom.xml | 64 + .../bundle/api/BaseActivator.java | 137 + .../bundle/api/BundleActivator.java | 57 + .../bundle/api/BundleResource.java | 130 + .../bundle/api/ProtocolBridgeConnector.java | 38 + .../bundle/api/ResourceConfig.java | 119 + .../resourceContainer/examples/ContainerSample.cpp | 158 + .../examples/ContainerSampleClient.cpp | 560 ++++ .../examples/HueJavaSampleBundle/hue/pom.xml | 76 + .../iotivity/bundle/hue/HueBundleActivator.java | 40 + .../java/org/iotivity/bundle/hue/HueConnector.java | 70 + .../org/iotivity/bundle/hue/HueLightResource.java | 76 + .../HueSampleBundle/include/HueConnector.h | 46 + .../examples/HueSampleBundle/include/HueLight.h | 52 + .../include/HueSampleBundleActivator.h | 57 + .../examples/HueSampleBundle/src/HueConnector.cpp | 152 + .../examples/HueSampleBundle/src/HueLight.cpp | 88 + .../src/HueSampleBundleActivator.cpp | 130 + .../examples/ResourceContainerConfig.xml | 60 + .../include/DiscomfortIndexSensor.h | 59 + .../include/DiscomfortIndexSensorResource.h | 47 + .../include/SoftSensorBundleActivator.h | 47 + .../SoftSensorSampleBundle/include/SysTimer.h | 27 +- .../src/DiscomfortIndexSensor.cpp | 116 + .../src/DiscomfortIndexSensorResource.cpp | 71 + .../src/SoftSensorBundleActivator.cpp | 119 + .../SoftSensorSampleBundle/src/SysTimer.cpp | 56 + .../resourceContainer/include/BundleInfoInternal.h | 117 + .../src/resourceContainer/include/Configuration.h | 76 + .../resourceContainer/include/JavaBundleResource.h | 63 + .../include/ResourceContainerImpl.h | 130 + ...ty_resourcecontainer_bundle_api_BaseActivator.h | 48 + .../src/resourceContainer/src/BaseActivator.cpp | 119 + .../src/resourceContainer/src/BundleActivator.cpp | 52 + .../resourceContainer/src/BundleInfoInternal.cpp | 225 ++ .../src/resourceContainer/src/BundleResource.cpp | 73 + .../src/resourceContainer/src/Configuration.cpp | 274 ++ .../resourceContainer/src/JavaBundleResource.cpp | 159 + .../src/ProtocolBridgeConnector.cpp | 40 + .../src/ProtocolBridgeResource.cpp | 39 + .../src/resourceContainer/src/RCSBundleInfo.cpp | 44 + .../resourceContainer/src/RCSResourceContainer.cpp | 42 + .../src/ResourceContainerBundleAPI.cpp | 46 + .../src/ResourceContainerImpl.cpp | 858 +++++ .../resourceContainer/src/SoftSensorResource.cpp | 76 + .../unittests/ResourceContainerInvalidConfig.xml | 8 + .../unittests/ResourceContainerTest.cpp | 584 ++++ .../unittests/ResourceContainerTestConfig.xml | 15 + .../src/resourceContainer/unittests/SConscript | 182 ++ .../TestBundle/include/TestBundleActivator.h | 56 + .../TestBundle/src/TestBundleActivator.cpp | 92 + .../hue-0.1-jar-with-dependencies.jar | Bin 0 -> 6809452 bytes .../src/serverBuilder/SConscript | 114 + .../src/serverBuilder/include/RequestHandler.h | 103 + .../src/serverBuilder/src/RCSRequest.cpp | 39 + .../src/serverBuilder/src/RCSResourceObject.cpp | 596 ++++ .../src/serverBuilder/src/RCSResponse.cpp | 167 + .../src/serverBuilder/src/RequestHandler.cpp | 181 ++ .../unittests/RCSResourceObjectTest.cpp | 665 ++++ .../serverBuilder/unittests/RCSResponseTest.cpp | 198 ++ .../serverBuilder/unittests/RequestHandlerTest.cpp | 181 ++ .../unittests/ResourceClientTest.cpp | 347 ++ .../resource-encapsulation/unittests/SConscript | 109 + service/soft-sensor-manager/SConscript | 4 + .../SSMCore/src/QueryProcessor/QueryEngine.cpp | 7 +- .../SSMCore/src/SSMInterface/SSMModelDefinition.h | 5 +- .../SSMCore/src/SensorProcessor/ResourceFinder.cpp | 30 +- .../SSMCore/src/SensorProcessor/ResourceFinder.h | 3 +- .../SampleApp/android/SSMTesterApp/jni/Android.mk | 4 +- .../iotivity/service/ssm/sample/MainActivity.java | 7 +- .../arduino/Reference_Thing/src/trackee.cpp | 75 +- .../THSensorApp/include/ThingResourceServer.h | 2 - .../THSensorApp1/include/ThingResourceServer1.h | 2 - .../SampleApp/tizen/SSMTesterApp/.cproject | 2 +- .../tizen/SSMTesterApp/src/ssmtesterapp.cpp | 980 +++--- service/things-manager/SConscript | 7 +- .../Sample/src/com/tm/sample/ActionListener.java | 4 +- .../com/tm/sample/ConfigurationApiActivity.java | 10 +- .../src/com/tm/sample/ConfigurationListener.java | 2 +- .../src/com/tm/sample/DiagnosticListener.java | 2 +- .../Sample/src/com/tm/sample/GroupApiActivity.java | 6 + .../Sample/src/com/tm/sample/GroupClient.java | 8 +- .../Sample/src/com/tm/sample/MainActivity.java | 5 +- .../src/com/example/con_server/MainActivity.java | 5 +- .../sampleapp/linux/configuration/SConscript | 2 +- .../sampleapp/linux/configuration/con-client.cpp | 0 .../sampleapp/linux/configuration/con-server.cpp | 0 .../sampleapp/linux/groupaction/groupserver.cpp | 8 +- .../sampleapp/linux/groupsyncaction/SConscript | 2 +- .../sampleapp/linux/groupsyncaction/group.cpp | 67 +- .../linux/groupsyncaction/musicplayer.cpp | 2 + .../sampleapp/linux/groupsyncaction/phone.cpp | 11 + .../sampleapp/linux/groupsyncaction/speaker.cpp | 2 + .../sampleapp/tizen/ConServerApp/.cproject | 2 +- .../tizen/ConServerApp/src/conserverapp.cpp | 6 + .../tizen/ConServerApp/src/diagnosticsresource.cpp | 1 + .../sampleapp/tizen/TMSampleApp/.cproject | 2 +- .../tizen/TMSampleApp/src/configuration.cpp | 22 +- .../sampleapp/tizen/TMSampleApp/src/group.cpp | 17 +- service/things-manager/sdk/inc/ThingsManager.h | 1 - service/things-manager/sdk/java/jni/Android.mk | 83 +- service/things-manager/sdk/java/jni/Application.mk | 2 +- service/things-manager/sdk/java/jni/SConscript | 38 +- service/things-manager/sdk/src/GroupManager.cpp | 20 +- .../sdk/src/GroupSynchronization.cpp | 12 +- .../things-manager/sdk/src/ThingsConfiguration.cpp | 4 +- .../things-manager/sdk/src/ThingsDiagnostics.cpp | 2 +- tools/__init__.py | 17 + tools/darwin/build-ios.sh | 11 +- tools/darwin/mkfwk_ios.sh | 6 +- tools/darwin/mkfwk_osx.sh | 7 +- tools/scons/RunTest.py | 58 + tools/scons/__init__.py | 17 + tools/vagrant/iotivity-setup.sh | 10 +- tools/valgrind/iotivity.supp | 20 + 771 files changed, 67498 insertions(+), 32496 deletions(-) create mode 100644 android/android_api/base/jni/JniOcSecurity.cpp create mode 100644 android/android_api/base/jni/JniOcSecurity.h create mode 100644 android/android_api/base/jni/JniOnPlatformInfoListener.cpp create mode 100644 android/android_api/base/jni/JniOnPlatformInfoListener.h create mode 100644 android/android_api/base/src/main/java/org/iotivity/base/OcPlatformInfo.java create mode 100644 android/android_api/base/src/main/java/org/iotivity/base/OcStackConfig.java create mode 100644 android/android_api/base/src/main/java/org/iotivity/ca/CaEdrInterface.java create mode 100644 android/android_api/base/src/main/java/org/iotivity/ca/CaLeClientInterface.java create mode 100644 android/android_api/base/src/main/java/org/iotivity/ca/CaLeServerInterface.java delete mode 100644 android/android_api/base/src/main/java/org/iotivity/ca/CaWiFiInterface.java create mode 100644 android/examples/guiclient/.gitignore create mode 100644 android/examples/guiclient/build.gradle create mode 100644 android/examples/guiclient/guiclient.iml rename resource/csdk/connectivity/samples/android/sample_service/proguard-project.txt => android/examples/guiclient/proguard-rules.pro (62%) create mode 100644 android/examples/guiclient/src/main/AndroidManifest.xml create mode 100644 android/examples/guiclient/src/main/java/org/iotivity/guiclient/ExpandableResourceListAdapter.java create mode 100644 android/examples/guiclient/src/main/java/org/iotivity/guiclient/MainActivity.java create mode 100644 android/examples/guiclient/src/main/java/org/iotivity/guiclient/OcAttributeInfo.java create mode 100644 android/examples/guiclient/src/main/java/org/iotivity/guiclient/OcProtocolStrings.java create mode 100644 android/examples/guiclient/src/main/java/org/iotivity/guiclient/OcResourceInfo.java create mode 100644 android/examples/guiclient/src/main/java/org/iotivity/guiclient/OcWorker.java create mode 100644 android/examples/guiclient/src/main/java/org/iotivity/guiclient/OcWorkerListener.java create mode 100644 android/examples/guiclient/src/main/res/drawable-hdpi/ic_launcher.png create mode 100644 android/examples/guiclient/src/main/res/drawable-mdpi/ic_launcher.png create mode 100644 android/examples/guiclient/src/main/res/drawable-xhdpi/ic_launcher.png create mode 100644 android/examples/guiclient/src/main/res/drawable-xxhdpi/ic_launcher.png create mode 100644 android/examples/guiclient/src/main/res/drawable/android_resource_icon.png create mode 100644 android/examples/guiclient/src/main/res/drawable/attribute_icon.png create mode 100644 android/examples/guiclient/src/main/res/drawable/ic_action_discard.png create mode 100644 android/examples/guiclient/src/main/res/drawable/ic_action_discard_dark.png create mode 100644 android/examples/guiclient/src/main/res/drawable/ic_action_refresh.png create mode 100644 android/examples/guiclient/src/main/res/drawable/iotivity_hex_icon.png create mode 100644 android/examples/guiclient/src/main/res/drawable/led_icon.png create mode 100644 android/examples/guiclient/src/main/res/drawable/light_icon.png create mode 100644 android/examples/guiclient/src/main/res/drawable/thermometer_icon.png create mode 100644 android/examples/guiclient/src/main/res/layout/actionbar_indeterminate_progress.xml create mode 100644 android/examples/guiclient/src/main/res/layout/activity_main.xml create mode 100644 android/examples/guiclient/src/main/res/layout/attribute_layout_on_off_switch.xml create mode 100644 android/examples/guiclient/src/main/res/layout/attribute_layout_progress_bar.xml create mode 100644 android/examples/guiclient/src/main/res/layout/attribute_layout_slider.xml create mode 100644 android/examples/guiclient/src/main/res/layout/resource_list_item_layout.xml create mode 100644 android/examples/guiclient/src/main/res/menu/menu_main.xml create mode 100644 android/examples/guiclient/src/main/res/values-large/refs.xml create mode 100644 android/examples/guiclient/src/main/res/values-sw600dp/refs.xml create mode 100644 android/examples/guiclient/src/main/res/values-w820dp/dimens.xml create mode 100644 android/examples/guiclient/src/main/res/values/dimens.xml create mode 100644 android/examples/guiclient/src/main/res/values/refs.xml create mode 100644 android/examples/guiclient/src/main/res/values/strings.xml create mode 100644 android/examples/guiclient/src/main/res/values/styles.xml create mode 100755 android/examples/simpleclient/src/main/assets/oic_svr_db_client.json create mode 100755 android/examples/simpleserver/src/main/assets/oic_svr_db_server.json create mode 100755 build_docs.sh delete mode 100644 examples/OICMiddle/SConstruct create mode 100644 examples/OICSensorBoard/Makefile delete mode 100644 examples/OICSensorBoard/OICSensorBoardREADME.pdf create mode 100644 examples/OICSensorBoard/README delete mode 100644 examples/OICSensorBoard/SConstruct delete mode 100644 extlibs/cereal/SConscript create mode 100644 extlibs/raxmpp/SConscript create mode 100644 extlibs/tinycbor/SConscript create mode 100644 extlibs/tinydtls/0001-Added-anonymous-ecdh-cipher-suite-into-tinydtls.patch mode change 100644 => 100755 extlibs/tinydtls/ecc/Makefile.contiki mode change 100644 => 100755 extlibs/tinydtls/ecc/Makefile.ecc delete mode 100644 extlibs/tinydtls/ecc/test_helper.c delete mode 100644 extlibs/tinydtls/ecc/test_helper.h delete mode 100644 extlibs/tinydtls/ecc/testecc.c delete mode 100644 extlibs/tinydtls/ecc/testfield.c create mode 100644 resource/c_common/SConscript rename resource/{csdk/connectivity/common/inc => c_common/oic_malloc/include}/oic_malloc.h (78%) rename resource/{csdk/connectivity/common => c_common/oic_malloc}/src/oic_malloc.c (88%) create mode 100644 resource/c_common/oic_malloc/test/SConscript rename resource/{csdk/ocmalloc/test/linux/unittest.cpp => c_common/oic_malloc/test/linux/oic_malloc_tests.cpp} (69%) create mode 100644 resource/c_common/oic_string/include/oic_string.h create mode 100644 resource/c_common/oic_string/src/oic_string.c create mode 100644 resource/c_common/oic_string/test/SConscript create mode 100644 resource/c_common/oic_string/test/linux/oic_string_tests.cpp delete mode 100644 resource/csdk/connectivity/SConstruct delete mode 100644 resource/csdk/connectivity/build/common.mk rename resource/csdk/connectivity/{ => common}/inc/caremotehandler.h (66%) create mode 100644 resource/csdk/connectivity/common/src/camutex_noop.c create mode 100644 resource/csdk/connectivity/common/src/caremotehandler.c rename resource/csdk/connectivity/inc/{camsgparser.h => cafragmentation.h} (72%) delete mode 100644 resource/csdk/connectivity/inc/caipadapter_singlethread.h delete mode 100644 resource/csdk/connectivity/inc/caipinterface_singlethread.h delete mode 100644 resource/csdk/connectivity/inc/caleadapter_singlethread.h delete mode 100644 resource/csdk/connectivity/inc/caleinterface_singlethread.h create mode 100644 resource/csdk/connectivity/inc/caraadapter.h delete mode 100644 resource/csdk/connectivity/inc/caretransmission_singlethread.h create mode 100644 resource/csdk/connectivity/inc/ifaddrs.h create mode 100644 resource/csdk/connectivity/samples/android/sample_service/jni/org_iotivity_ca_service_RMInterface.h delete mode 100644 resource/csdk/connectivity/samples/android/sample_service/jni/org_iotivity_service_RMInterface.h create mode 100644 resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/ca/CaEdrInterface.java create mode 100644 resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/ca/CaLeClientInterface.java create mode 100644 resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/ca/CaLeServerInterface.java rename resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/{ => ca}/service/DLog.java (95%) rename resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/{ => ca}/service/MainActivity.java (78%) rename resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/{ => ca}/service/RMInterface.java (89%) delete mode 100644 resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/jar/CALeInterface.java delete mode 100644 resource/csdk/connectivity/samples/android/sample_service/src/org/iotivity/jar/caipinterface.java mode change 100644 => 100755 resource/csdk/connectivity/samples/linux/SConscript delete mode 100755 resource/csdk/connectivity/samples/linux/sample.sh mode change 100644 => 100755 resource/csdk/connectivity/src/SConscript rename resource/csdk/connectivity/src/adapter_util/{camsgparser.c => cafragmentation.c} (70%) create mode 100644 resource/csdk/connectivity/src/adapter_util/ifaddrs.c create mode 100644 resource/csdk/connectivity/src/bt_edr_adapter/android/SConscript rename resource/csdk/connectivity/{common/inc/oic_string.h => src/bt_edr_adapter/android/org_iotivity_ca_CaEdrInterface.h} (56%) delete mode 100644 resource/csdk/connectivity/src/bt_edr_adapter/android/org_iotivity_jar_caedrinterface.h create mode 100644 resource/csdk/connectivity/src/bt_edr_adapter/linux/SConscript create mode 100644 resource/csdk/connectivity/src/bt_edr_adapter/tizen/SConscript create mode 100644 resource/csdk/connectivity/src/bt_le_adapter/android/SConscript create mode 100644 resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_ca_CaLeClientInterface.h create mode 100644 resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_ca_CaLeServerInterface.h delete mode 100644 resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_jar_caleclientinterface.h delete mode 100644 resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_jar_caleserverinterface.h create mode 100644 resource/csdk/connectivity/src/bt_le_adapter/arduino/SConscript create mode 100644 resource/csdk/connectivity/src/bt_le_adapter/arduino/cableclient.cpp delete mode 100644 resource/csdk/connectivity/src/bt_le_adapter/caleadapter_singlethread.c create mode 100644 resource/csdk/connectivity/src/bt_le_adapter/linux/SConscript create mode 100644 resource/csdk/connectivity/src/bt_le_adapter/tizen/SConscript delete mode 100644 resource/csdk/connectivity/src/caconnectivitymanager_singlethread.c delete mode 100644 resource/csdk/connectivity/src/cainterfacecontroller_singlethread.c delete mode 100644 resource/csdk/connectivity/src/caremotehandler.c delete mode 100644 resource/csdk/connectivity/src/caretransmission_singlethread.c create mode 100644 resource/csdk/connectivity/src/ip_adapter/android/SConscript create mode 100644 resource/csdk/connectivity/src/ip_adapter/arduino/SConscript delete mode 100644 resource/csdk/connectivity/src/ip_adapter/arduino/caipnwmonitor.cpp create mode 100644 resource/csdk/connectivity/src/ip_adapter/arduino/caipnwmonitor_eth.cpp create mode 100644 resource/csdk/connectivity/src/ip_adapter/arduino/caipnwmonitor_wifi.cpp delete mode 100644 resource/csdk/connectivity/src/ip_adapter/caipadapter_singlethread.c delete mode 100644 resource/csdk/connectivity/src/ip_adapter/caipclient.c create mode 100644 resource/csdk/connectivity/src/ip_adapter/tizen/SConscript create mode 100644 resource/csdk/connectivity/src/ra_adapter/SConscript create mode 100644 resource/csdk/connectivity/src/ra_adapter/caraadapter.c delete mode 100644 resource/csdk/ocmalloc/include/ocmalloc.h delete mode 100644 resource/csdk/ocmalloc/src/ocmalloc.c delete mode 100644 resource/csdk/ocmalloc/test/linux/README create mode 100644 resource/csdk/security/README-building-and-running-secure-IoTivity-stack.txt create mode 100644 resource/csdk/security/SConscript create mode 100644 resource/csdk/security/include/base64.h create mode 100755 resource/csdk/security/include/internal/aclresource.h create mode 100644 resource/csdk/security/include/internal/credresource.h create mode 100644 resource/csdk/security/include/internal/doxmresource.h create mode 100644 resource/csdk/security/include/internal/policyengine.h rename resource/csdk/security/include/internal/{ocsecurityinternal.h => psinterface.h} (50%) create mode 100644 resource/csdk/security/include/internal/pstatresource.h create mode 100644 resource/csdk/security/include/internal/resourcemanager.h create mode 100644 resource/csdk/security/include/internal/secureresourcemanager.h create mode 100644 resource/csdk/security/include/internal/srmresourcestrings.h delete mode 100644 resource/csdk/security/include/ocsecurityconfig.h create mode 100644 resource/csdk/security/include/securevirtualresourcetypes.h create mode 100644 resource/csdk/security/include/srmutility.h create mode 100644 resource/csdk/security/provisioning/SConscript create mode 100644 resource/csdk/security/provisioning/include/internal/credentialgenerator.h create mode 100644 resource/csdk/security/provisioning/include/provisioningmanager.h create mode 100644 resource/csdk/security/provisioning/sample/README-Provisioning-Tool.txt create mode 100755 resource/csdk/security/provisioning/sample/SConscript create mode 100755 resource/csdk/security/provisioning/sample/oic_svr_db_prov_tool.json create mode 100644 resource/csdk/security/provisioning/sample/oic_svr_db_unowned_server.json create mode 100755 resource/csdk/security/provisioning/sample/provisioningclient.c create mode 100644 resource/csdk/security/provisioning/src/credentialgenerator.c create mode 100644 resource/csdk/security/provisioning/src/provisioningmanager.c create mode 100644 resource/csdk/security/provisioning/unittest/SConscript create mode 100644 resource/csdk/security/provisioning/unittest/provisioningmanager.cpp create mode 100644 resource/csdk/security/src/aclresource.c create mode 100644 resource/csdk/security/src/base64.c create mode 100755 resource/csdk/security/src/credresource.c create mode 100755 resource/csdk/security/src/doxmresource.c delete mode 100644 resource/csdk/security/src/ocsecurity.c create mode 100644 resource/csdk/security/src/policyengine.c create mode 100644 resource/csdk/security/src/psinterface.c create mode 100644 resource/csdk/security/src/pstatresource.c create mode 100644 resource/csdk/security/src/resourcemanager.c create mode 100644 resource/csdk/security/src/secureresourcemanager.c create mode 100644 resource/csdk/security/src/srmresourcestrings.c create mode 100644 resource/csdk/security/src/srmutility.c create mode 100644 resource/csdk/security/unittest/SConscript create mode 100644 resource/csdk/security/unittest/aclresourcetest.cpp create mode 100644 resource/csdk/security/unittest/base64tests.cpp create mode 100644 resource/csdk/security/unittest/credentialresource.cpp create mode 100644 resource/csdk/security/unittest/doxmresource.cpp create mode 100644 resource/csdk/security/unittest/oic_svr_db.json create mode 100644 resource/csdk/security/unittest/oic_unittest.json create mode 100644 resource/csdk/security/unittest/oic_unittest_acl1.json create mode 100644 resource/csdk/security/unittest/oic_unittest_default_acl.json create mode 100644 resource/csdk/security/unittest/policyengine.cpp create mode 100644 resource/csdk/security/unittest/pstatresource.cpp create mode 100644 resource/csdk/security/unittest/securityresourcemanager.cpp create mode 100644 resource/csdk/security/unittest/srmutility.cpp rename resource/csdk/{security/include/ocsecurity.h => stack/include/internal/ocpayloadcbor.h} (59%) create mode 100644 resource/csdk/stack/include/ocpayload.h create mode 100644 resource/csdk/stack/include/ocpresence.h create mode 100644 resource/csdk/stack/samples/linux/SimpleClientServer/ocremoteaccessclient.cpp create mode 100644 resource/csdk/stack/samples/linux/SimpleClientServer/ocremoteaccessclient.h delete mode 100644 resource/csdk/stack/samples/linux/secure/gen_sec_bin.cpp create mode 100644 resource/csdk/stack/samples/linux/secure/oic_svr_db_client.json create mode 100644 resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json create mode 100644 resource/csdk/stack/src/ocpayload.c create mode 100644 resource/csdk/stack/src/ocpayloadconvert.c create mode 100644 resource/csdk/stack/src/ocpayloadparse.c mode change 100644 => 100755 resource/csdk/stack/src/oicgroup.c create mode 100755 resource/examples/oic_svr_db_client.json create mode 100755 resource/examples/oic_svr_db_server.json mode change 100644 => 100755 resource/include/OCApi.h delete mode 100644 resource/include/OicJsonSerializer.hpp delete mode 100644 resource/patches/cereal_gcc46.patch rename service/notification-manager/{SampleApp/android/ResourceHostingSampleApp => NotificationManager/android/resource_hosting}/.classpath (72%) mode change 100644 => 100755 rename service/notification-manager/{SampleApp/android/ResourceHostingSampleApp => NotificationManager/android/resource_hosting}/.project (100%) mode change 100644 => 100755 create mode 100755 service/notification-manager/NotificationManager/android/resource_hosting/AndroidManifest.xml create mode 100755 service/notification-manager/NotificationManager/android/resource_hosting/jni/Android.mk rename service/notification-manager/{SampleApp/android/ResourceHostingSampleApp => NotificationManager/android/resource_hosting}/jni/Application.mk (100%) mode change 100644 => 100755 rename service/notification-manager/NotificationManager/{src/resourceCoordinator_JNI.cpp => android/resource_hosting/jni/ResourceHosing_JNI.cpp} (59%) mode change 100644 => 100755 rename service/notification-manager/NotificationManager/{src/resourceCoordinator_JNI.h => android/resource_hosting/jni/ResourceHosing_JNI.h} (64%) mode change 100644 => 100755 create mode 100755 service/notification-manager/NotificationManager/android/resource_hosting/project.properties create mode 100755 service/notification-manager/NotificationManager/android/resource_hosting/src/org/iotivity/ResourceHosting/ResourceHosting.java create mode 100644 service/notification-manager/NotificationManager/src/HostingObject.cpp create mode 100644 service/notification-manager/NotificationManager/src/HostingObject.h create mode 100644 service/notification-manager/NotificationManager/src/RequestObject.cpp create mode 100644 service/notification-manager/NotificationManager/src/RequestObject.h create mode 100755 service/notification-manager/NotificationManager/src/ResourceHosting.cpp create mode 100644 service/notification-manager/NotificationManager/src/ResourceHosting.h delete mode 100644 service/notification-manager/NotificationManager/src/hosting.c create mode 100644 service/notification-manager/NotificationManager/src/hosting.cpp delete mode 100644 service/notification-manager/NotificationManager/src/requestHandler.c delete mode 100644 service/notification-manager/NotificationManager/src/virtualResource.c delete mode 100644 service/notification-manager/NotificationManager/src/virtualResource.h delete mode 100644 service/notification-manager/SampleApp/android/ResourceHostingSampleApp/ic_launcher-web.png delete mode 100644 service/notification-manager/SampleApp/android/ResourceHostingSampleApp/jni/Android.mk delete mode 100644 service/notification-manager/SampleApp/android/ResourceHostingSampleApp/jni/armeabi rename service/notification-manager/SampleApp/android/{ResourceHostingSampleApp => SampleResourceHosting}/AndroidManifest.xml (98%) mode change 100644 => 100755 rename service/notification-manager/SampleApp/android/{ResourceHostingSampleApp => SampleResourceHosting}/project.properties (100%) mode change 100644 => 100755 rename service/notification-manager/SampleApp/android/{ResourceHostingSampleApp => SampleResourceHosting}/res/drawable-hdpi/ic_launcher.png (100%) mode change 100644 => 100755 rename service/notification-manager/SampleApp/android/{ResourceHostingSampleApp => SampleResourceHosting}/res/drawable-mdpi/ic_launcher.png (100%) mode change 100644 => 100755 rename service/notification-manager/SampleApp/android/{ResourceHostingSampleApp => SampleResourceHosting}/res/drawable-xhdpi/ic_launcher.png (100%) mode change 100644 => 100755 rename service/notification-manager/SampleApp/android/{ResourceHostingSampleApp => SampleResourceHosting}/res/drawable-xxhdpi/ic_launcher.png (100%) mode change 100644 => 100755 rename service/notification-manager/SampleApp/android/{ResourceHostingSampleApp => SampleResourceHosting}/res/layout/activity_main.xml (100%) mode change 100644 => 100755 rename service/notification-manager/SampleApp/android/{ResourceHostingSampleApp => SampleResourceHosting}/res/values-v11/styles.xml (100%) mode change 100644 => 100755 rename service/notification-manager/SampleApp/android/{ResourceHostingSampleApp => SampleResourceHosting}/res/values-v14/styles.xml (100%) mode change 100644 => 100755 rename service/notification-manager/SampleApp/android/{ResourceHostingSampleApp => SampleResourceHosting}/res/values/strings.xml (100%) mode change 100644 => 100755 rename service/notification-manager/SampleApp/android/{ResourceHostingSampleApp => SampleResourceHosting}/res/values/styles.xml (100%) mode change 100644 => 100755 rename service/notification-manager/SampleApp/android/{ResourceHostingSampleApp/src/com/example/resourcehostingsampleapp/ResourceHosting.java => SampleResourceHosting/src/com/example/resourcehostingsampleapp/ResourceHostingSampleApp.java} (71%) mode change 100644 => 100755 rename service/notification-manager/SampleApp/linux/notificationManager/{main.c => main.cpp} (76%) create mode 100644 service/protocol-plugin/plugins/Android/plugin.gear.noti/.project create mode 100644 service/protocol-plugin/plugins/Android/plugin.hue/.project create mode 100644 service/protocol-plugin/plugins/Android/plugin.wemo/.project create mode 100644 service/resource-encapsulation/README create mode 100644 service/resource-encapsulation/SConscript create mode 100644 service/resource-encapsulation/examples/SConscript create mode 100644 service/resource-encapsulation/examples/linux/SConscript create mode 100755 service/resource-encapsulation/examples/linux/SampleResourceClient.cpp create mode 100755 service/resource-encapsulation/examples/linux/SampleResourceServer.cpp create mode 100644 service/resource-encapsulation/include/RCSAddress.h create mode 100644 service/resource-encapsulation/include/RCSBundleInfo.h create mode 100644 service/resource-encapsulation/include/RCSDiscoveryManager.h create mode 100644 service/resource-encapsulation/include/RCSException.h create mode 100644 service/resource-encapsulation/include/RCSRemoteResourceObject.h create mode 100644 service/resource-encapsulation/include/RCSRequest.h create mode 100644 service/resource-encapsulation/include/RCSResourceAttributes.h create mode 100644 service/resource-encapsulation/include/RCSResourceContainer.h create mode 100755 service/resource-encapsulation/include/RCSResourceObject.h create mode 100644 service/resource-encapsulation/include/RCSResponse.h create mode 100755 service/resource-encapsulation/src/common/SConscript create mode 100644 service/resource-encapsulation/src/common/expiryTimer/include/ExpiryTimer.h create mode 100644 service/resource-encapsulation/src/common/expiryTimer/src/ExpiryTimer.cpp create mode 100644 service/resource-encapsulation/src/common/expiryTimer/src/ExpiryTimerImpl.cpp create mode 100644 service/resource-encapsulation/src/common/expiryTimer/src/ExpiryTimerImpl.h create mode 100644 service/resource-encapsulation/src/common/expiryTimer/unittests/ExpiryTimerTest.cpp create mode 100644 service/resource-encapsulation/src/common/primitiveResource/include/AssertUtils.h create mode 100644 service/resource-encapsulation/src/common/primitiveResource/include/PresenceSubscriber.h create mode 100644 service/resource-encapsulation/src/common/primitiveResource/include/PrimitiveResource.h create mode 100644 service/resource-encapsulation/src/common/primitiveResource/include/PrimitiveResourceImpl.h create mode 100644 service/resource-encapsulation/src/common/primitiveResource/include/RCSAddressDetail.h create mode 100644 service/resource-encapsulation/src/common/primitiveResource/include/ResourceAttributesConverter.h create mode 100644 service/resource-encapsulation/src/common/primitiveResource/include/ResourceAttributesUtils.h create mode 100644 service/resource-encapsulation/src/common/primitiveResource/include/ResponseStatement.h create mode 100644 service/resource-encapsulation/src/common/primitiveResource/src/PresenceSubscriber.cpp create mode 100644 service/resource-encapsulation/src/common/primitiveResource/src/PrimitiveResource.cpp create mode 100644 service/resource-encapsulation/src/common/primitiveResource/src/RCSAddress.cpp create mode 100644 service/resource-encapsulation/src/common/primitiveResource/src/RCSException.cpp create mode 100644 service/resource-encapsulation/src/common/primitiveResource/src/RCSResourceAttributes.cpp create mode 100644 service/resource-encapsulation/src/common/primitiveResource/src/ResponseStatement.cpp create mode 100644 service/resource-encapsulation/src/common/primitiveResource/unittests/PresenceSubscriberTest.cpp create mode 100644 service/resource-encapsulation/src/common/primitiveResource/unittests/PrimitiveResourceTest.cpp create mode 100644 service/resource-encapsulation/src/common/primitiveResource/unittests/ResourceAttributesTest.cpp create mode 100644 service/resource-encapsulation/src/common/utils/include/ScopeLogger.h create mode 100644 service/resource-encapsulation/src/common/utils/include/UnitTestHelper.h create mode 100644 service/resource-encapsulation/src/resourceBroker/include/BrokerTypes.h create mode 100644 service/resource-encapsulation/src/resourceBroker/include/DeviceAssociation.h create mode 100644 service/resource-encapsulation/src/resourceBroker/include/DevicePresence.h create mode 100644 service/resource-encapsulation/src/resourceBroker/include/ResourceBroker.h create mode 100644 service/resource-encapsulation/src/resourceBroker/include/ResourcePresence.h create mode 100644 service/resource-encapsulation/src/resourceBroker/src/DeviceAssociation.cpp create mode 100644 service/resource-encapsulation/src/resourceBroker/src/DevicePresence.cpp create mode 100644 service/resource-encapsulation/src/resourceBroker/src/ResourceBroker.cpp create mode 100644 service/resource-encapsulation/src/resourceBroker/src/ResourcePresence.cpp create mode 100644 service/resource-encapsulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp create mode 100644 service/resource-encapsulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp create mode 100644 service/resource-encapsulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp create mode 100644 service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp create mode 100644 service/resource-encapsulation/src/resourceBroker/unittest/SConscript create mode 100644 service/resource-encapsulation/src/resourceCache/include/CacheTypes.h create mode 100644 service/resource-encapsulation/src/resourceCache/include/DataCache.h create mode 100644 service/resource-encapsulation/src/resourceCache/include/ResourceCacheManager.h create mode 100644 service/resource-encapsulation/src/resourceCache/src/DataCache.cpp create mode 100644 service/resource-encapsulation/src/resourceCache/src/ResourceCacheManager.cpp create mode 100644 service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp create mode 100644 service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp create mode 100644 service/resource-encapsulation/src/resourceCache/unittests/SConscript create mode 100644 service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp create mode 100644 service/resource-encapsulation/src/resourceClient/RCSRemoteResourceObject.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/SConscript create mode 100644 service/resource-encapsulation/src/resourceContainer/bundle-api/include/BundleActivator.h create mode 100644 service/resource-encapsulation/src/resourceContainer/bundle-api/include/BundleResource.h create mode 100644 service/resource-encapsulation/src/resourceContainer/bundle-api/include/NotificationReceiver.h create mode 100644 service/resource-encapsulation/src/resourceContainer/bundle-api/include/ProtocolBridgeConnector.h create mode 100644 service/resource-encapsulation/src/resourceContainer/bundle-api/include/ProtocolBridgeResource.h create mode 100644 service/resource-encapsulation/src/resourceContainer/bundle-api/include/ResourceContainerBundleAPI.h create mode 100644 service/resource-encapsulation/src/resourceContainer/bundle-api/include/SoftSensorResource.h create mode 100644 service/resource-encapsulation/src/resourceContainer/bundle-java-api/pom.xml create mode 100644 service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java create mode 100644 service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java create mode 100644 service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java create mode 100644 service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java create mode 100644 service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/ContainerSample.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/ContainerSampleClient.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueConnector.h create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueLight.h create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/ResourceContainerConfig.xml create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensor.h create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensorResource.h create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/SoftSensorBundleActivator.h rename resource/csdk/connectivity/common/src/oic_string.c => service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/SysTimer.h (69%) create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensor.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensorResource.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SoftSensorBundleActivator.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SysTimer.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/include/BundleInfoInternal.h create mode 100644 service/resource-encapsulation/src/resourceContainer/include/Configuration.h create mode 100644 service/resource-encapsulation/src/resourceContainer/include/JavaBundleResource.h create mode 100644 service/resource-encapsulation/src/resourceContainer/include/ResourceContainerImpl.h create mode 100644 service/resource-encapsulation/src/resourceContainer/include/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h create mode 100644 service/resource-encapsulation/src/resourceContainer/src/BaseActivator.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/src/BundleActivator.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/src/BundleInfoInternal.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/src/BundleResource.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/src/Configuration.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/src/JavaBundleResource.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/src/ProtocolBridgeConnector.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/src/ProtocolBridgeResource.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/src/RCSBundleInfo.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/src/RCSResourceContainer.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/src/ResourceContainerBundleAPI.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/src/SoftSensorResource.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerInvalidConfig.xml create mode 100644 service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml create mode 100644 service/resource-encapsulation/src/resourceContainer/unittests/SConscript create mode 100644 service/resource-encapsulation/src/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h create mode 100644 service/resource-encapsulation/src/resourceContainer/unittests/TestBundle/src/TestBundleActivator.cpp create mode 100644 service/resource-encapsulation/src/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar create mode 100755 service/resource-encapsulation/src/serverBuilder/SConscript create mode 100644 service/resource-encapsulation/src/serverBuilder/include/RequestHandler.h create mode 100644 service/resource-encapsulation/src/serverBuilder/src/RCSRequest.cpp create mode 100755 service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp create mode 100644 service/resource-encapsulation/src/serverBuilder/src/RCSResponse.cpp create mode 100644 service/resource-encapsulation/src/serverBuilder/src/RequestHandler.cpp create mode 100755 service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp create mode 100644 service/resource-encapsulation/src/serverBuilder/unittests/RCSResponseTest.cpp create mode 100644 service/resource-encapsulation/src/serverBuilder/unittests/RequestHandlerTest.cpp create mode 100644 service/resource-encapsulation/unittests/ResourceClientTest.cpp create mode 100755 service/resource-encapsulation/unittests/SConscript mode change 100644 => 100755 service/things-manager/sampleapp/linux/configuration/con-client.cpp mode change 100644 => 100755 service/things-manager/sampleapp/linux/configuration/con-server.cpp mode change 100644 => 100755 service/things-manager/sampleapp/linux/groupsyncaction/group.cpp mode change 100644 => 100755 service/things-manager/sampleapp/linux/groupsyncaction/musicplayer.cpp mode change 100644 => 100755 service/things-manager/sampleapp/linux/groupsyncaction/phone.cpp mode change 100644 => 100755 service/things-manager/sampleapp/linux/groupsyncaction/speaker.cpp create mode 100644 tools/__init__.py create mode 100644 tools/scons/RunTest.py create mode 100644 tools/scons/__init__.py create mode 100644 tools/valgrind/iotivity.supp diff --git a/.gitignore b/.gitignore index d0fbb21..c891e5c 100644 --- a/.gitignore +++ b/.gitignore @@ -48,18 +48,28 @@ resource/unittests/debug/ service/things-manager/build/linux/release service/things-manager/build/linux/debug service/things-manager/sdk/build/linux/ + # Ignore any object files *.o +*.os *.obj +# Ignore libraries +*.a +*.so # Ignore Eclipse workspace files *.settings/ +# Ignore proguard file generated by Eclipse +proguard-project.txt + # Ignore CTags default data tags + # Ignore dependencies folder, which should be generated dependencies/ +dep/ #ignore Klocwork stuff .kwlp/ @@ -86,14 +96,21 @@ extlibs/android/gradle/gradle-2.2.1 extlibs/android/ndk/android-ndk-r10d extlibs/android/sdk/android-sdk_r24.2 extlibs/boost/boost_1_58_0 +extlibs/tinycbor/tinycbor *.tgz *.zip extlibs/arduino/arduino-1.5.8 build_common/arduino/extlibs/arduino/arduino-1.5.8 +extlibs/tinydtls/dtls-client +extlibs/tinydtls/dtls-server # Ignore editor (e.g. Emacs) backup and autosave files *~ *#*# +*.orig # Ignore byte-compiled Python scripts *.pyc + +# Ignore Valgrind generated files. +*.memcheck diff --git a/NOTICE.md b/NOTICE.md index 6d243f8..027511d 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -40,20 +40,13 @@ license can be found at The original software is available from http://sourceforge.net/projects/boost/files/boost -JSON serialization is provided by the cereal package, -which is open source software, written by Philip Hazel, and copyright -by the University of Cambridge, England. The original software is -available from - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ - +CBOR serialization is provided by the tinycbor package, +which is open source software, written by Thiago Macieira and is +copyright by the Intel Corporation. The original software is available +from + https://github.com/01org/tinycbor/ JSON serialization is provided by the cjson package, which is open source software, written and copyright by Dave Gamble with an MIT license. The original software is available from http://sourceforge.net/projects/cjson/ -JSON serialization is provided by the rapidjson package, -which is open source software, written and copyright by Milo Yip -with an MIT license. The original software is available from - http://code.google.com/p/rapidjson/ - - diff --git a/Readme.scons.txt b/Readme.scons.txt index d433b3b..fd0b3a0 100644 --- a/Readme.scons.txt +++ b/Readme.scons.txt @@ -5,12 +5,12 @@ command in this directory) Install external libraries: - $ sudo apt-get install libboost-dev libboost-program-options-dev libexpat1-dev libboost-thread-dev uuid-dev + $ sudo apt-get install libboost-dev libboost-program-options-dev libexpat1-dev libboost-thread-dev uuid-dev libssl-dev Build release binaries: $ scons -(Note: C++ sdk requires cereal. Please follow the instruction in the build -message to install cereal) +(Note: C sdk requires tiny-cbor. Please follow the instruction in the build +message to install tiny-cbor) Build debug binaries: $scons RELEASE=false @@ -90,7 +90,7 @@ To build for Android, Andorid NDK and SDK are required. Arduino: To build for Arduino, Arduino IDE is required. Arduino IDE: http://arduino.cc/en/Main/Software - (Note: recommend install Arduino IDE >=1.5.7) + (Note: recommend install Arduino IDE >=1.5.8) Arduino builds are dependent on latest Time library. Download it from here: http://www.pjrc.com/teensy/td_libs_Time.html @@ -116,13 +116,10 @@ so you don't need to add it in command line each time. The build script will guide you to do that.) Tizen: -To build for tizen platform cereal library is needed. -Please download cereal if it is not present in extlibs/cereal folder -and apply the patch as following: - $ git clone https://github.com/USCiLab/cereal.git extlibs/cereal/cereal - $ cd extlibs/cereal/cereal - $ git reset --hard 7121e91e6ab8c3e6a6516d9d9c3e6804e6f65245 - $ git apply ../../../resource/patches/cereal_gcc46.patch +To build for tizen platform tiny-cbor library is needed. +Please download tiny-cbor if it is not present in extlibs/tiny-cbor folder +by doing the following: + $ git clone https://github.com/01org/tinycbor.git extlibs/tinycbor/tinycbor * 3. External libraries @@ -140,7 +137,7 @@ to skip it. 1. Build IoTivity project for Linux $ cd - $ sudo apt-get install libboost-dev libexpat1-dev libboost-thread-dev + $ sudo apt-get install libboost-dev libexpat1-dev libboost-thread-dev libssl-dev $ scons 2. Build IoTivity project for Android @@ -151,13 +148,14 @@ allowed value, please execute command 'scons TARGET_OS=android -Q -h') 3. Build IoTivity project for Arduino $ cd - $ scons TARGET_OS=arduino TARGET_ARCH=xxx BOARD=yyy -(xxx can be avr, arm; yyy is the name of the board, to get its allowed value -run: scons TARGET_OS=arduino TARGET_ARCH=xxx -h. You may see a option 'CPU' in -the output of above command line, that's due to some boards have different -processors, to specify the processor, add 'CPU=zzz' in the command line. If no -'CPU' option exists, that means the board only support one kind of processor, -it's unnecessary to specify it) + $ sudo apt-get install dos2unix + $ scons TARGET_OS=arduino TARGET_ARCH=xxx BOARD=yyy SHIELD=zzz +(xxx can be avr, arm; yyy is the name of the board, zzz is the shield type, to +get allowed values run: scons TARGET_OS=arduino TARGET_ARCH=xxx SHIELD=zzz -h. +You may see a option 'CPU' in the output of above command line, that's due to +some boards have different processors, to specify the processor, add 'CPU=zzz' +in the command line. If no 'CPU' option exists, that means the board only +support one kind of processor, it's unnecessary to specify it) 4. Build Iotivity project for Tizen $ cd @@ -167,24 +165,6 @@ gbs is default build tool for Tizen platfrom, we can refer the following wiki to setup Tizen development environment: https://source.tizen.org/documentation/developer-guide/getting-started-guide) -=== Build IoTivity project on Android === - -1. Build IoTivity project for Android(It's the same as on Ubuntu) - $ cd - $ scons TARGET_OS=android TARGET_ARCH=xxx -(xxx can be x86, armeabi, armeabi-v7a, armeabi-v7a-hard ...) - -2. Build IoTivity project for Arduino(It's the same as on Ubuntu) - $ cd - $ scons TARGET_OS=arduino TARGET_ARCH=xxx BOARD=yyy -(xxx can be avr, arm; yyy is the name of the board, to get its allowed value -run: scons TARGET_OS=arduino TARGET_ARCH=xxx -h. You may see a option 'CPU' in -the output of above command line, that's due to some boards have different -processor, to specify the processor, add 'CPU=zzz' in the command line. If no -'CPU' option exists, that means the board only support one kind of processor, -it's unnecessary to specify it) - - Note: Currently most IoTivity project doesn't support Windows, so you can't set TARGET_OS to 'windows' except the project support Windows. @@ -220,6 +200,3 @@ To build: $ auto_build.sh To clean: $ auto_build.sh -c - -2) For Arduino build, the Time library should >=1.3. The old can only be built -with Arduino IDE 1.0.x diff --git a/android/BuildInstructionsForAndroidAPI.txt b/android/BuildInstructionsForAndroidAPI.txt index 8dda6db..4bc0515 100644 --- a/android/BuildInstructionsForAndroidAPI.txt +++ b/android/BuildInstructionsForAndroidAPI.txt @@ -26,7 +26,7 @@ TO RUN UNIT TESTS IN ANDROID-API TO USE THE .AAR FILE IN /android/examples project -6. Verify that 9 different *.so files exist inside /android/android-api/base/libs/ directory. (They should already be present in the *.aar file.) +6. Verify that 7 different *.so files exist inside /android/android-api/base/libs/ directory. (They should already be present in the *.aar file.) 7. Import Project 'Examples' into android-studio. 8.To add an .aar file to the 'Examples' project, a.Right click on Examples->New->Module->Import .JAR or .AAR Package @@ -39,7 +39,7 @@ TO USE THE .AAR FILE IN /android/examples project TO USE THE .AAR FILE IN A DIFFERENT PROJECT -9. Verify that 9 different *.so files exist inside /android/android-api/base/libs/ directory. +9. Verify that 7 different *.so files exist inside /android/android-api/base/libs/ directory. 10. Import the .aar file in your project to use it diff --git a/android/android_api/base/base.iml b/android/android_api/base/base.iml index 36cf651..49b2159 100755 --- a/android/android_api/base/base.iml +++ b/android/android_api/base/base.iml @@ -9,7 +9,6 @@