Merge branch 'master' into easysetup 03/8203/1
authorJihun Ha <jihun.ha@samsung.com>
Wed, 18 May 2016 01:19:55 +0000 (10:19 +0900)
committerJihun Ha <jihun.ha@samsung.com>
Wed, 18 May 2016 01:19:55 +0000 (10:19 +0900)
Change-Id: Iaa7111b7c0bdd2941d708247983bc8fc9bca8a5b
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
1083 files changed:
LICENSE.md
Readme.scons.txt
SConstruct
android/android_api/base/build.gradle
android/android_api/base/jni/Android.mk
android/android_api/base/jni/JniCaInterface.c
android/android_api/base/jni/JniCaInterface.h
android/android_api/base/src/androidTest/java/org/iotivity/base/OcRepresentationTest.java
android/android_api/base/src/androidTest/java/org/iotivity/base/SmokeTest.java
android/android_api/base/src/main/java/org/iotivity/base/CredType.java
android/android_api/base/src/main/java/org/iotivity/base/DeviceStatus.java
android/android_api/base/src/main/java/org/iotivity/base/EntityHandlerResult.java
android/android_api/base/src/main/java/org/iotivity/base/ErrorCode.java
android/android_api/base/src/main/java/org/iotivity/base/KeySize.java
android/android_api/base/src/main/java/org/iotivity/base/ModeType.java
android/android_api/base/src/main/java/org/iotivity/base/ObservationInfo.java
android/android_api/base/src/main/java/org/iotivity/base/ObserveAction.java
android/android_api/base/src/main/java/org/iotivity/base/ObserveType.java
android/android_api/base/src/main/java/org/iotivity/base/OcConnectivityType.java
android/android_api/base/src/main/java/org/iotivity/base/OcDeviceInfo.java
android/android_api/base/src/main/java/org/iotivity/base/OcException.java
android/android_api/base/src/main/java/org/iotivity/base/OcHeaderOption.java
android/android_api/base/src/main/java/org/iotivity/base/OcPlatform.java
android/android_api/base/src/main/java/org/iotivity/base/OcPlatformInfo.java
android/android_api/base/src/main/java/org/iotivity/base/OcPlatformStatus.java
android/android_api/base/src/main/java/org/iotivity/base/OcPresenceHandle.java
android/android_api/base/src/main/java/org/iotivity/base/OcPresenceStatus.java
android/android_api/base/src/main/java/org/iotivity/base/OcProvisioning.java
android/android_api/base/src/main/java/org/iotivity/base/OcRepresentation.java
android/android_api/base/src/main/java/org/iotivity/base/OcRequestHandle.java
android/android_api/base/src/main/java/org/iotivity/base/OcResource.java
android/android_api/base/src/main/java/org/iotivity/base/OcResourceHandle.java
android/android_api/base/src/main/java/org/iotivity/base/OcResourceIdentifier.java
android/android_api/base/src/main/java/org/iotivity/base/OcResourceRequest.java
android/android_api/base/src/main/java/org/iotivity/base/OcResourceResponse.java
android/android_api/base/src/main/java/org/iotivity/base/OcSecureResource.java
android/android_api/base/src/main/java/org/iotivity/base/OicSecAcl.java
android/android_api/base/src/main/java/org/iotivity/base/OwnedStatus.java
android/android_api/base/src/main/java/org/iotivity/base/OxmType.java
android/android_api/base/src/main/java/org/iotivity/base/PlatformConfig.java
android/android_api/base/src/main/java/org/iotivity/base/QualityOfService.java
android/android_api/base/src/main/java/org/iotivity/base/RequestHandlerFlag.java
android/android_api/base/src/main/java/org/iotivity/base/RequestType.java
android/android_api/base/src/main/java/org/iotivity/base/ResourceProperty.java
android/android_api/base/src/main/java/org/iotivity/base/ServiceType.java
android/android_api/base/src/main/java/org/iotivity/ca/CaBtPairingInterface.java [moved from resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/java/org/iotivity/ca/CaEdrInterface.java with 73% similarity, mode: 0644]
android/android_api/base/src/main/java/org/iotivity/ca/CaEdrInterface.java
android/android_api/base/src/main/java/org/iotivity/ca/CaInterface.java
android/android_api/base/src/main/java/org/iotivity/ca/CaIpInterface.java
android/android_api/base/src/main/java/org/iotivity/ca/CaLeClientInterface.java
android/android_api/base/src/main/java/org/iotivity/ca/CaLeServerInterface.java
android/android_api/build.gradle
android/android_api/settings.gradle
android/examples/devicediscoveryclient/src/main/java/org/iotivity/base/examples/DeviceDiscoveryClient.java
android/examples/devicediscoveryserver/src/main/java/org/iotivity/base/examples/DeviceDiscoveryServer.java
android/examples/fridgeclient/src/main/java/org/iotivity/base/examples/FridgeClient.java
android/examples/fridgegroupclient/src/main/java/org/iotivity/base/examples/FridgeGroupClient.java
android/examples/fridgegroupserver/src/main/java/org/iotivity/base/examples/DoorResource.java
android/examples/fridgegroupserver/src/main/java/org/iotivity/base/examples/FridgeGroupServer.java
android/examples/fridgegroupserver/src/main/java/org/iotivity/base/examples/FridgeResource.java
android/examples/fridgegroupserver/src/main/java/org/iotivity/base/examples/LightResource.java
android/examples/fridgegroupserver/src/main/java/org/iotivity/base/examples/Refrigerator.java
android/examples/fridgegroupserver/src/main/java/org/iotivity/base/examples/Resource.java
android/examples/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DeviceResource.java
android/examples/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/DoorResource.java
android/examples/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/FridgeServer.java
android/examples/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/LightResource.java
android/examples/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/Refrigerator.java
android/examples/fridgeserver/src/main/java/org/iotivity/base/examples/fridgeserver/Resource.java
android/examples/groupclient/src/main/java/org/iotivity/base/examples/GroupClient.java
android/examples/groupserver/src/main/java/org/iotivity/base/examples/GroupServer.java
android/examples/presenceclient/src/main/java/org/iotivity/base/examples/PresenceClient.java
android/examples/presenceserver/src/main/java/org/iotivity/base/examples/PresenceServer.java
android/examples/settings.gradle
android/examples/simplebase/.gitignore [new file with mode: 0644]
android/examples/simplebase/build.gradle [new file with mode: 0644]
android/examples/simplebase/libs/android-support-v4.jar [new file with mode: 0644]
android/examples/simplebase/proguard-rules.pro [new file with mode: 0644]
android/examples/simplebase/simplebase.iml [moved from resource/csdk/connectivity/samples/android/casample/cAInterface/cAInterface.iml with 84% similarity, mode: 0644]
android/examples/simplebase/src/main/AndroidManifest.xml [moved from resource/csdk/connectivity/samples/android/casample/sampleService/src/main/AndroidManifest.xml with 68% similarity, mode: 0644]
android/examples/simplebase/src/main/java/org/iotivity/base/examples/BluetoothFragment.java [new file with mode: 0644]
android/examples/simplebase/src/main/java/org/iotivity/base/examples/Common.java [new file with mode: 0644]
android/examples/simplebase/src/main/java/org/iotivity/base/examples/DrawerFragment.java [new file with mode: 0644]
android/examples/simplebase/src/main/java/org/iotivity/base/examples/MessageFragment.java [new file with mode: 0644]
android/examples/simplebase/src/main/java/org/iotivity/base/examples/SimpleBase.java [new file with mode: 0644]
android/examples/simplebase/src/main/java/org/iotivity/base/examples/TemplateFragment.java [new file with mode: 0644]
android/examples/simplebase/src/main/res/drawable-hdpi/drawer_shadow.9.png [new file with mode: 0644]
android/examples/simplebase/src/main/res/drawable-hdpi/ic_drawer.png [new file with mode: 0644]
android/examples/simplebase/src/main/res/drawable-mdpi/drawer_shadow.9.png [new file with mode: 0644]
android/examples/simplebase/src/main/res/drawable-mdpi/ic_drawer.png [new file with mode: 0644]
android/examples/simplebase/src/main/res/drawable-xhdpi/drawer_shadow.9.png [new file with mode: 0644]
android/examples/simplebase/src/main/res/drawable-xhdpi/ic_drawer.png [new file with mode: 0644]
android/examples/simplebase/src/main/res/drawable-xxhdpi/drawer_shadow.9.png [new file with mode: 0644]
android/examples/simplebase/src/main/res/drawable-xxhdpi/ic_drawer.png [new file with mode: 0644]
android/examples/simplebase/src/main/res/drawable/iotivityicon.png [new file with mode: 0644]
android/examples/simplebase/src/main/res/drawable/iotivitylogo.png [new file with mode: 0644]
android/examples/simplebase/src/main/res/layout/activity_simplebase.xml [new file with mode: 0644]
android/examples/simplebase/src/main/res/layout/fragment_bluetooth.xml [new file with mode: 0644]
android/examples/simplebase/src/main/res/layout/fragment_drawer.xml [new file with mode: 0644]
android/examples/simplebase/src/main/res/layout/fragment_message.xml [new file with mode: 0644]
android/examples/simplebase/src/main/res/layout/fragment_template.xml [new file with mode: 0644]
android/examples/simplebase/src/main/res/layout/tcp_input.xml [new file with mode: 0755]
android/examples/simplebase/src/main/res/mipmap-hdpi/iotivityicon.png [new file with mode: 0644]
android/examples/simplebase/src/main/res/mipmap-mdpi/iotivityicon.png [new file with mode: 0644]
android/examples/simplebase/src/main/res/mipmap-xhdpi/iotivityicon.png [new file with mode: 0644]
android/examples/simplebase/src/main/res/mipmap-xxhdpi/iotivityicon.png [new file with mode: 0644]
android/examples/simplebase/src/main/res/values-v21/styles.xml [new file with mode: 0644]
android/examples/simplebase/src/main/res/values-w820dp/dimens.xml [moved from resource/csdk/connectivity/samples/android/casample/sampleService/src/main/res/values-w820dp/dimens.xml with 70% similarity, mode: 0644]
android/examples/simplebase/src/main/res/values/dimens.xml [new file with mode: 0644]
android/examples/simplebase/src/main/res/values/strings.xml [new file with mode: 0644]
android/examples/simplebase/src/main/res/values/styles.xml [new file with mode: 0644]
android/examples/simpleclient/src/main/java/org/iotivity/base/examples/Light.java
android/examples/simpleclient/src/main/java/org/iotivity/base/examples/SimpleClient.java
android/examples/simpleserver/src/main/java/org/iotivity/base/examples/Light.java
android/examples/simpleserver/src/main/java/org/iotivity/base/examples/SimpleServer.java
auto_build.sh
build_common/SConscript
build_common/tizen/SConscript
cloud/.gitignore [new file with mode: 0644]
cloud/README [new file with mode: 0644]
cloud/SConscript [new file with mode: 0644]
cloud/account/.classpath [new file with mode: 0644]
cloud/account/.gitignore [new file with mode: 0644]
cloud/account/.project [new file with mode: 0644]
cloud/account/README [new file with mode: 0644]
cloud/account/pom.xml [new file with mode: 0644]
cloud/account/src/main/java/org/iotivity/cloud/accountserver/AccountServer.java [new file with mode: 0644]
cloud/account/src/main/java/org/iotivity/cloud/accountserver/AccountServerManager.java [new file with mode: 0644]
cloud/account/src/main/java/org/iotivity/cloud/accountserver/Const.java [new file with mode: 0644]
cloud/account/src/main/java/org/iotivity/cloud/accountserver/db/AccountDBManager.java [new file with mode: 0644]
cloud/account/src/main/java/org/iotivity/cloud/accountserver/db/MongoDB.java [new file with mode: 0644]
cloud/account/src/main/java/org/iotivity/cloud/accountserver/db/UserDevice.java [new file with mode: 0644]
cloud/account/src/main/java/org/iotivity/cloud/accountserver/db/UserSession.java [new file with mode: 0644]
cloud/account/src/main/java/org/iotivity/cloud/accountserver/oauth/GitHub.java [new file with mode: 0644]
cloud/account/src/main/java/org/iotivity/cloud/accountserver/oauth/OAuthServer.java [new file with mode: 0644]
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/AccountResource.java [new file with mode: 0644]
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/AuthResource.java [new file with mode: 0644]
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/ResponseObject.java [new file with mode: 0644]
cloud/account/src/main/java/org/iotivity/cloud/accountserver/util/CoapMessageBuilder.java [new file with mode: 0644]
cloud/account/src/main/java/org/iotivity/cloud/accountserver/util/JSONUtil.java [new file with mode: 0644]
cloud/account/src/test/java/org/iotivity/cloud/testaccountserver/TestAccountServer.java [new file with mode: 0644]
cloud/interface/.classpath [new file with mode: 0644]
cloud/interface/.gitignore [new file with mode: 0644]
cloud/interface/.project [new file with mode: 0644]
cloud/interface/README [new file with mode: 0644]
cloud/interface/pom.xml [new file with mode: 0644]
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/CloudInterfaceServer.java [new file with mode: 0644]
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/Constants.java [new file with mode: 0644]
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/protocols/CoapAuthHandler.java [new file with mode: 0644]
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/protocols/CoapRelayHandler.java [new file with mode: 0644]
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/KeepAliveResource.java [new file with mode: 0644]
cloud/resourcedirectory/.classpath [new file with mode: 0644]
cloud/resourcedirectory/.gitignore [new file with mode: 0644]
cloud/resourcedirectory/.project [new file with mode: 0644]
cloud/resourcedirectory/README [new file with mode: 0644]
cloud/resourcedirectory/pom.xml [new file with mode: 0644]
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/Constants.java [new file with mode: 0644]
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/JSONUtil.java [new file with mode: 0644]
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/MongoDB.java [new file with mode: 0644]
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/ResourceDirectoryServer.java [new file with mode: 0644]
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/LinksPayloadFormat.java [new file with mode: 0644]
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/PublishPayloadFormat.java [new file with mode: 0644]
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/ResourceDirectoryResource.java [new file with mode: 0644]
cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/RDServerTest.java [new file with mode: 0644]
cloud/samples/client/README [new file with mode: 0644]
cloud/samples/client/SConscript [new file with mode: 0644]
cloud/samples/client/cloud_connector.c [new file with mode: 0644]
cloud/samples/client/cloud_connector.h [new file with mode: 0644]
cloud/samples/client/sample_device.cpp [new file with mode: 0644]
cloud/stack/.classpath [new file with mode: 0644]
cloud/stack/.gitignore [new file with mode: 0644]
cloud/stack/.project [new file with mode: 0644]
cloud/stack/README [new file with mode: 0644]
cloud/stack/pom.xml [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/CoapClient.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/CoapServer.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/HttpClient.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/HttpServer.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/Resource.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/ResourceManager.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/SessionManager.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/protocols/coap/CoapDecoder.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/protocols/coap/CoapEncoder.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/protocols/coap/CoapMessage.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/protocols/coap/CoapRequest.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/protocols/coap/CoapResponse.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/protocols/coap/enums/CoapMethod.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/protocols/coap/enums/CoapOption.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/protocols/coap/enums/CoapStatus.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/base/protocols/proxy/CoapHttpProxyHandler.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/util/Cbor.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/util/CoapLogHandler.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/util/JSONUtil.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/util/Logger.java [new file with mode: 0644]
cloud/stack/src/main/java/org/iotivity/cloud/util/Net.java [new file with mode: 0644]
cloud/stack/src/test/java/org/iotivity/cloud/base/CoapClientTest.java [new file with mode: 0644]
cloud/stack/src/test/java/org/iotivity/cloud/base/CoapServerTest.java [new file with mode: 0644]
examples/OICMiddle/SConscript
examples/OICSensorBoard/Makefile
extlibs/timer/timer.c
extlibs/tinycbor/SConscript
extlibs/tinydtls/SConscript
extlibs/tinydtls/dtls.c
extlibs/tinydtls/global.h
gbsbuild.sh
iotivity.pc.in
plugins/SConscript
plugins/samples/linux/IotivityandZigbeeClient.c
plugins/samples/linux/IotivityandZigbeeServer.c
plugins/src/plugininterface.c
plugins/src/pluginlist.c
plugins/zigbee_wrapper/src/zigbee_wrapper.c
plugins/zigbee_wrapper/telegesis_wrapper/src/telegesis_socket.c
plugins/zigbee_wrapper/telegesis_wrapper/src/telegesis_wrapper.c
plugins/zigbee_wrapper/telegesis_wrapper/src/twsocketlist.c
resource/SConscript
resource/c_common/SConscript
resource/c_common/ocrandom/src/ocrandom.c
resource/c_common/platform_features.h
resource/csdk/SConscript
resource/csdk/connectivity/SConscript
resource/csdk/connectivity/api/cacommon.h
resource/csdk/connectivity/api/cainterface.h
resource/csdk/connectivity/api/cautilinterface.h [new file with mode: 0644]
resource/csdk/connectivity/build/android/jni/Android.mk
resource/csdk/connectivity/build/arduino/arduinomega.properties
resource/csdk/connectivity/build/tizen/gbsbuild.sh
resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec
resource/csdk/connectivity/build/tizen/scons/SConscript
resource/csdk/connectivity/common/inc/camutex.h
resource/csdk/connectivity/common/src/camutex_noop.c
resource/csdk/connectivity/common/src/camutex_pthreads.c
resource/csdk/connectivity/common/src/cathreadpool_pthreads.c
resource/csdk/connectivity/common/src/ulinklist.c
resource/csdk/connectivity/inc/caadapterinterface.h
resource/csdk/connectivity/inc/caadapterutils.h
resource/csdk/connectivity/inc/cablockwisetransfer.h
resource/csdk/connectivity/inc/caedradapter.h
resource/csdk/connectivity/inc/caedradapter_singlethread.h
resource/csdk/connectivity/inc/caedrinterface.h
resource/csdk/connectivity/inc/cafragmentation.h [deleted file]
resource/csdk/connectivity/inc/cagattservice.h
resource/csdk/connectivity/inc/cainterfacecontroller.h
resource/csdk/connectivity/inc/cainterfacecontroller_singlethread.h
resource/csdk/connectivity/inc/caipadapter.h
resource/csdk/connectivity/inc/caipinterface.h
resource/csdk/connectivity/inc/caleadapter.h
resource/csdk/connectivity/inc/caleinterface.h
resource/csdk/connectivity/inc/camessagehandler.h
resource/csdk/connectivity/inc/canfcadapter.h
resource/csdk/connectivity/inc/caprotocolmessage.h
resource/csdk/connectivity/inc/caraadapter.h
resource/csdk/connectivity/inc/catcpadapter.h
resource/csdk/connectivity/inc/catcpinterface.h
resource/csdk/connectivity/lib/arduino/RBL_nRF8001.patch
resource/csdk/connectivity/lib/arduino/arduino_libraries.patch
resource/csdk/connectivity/lib/libcoap-4.1.1/SConscript
resource/csdk/connectivity/lib/libcoap-4.1.1/net.c
resource/csdk/connectivity/lib/libcoap-4.1.1/option.c
resource/csdk/connectivity/lib/libcoap-4.1.1/pdu.c
resource/csdk/connectivity/lib/libcoap-4.1.1/pdu.h
resource/csdk/connectivity/lib/libcoap-4.1.1/resource.c
resource/csdk/connectivity/samples/android/SConscript [deleted file]
resource/csdk/connectivity/samples/android/casample/.gitignore [deleted file]
resource/csdk/connectivity/samples/android/casample/SConscript [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/.gitignore [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/build.gradle [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/.gitignore [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/AndroidManifest.xml [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/java/org/iotivity/ca/CaIpInterface.java [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/java/org/iotivity/ca/CaLeClientInterface.java [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/java/org/iotivity/ca/CaLeServerInterface.java [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/java/org/iotivity/ca/CaNfcInterface.java [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/res/drawable-hdpi/ic_launcher.png [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/res/drawable-mdpi/ic_launcher.png [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/res/drawable-xhdpi/ic_launcher.png [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/res/values-v11/styles.xml [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/res/values-v14/styles.xml [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/res/values/strings.xml [deleted file]
resource/csdk/connectivity/samples/android/casample/cAInterface/src/main/res/values/styles.xml [deleted file]
resource/csdk/connectivity/samples/android/casample/casample.iml [deleted file]
resource/csdk/connectivity/samples/android/casample/gradle.properties [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/.gitignore [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/build.gradle [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/.gitignore [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/java/org/iotivity/ca/service/DLog.java [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/java/org/iotivity/ca/service/FileChooser.java [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/java/org/iotivity/ca/service/MainActivity.java [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/java/org/iotivity/ca/service/RMInterface.java [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/Android.mk [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/Application.mk [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/ResourceModel.c [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/jni/org_iotivity_ca_service_RMInterface.h [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/res/layout/activity_main.xml [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/res/menu/main.xml [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/res/values-v11/styles.xml [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/res/values-v14/styles.xml [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/res/values/strings.xml [deleted file]
resource/csdk/connectivity/samples/android/casample/sampleService/src/main/res/values/styles.xml [deleted file]
resource/csdk/connectivity/samples/android/casample/settings.gradle [deleted file]
resource/csdk/connectivity/samples/arduino/SConscript [deleted file]
resource/csdk/connectivity/samples/arduino/casample.cpp [deleted file]
resource/csdk/connectivity/samples/linux/README [deleted file]
resource/csdk/connectivity/samples/linux/SConscript [deleted file]
resource/csdk/connectivity/samples/linux/sample_main.c [deleted file]
resource/csdk/connectivity/samples/linux/threadpool/main.c [deleted file]
resource/csdk/connectivity/samples/tizen/README.txt [deleted file]
resource/csdk/connectivity/samples/tizen/SConscript [deleted file]
resource/csdk/connectivity/samples/tizen/SConstruct [deleted file]
resource/csdk/connectivity/samples/tizen/casample.c [deleted file]
resource/csdk/connectivity/samples/tizen/com.oic.ca.sample.manifest [deleted file]
resource/csdk/connectivity/samples/tizen/com.oic.ca.sample.xml [deleted file]
resource/csdk/connectivity/samples/tizen/gbsbuild.sh [deleted file]
resource/csdk/connectivity/samples/tizen/packaging/com.oic.ca.sample.spec [deleted file]
resource/csdk/connectivity/samples/tizen/scons/SConscript [deleted file]
resource/csdk/connectivity/src/SConscript [changed mode: 0755->0644]
resource/csdk/connectivity/src/adapter_util/caadapterutils.c
resource/csdk/connectivity/src/adapter_util/cafragmentation.c [deleted file]
resource/csdk/connectivity/src/adapter_util/pkix/der_dec.c
resource/csdk/connectivity/src/adapter_util/pkix/sn_store.c
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.c
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrclient.h
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrnwmonitor.c
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.c
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrserver.h
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.c
resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.h
resource/csdk/connectivity/src/bt_edr_adapter/android/org_iotivity_ca_CaEdrInterface.h
resource/csdk/connectivity/src/bt_edr_adapter/caedradapter.c
resource/csdk/connectivity/src/bt_edr_adapter/linux/SConscript [deleted file]
resource/csdk/connectivity/src/bt_edr_adapter/linux/caedradapter.c [deleted file]
resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrclient.c
resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrendpoint.c
resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrnwmonitor.c
resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrserver.c
resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrutils.c
resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrutils.h
resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c
resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.h
resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.c
resource/csdk/connectivity/src/bt_le_adapter/android/calenwmonitor.h
resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c
resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.c
resource/csdk/connectivity/src/bt_le_adapter/android/caleutils.h
resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_ca_CaLeClientInterface.h
resource/csdk/connectivity/src/bt_le_adapter/android/org_iotivity_ca_CaLeServerInterface.h
resource/csdk/connectivity/src/bt_le_adapter/arduino/cablenwmonitor.cpp
resource/csdk/connectivity/src/bt_le_adapter/arduino/cableserver.cpp
resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c
resource/csdk/connectivity/src/bt_le_adapter/linux/caleinterface.c
resource/csdk/connectivity/src/bt_le_adapter/linux/client.c
resource/csdk/connectivity/src/bt_le_adapter/linux/descriptor.c
resource/csdk/connectivity/src/bt_le_adapter/linux/recv.c
resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c
resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.h
resource/csdk/connectivity/src/bt_le_adapter/tizen/calenwmonitor.c
resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver.c
resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver.h
resource/csdk/connectivity/src/bt_le_adapter/tizen/caleutil.c
resource/csdk/connectivity/src/cablockwisetransfer.c
resource/csdk/connectivity/src/caconnectivitymanager.c
resource/csdk/connectivity/src/cainterfacecontroller.c
resource/csdk/connectivity/src/camessagehandler.c
resource/csdk/connectivity/src/canetworkconfigurator.c
resource/csdk/connectivity/src/caprotocolmessage.c
resource/csdk/connectivity/src/caqueueingthread.c
resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c [changed mode: 0755->0644]
resource/csdk/connectivity/src/ip_adapter/caipadapter.c
resource/csdk/connectivity/src/ip_adapter/caipserver.c
resource/csdk/connectivity/src/ip_adapter/linux/caipnwmonitor.c
resource/csdk/connectivity/src/ip_adapter/tizen/caipnwmonitor.c
resource/csdk/connectivity/src/nfc_adapter/android/canfcserver.c
resource/csdk/connectivity/src/nfc_adapter/canfcadapter.c
resource/csdk/connectivity/src/ra_adapter/caraadapter.c
resource/csdk/connectivity/src/tcp_adapter/SConscript
resource/csdk/connectivity/src/tcp_adapter/arduino/SConscript [new file with mode: 0644]
resource/csdk/connectivity/src/tcp_adapter/arduino/catcpadapterutils_eth.cpp [new file with mode: 0644]
resource/csdk/connectivity/src/tcp_adapter/arduino/catcpadapterutils_eth.h [new file with mode: 0644]
resource/csdk/connectivity/src/tcp_adapter/arduino/catcpserver_eth.cpp [new file with mode: 0644]
resource/csdk/connectivity/src/tcp_adapter/catcpadapter.c
resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
resource/csdk/connectivity/test/SConscript
resource/csdk/connectivity/test/ca_api_unittest.cpp
resource/csdk/connectivity/test/cablocktransfertest.cpp [new file with mode: 0644]
resource/csdk/connectivity/test/camutex_tests.cpp
resource/csdk/connectivity/util/SConscript [new file with mode: 0644]
resource/csdk/connectivity/util/inc/cabtpairinginterface.h [new file with mode: 0644]
resource/csdk/connectivity/util/inc/camanagerleinterface.h [new file with mode: 0644]
resource/csdk/connectivity/util/src/btpairing/android/cabtpairing.c [new file with mode: 0644]
resource/csdk/connectivity/util/src/btpairing/android/cabtpairing.h [new file with mode: 0644]
resource/csdk/connectivity/util/src/camanager/android/caleautoconnector.c [new file with mode: 0644]
resource/csdk/connectivity/util/src/camanager/android/caleautoconnector.h [new file with mode: 0644]
resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c [new file with mode: 0644]
resource/csdk/connectivity/util/src/camanager/android/camanagerdevice.c [new file with mode: 0644]
resource/csdk/connectivity/util/src/camanager/android/camanagerdevice.h [new file with mode: 0644]
resource/csdk/connectivity/util/src/camanager/android/camanagerleutil.c [new file with mode: 0644]
resource/csdk/connectivity/util/src/camanager/android/camanagerleutil.h [new file with mode: 0644]
resource/csdk/connectivity/util/src/cautilinterface.c [new file with mode: 0644]
resource/csdk/logger/include/logger.h
resource/csdk/logger/src/logger.c
resource/csdk/logger/test/android/loggertests.cpp
resource/csdk/logger/test/arduino/ArduinoLoggerTest.cpp
resource/csdk/logger/test/loggertests.cpp
resource/csdk/routing/include/routingmanager.h
resource/csdk/routing/include/routingutility.h
resource/csdk/routing/src/routingmanager.c
resource/csdk/routing/src/routingutility.c
resource/csdk/security/README-building-and-running-secure-IoTivity-stack.txt
resource/csdk/security/SConscript [changed mode: 0755->0644]
resource/csdk/security/include/internal/aclresource.h
resource/csdk/security/include/internal/amsmgr.h
resource/csdk/security/include/internal/directpairing.h [new file with mode: 0644]
resource/csdk/security/include/internal/doxmresource.h
resource/csdk/security/include/internal/dpairingresource.h [new file with mode: 0644]
resource/csdk/security/include/internal/pconfresource.h [new file with mode: 0644]
resource/csdk/security/include/internal/pstatresource.h
resource/csdk/security/include/internal/srmresourcestrings.h [changed mode: 0755->0644]
resource/csdk/security/include/pinoxmcommon.h
resource/csdk/security/include/securevirtualresourcetypes.h [changed mode: 0755->0644]
resource/csdk/security/include/srmutility.h
resource/csdk/security/provisioning/README.txt
resource/csdk/security/provisioning/SConscript
resource/csdk/security/provisioning/ck_manager/sample/Door_sample.cpp
resource/csdk/security/provisioning/ck_manager/sample/README.txt
resource/csdk/security/provisioning/ck_manager/sample/provisioningclient.c
resource/csdk/security/provisioning/ck_manager/src/cert_generator.c
resource/csdk/security/provisioning/ck_manager/src/ck_manager.c
resource/csdk/security/provisioning/ck_manager/src/ckm_info.c
resource/csdk/security/provisioning/ck_manager/src/crl_generator.c
resource/csdk/security/provisioning/ck_manager/unittest/pki_test.cpp
resource/csdk/security/provisioning/include/internal/secureresourceprovider.h
resource/csdk/security/provisioning/include/ocprovisioningmanager.h
resource/csdk/security/provisioning/include/oxm/oxmrandompin.h
resource/csdk/security/provisioning/include/pmtypes.h
resource/csdk/security/provisioning/sample/SConscript
resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.json [changed mode: 0644->0755]
resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.json [changed mode: 0755->0644]
resource/csdk/security/provisioning/sample/provisioningclient.c
resource/csdk/security/provisioning/src/credentialgenerator.c
resource/csdk/security/provisioning/src/ocprovisioningmanager.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/provisioning/src/oxmjustworks.c
resource/csdk/security/provisioning/src/oxmrandompin.c
resource/csdk/security/provisioning/src/pmutility.c [changed mode: 0755->0644]
resource/csdk/security/provisioning/src/provisioningdatabasemanager.c
resource/csdk/security/provisioning/src/secureresourceprovider.c
resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp
resource/csdk/security/provisioning/unittest/secureresourceprovider.cpp
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/amaclresource.c
resource/csdk/security/src/amsmgr.c
resource/csdk/security/src/base64.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/crlresource.c
resource/csdk/security/src/directpairing.c [new file with mode: 0644]
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/dpairingresource.c [new file with mode: 0755]
resource/csdk/security/src/iotvticalendar.c [changed mode: 0755->0644]
resource/csdk/security/src/oxmpincommon.c
resource/csdk/security/src/pconfresource.c [new file with mode: 0644]
resource/csdk/security/src/policyengine.c
resource/csdk/security/src/psinterface.c
resource/csdk/security/src/pstatresource.c
resource/csdk/security/src/resourcemanager.c
resource/csdk/security/src/secureresourcemanager.c
resource/csdk/security/src/srmresourcestrings.c [changed mode: 0755->0644]
resource/csdk/security/src/srmutility.c
resource/csdk/security/src/svcresource.c
resource/csdk/security/unittest/SConscript
resource/csdk/security/unittest/aclresourcetest.cpp
resource/csdk/security/unittest/base64tests.cpp
resource/csdk/security/unittest/credentialresource.cpp
resource/csdk/security/unittest/directpairingtest.cpp [new file with mode: 0644]
resource/csdk/security/unittest/doxmresource.cpp
resource/csdk/security/unittest/iotvticalendartest.cpp [changed mode: 0755->0644]
resource/csdk/stack/include/internal/ocresource.h [changed mode: 0644->0755]
resource/csdk/stack/include/internal/ocstackinternal.h
resource/csdk/stack/include/internal/oickeepalive.h
resource/csdk/stack/include/ocpayload.h
resource/csdk/stack/include/ocstack.h
resource/csdk/stack/include/ocstackconfig.h
resource/csdk/stack/include/octypes.h
resource/csdk/stack/include/payload_logging.h
resource/csdk/stack/include/rdpayload.h
resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
resource/csdk/stack/samples/linux/secure/SConscript
resource/csdk/stack/samples/linux/secure/occlientdirectpairing.cpp [new file with mode: 0644]
resource/csdk/stack/samples/linux/secure/oic_svr_db_client_directpairing.json [new file with mode: 0644]
resource/csdk/stack/samples/tizen/SimpleClientServer/ocserver.cpp
resource/csdk/stack/samples/tizen/build/gbsbuild.sh
resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
resource/csdk/stack/src/occollection.c [changed mode: 0644->0755]
resource/csdk/stack/src/ocpayload.c
resource/csdk/stack/src/ocpayloadconvert.c
resource/csdk/stack/src/ocpayloadparse.c [changed mode: 0644->0755]
resource/csdk/stack/src/ocresource.c [changed mode: 0644->0755]
resource/csdk/stack/src/ocserverrequest.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/src/oicgroup.c
resource/csdk/stack/src/oickeepalive.c
resource/csdk/stack/src/rdpayload.c
resource/csdk/stack/test/stacktests.cpp [changed mode: 0644->0755]
resource/docs/Doxyfile
resource/docs/javadocGen.sh
resource/examples/SConscript
resource/examples/devicediscoveryserver.cpp
resource/examples/groupclient.cpp
resource/examples/groupserver.cpp [changed mode: 0644->0755]
resource/include/CAManager.h [new file with mode: 0644]
resource/include/OCHeaderOption.h
resource/include/OCProvisioningManager.h [changed mode: 0644->0755]
resource/include/OCSerialization.h
resource/include/OCUtilities.h
resource/include/StringConstants.h
resource/oc_logger/SConscript
resource/provisioning/SConscript
resource/provisioning/examples/SConscript
resource/provisioning/examples/provisioningclient.cpp
resource/provisioning/src/OCProvisioningManager.cpp
resource/src/CAManager.cpp [new file with mode: 0644]
resource/src/InProcClientWrapper.cpp
resource/src/OCRepresentation.cpp
resource/src/OCResource.cpp
resource/src/SConscript
resource/third_party_libs.scons
resource/unittests/OCHeaderOptionTest.cpp
resource/unittests/OCPlatformTest.cpp
resource/unittests/OCRepresentationEncodingTest.cpp
scons_script_how_to.txt
service/SConscript
service/easy-setup/Build_Instructions_Android_Arduino.txt
service/easy-setup/enrollee/SConscript
service/easy-setup/enrollee/arduino/easysetup.cpp [moved from service/easy-setup/enrollee/src/easysetup.cpp with 100% similarity]
service/easy-setup/enrollee/arduino/onboarding.cpp [new file with mode: 0644]
service/easy-setup/enrollee/arduino/resourcehandler.cpp [moved from service/easy-setup/enrollee/src/resourcehandler.cpp with 95% similarity]
service/easy-setup/enrollee/arduino/softap.cpp [moved from service/easy-setup/enrollee/src/softap.cpp with 100% similarity]
service/easy-setup/enrollee/arduino/wifi/networkhandler.cpp
service/easy-setup/enrollee/inc/softap.h [deleted file]
service/easy-setup/enrollee/linux/wifi/networkhandler.c [moved from service/easy-setup/enrollee/linux/wifi/networkhandler.cpp with 98% similarity]
service/easy-setup/enrollee/linux/wifi/softapnative.c [moved from service/easy-setup/enrollee/linux/wifi/softapnative.cpp with 100% similarity]
service/easy-setup/enrollee/src/easysetup.c [new file with mode: 0644]
service/easy-setup/enrollee/src/easysetupcallbacks.h [new file with mode: 0644]
service/easy-setup/enrollee/src/onboarding.c [moved from service/easy-setup/enrollee/src/onboarding.cpp with 94% similarity, mode: 0644]
service/easy-setup/enrollee/src/onboarding.h [new file with mode: 0644]
service/easy-setup/enrollee/src/resourcehandler.c [new file with mode: 0755]
service/easy-setup/enrollee/src/resourcehandler.h [moved from service/easy-setup/enrollee/inc/resourcehandler.h with 96% similarity, mode: 0644]
service/easy-setup/enrollee/src/softap.c [new file with mode: 0644]
service/easy-setup/enrollee/src/softap.h [new file with mode: 0644]
service/easy-setup/enrollee/tizen/wifi/networkhandler.c [moved from service/easy-setup/enrollee/tizen/wifi/networkhandler.cpp with 100% similarity]
service/easy-setup/enrollee/tizen/wifi/softapnative.c [moved from service/easy-setup/enrollee/tizen/wifi/softapnative.cpp with 83% similarity]
service/easy-setup/enrollee/unittests/enrolleetests.cpp
service/easy-setup/inc/escommon.h
service/easy-setup/mediator/csdk/SConscript
service/easy-setup/mediator/csdk/unittests/MediatorCSDKTest.cpp
service/easy-setup/mediator/richsdk/SConscript
service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EasySetupService.java
service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/java/org/iotivity/service/easysetup/mediator/EnrolleeDeviceFactory.java
service/easy-setup/mediator/richsdk/inc/RemoteEnrolleeResource.h
service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp
service/easy-setup/mediator/richsdk/src/RemoteEnrolleeResource.cpp
service/easy-setup/mediator/richsdk/unittests/MediatorRichTest.cpp
service/easy-setup/mediator/richsdk/unittests/SConscript
service/easy-setup/sampleapp/enrollee/linux/SConscript
service/easy-setup/sampleapp/enrollee/linux/enrolleewifi.c [moved from service/easy-setup/sampleapp/enrollee/linux/enrolleewifi.cpp with 53% similarity, mode: 0644]
service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/build/tizen/gbsbuild.sh
service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/enrolleewifi.cpp
service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/scons/SConscript
service/easy-setup/sampleapp/enrollee/tizen-sdb/README.txt
service/easy-setup/sampleapp/enrollee/tizen/EnrolleeGUISample/.cproject [deleted file]
service/easy-setup/sampleapp/enrollee/tizen/EnrolleeGUISample/.exportMap [deleted file]
service/easy-setup/sampleapp/enrollee/tizen/EnrolleeGUISample/.project [deleted file]
service/easy-setup/sampleapp/enrollee/tizen/EnrolleeGUISample/edc_resource/re_client_control.edc [deleted file]
service/easy-setup/sampleapp/enrollee/tizen/EnrolleeGUISample/inc/enrolleewifi.h [deleted file]
service/easy-setup/sampleapp/enrollee/tizen/EnrolleeGUISample/shared/res/resampleapp.png [deleted file]
service/easy-setup/sampleapp/enrollee/tizen/EnrolleeGUISample/src/enrolleemain.cpp [deleted file]
service/easy-setup/sampleapp/enrollee/tizen/EnrolleeGUISample/src/enrolleewifi.cpp [deleted file]
service/easy-setup/sampleapp/enrollee/tizen/EnrolleeGUISample/tizen-manifest.xml [deleted file]
service/easy-setup/sampleapp/enrollee/tizen/Enrolleesample/edc_resource/re_client_control.edc [deleted file]
service/easy-setup/sampleapp/enrollee/tizen/Enrolleesample/inc/enrolleewifi.h [deleted file]
service/easy-setup/sampleapp/enrollee/tizen/Enrolleesample/shared/res/resampleapp.png [deleted file]
service/easy-setup/sampleapp/enrollee/tizen/Enrolleesample/src/enrolleewifi.cpp [deleted file]
service/easy-setup/sampleapp/enrollee/tizen/Enrolleesample/tizen-manifest.xml [deleted file]
service/easy-setup/sampleapp/enrollee/tizen/Read ME.txt [deleted file]
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/assets/oic_svr_db_client.dat [new file with mode: 0644]
service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/SConscript
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator_cpp.cpp
service/resource-container/SConscript
service/resource-container/android/SConscript
service/resource-container/android/resource-container/build.gradle
service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/BundleActivator.java [new file with mode: 0644]
service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/BundleResource.java [new file with mode: 0644]
service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/BundleSoftSensorResource.java [new file with mode: 0644]
service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsBundleInfo.java
service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsResourceAttributes.java [new file with mode: 0644]
service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsResourceContainer.java
service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsResourceContainerBundleAPI.java [moved from service/easy-setup/enrollee/inc/onboarding.h with 56% similarity]
service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/RcsValue.java [new file with mode: 0644]
service/resource-container/android/resource-container/src/main/java/org/iotivity/service/resourcecontainer/ResourceConfig.java [new file with mode: 0644]
service/resource-container/android/resource-container/src/main/jni/Android.mk
service/resource-container/android/resource-container/src/main/jni/JniBundleResource.cpp [new file with mode: 0644]
service/resource-container/android/resource-container/src/main/jni/JniBundleResource.h [new file with mode: 0644]
service/resource-container/android/resource-container/src/main/jni/JniMain.cpp
service/resource-container/android/resource-container/src/main/jni/JniRcsResourceAttributes.cpp [new file with mode: 0644]
service/resource-container/android/resource-container/src/main/jni/JniRcsResourceAttributes.h [new file with mode: 0644]
service/resource-container/android/resource-container/src/main/jni/JniRcsResourceContainer.cpp
service/resource-container/android/resource-container/src/main/jni/JniRcsResourceContainer.h
service/resource-container/android/resource-container/src/main/jni/JniRcsValue.cpp [new file with mode: 0644]
service/resource-container/android/resource-container/src/main/jni/JniRcsValue.h [new file with mode: 0644]
service/resource-container/android/resource-container/src/main/jni/util/JavaClasses.cpp
service/resource-container/android/resource-container/src/main/jni/util/JavaClasses.h
service/resource-container/android/resource-container/src/main/jni/util/JavaExceptions.cpp [new file with mode: 0644]
service/resource-container/android/resource-container/src/main/jni/util/JavaExceptions.h [new file with mode: 0644]
service/resource-container/android/resource-container/src/main/jni/util/ScopedEnv.h [new file with mode: 0644]
service/resource-container/android/settings.gradle
service/resource-container/bundle-api/include/BundleResource.h
service/resource-container/bundle-api/include/ProtocolBridgeResource.h
service/resource-container/bundle-api/include/SoftSensorResource.h
service/resource-container/examples/BMISensorBundle/include/BMISensorResource.h
service/resource-container/examples/BMISensorBundle/src/BMISensorResource.cpp
service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript
service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript
service/resource-container/examples/ContainerSample.cpp
service/resource-container/examples/ContainerSampleClient.cpp
service/resource-container/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensorResource.h
service/resource-container/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensorResource.cpp
service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript
service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript
service/resource-container/examples/HueSampleBundle/include/HueLight.h
service/resource-container/examples/HueSampleBundle/src/HueLight.cpp
service/resource-container/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp
service/resource-container/examples/ResourceContainerConfig.xml
service/resource-container/examples/android/AndroidBundle/AndroidBundle.iml [moved from service/resource-container/examples/android/RCSampleClientApp/RCSampleClientApp.iml with 54% similarity, mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/app.iml [moved from resource/csdk/connectivity/samples/android/casample/sampleService/sampleService.iml with 84% similarity]
service/resource-container/examples/android/AndroidBundle/app/build.gradle [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/androidTest/java/org/iotivity/service/sample/androidbundle/ApplicationTest.java [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/AndroidManifest.xml [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/java/org/iotivity/service/sample/androidbundle/DummyActivity.java [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/java/org/iotivity/service/sample/androidbundle/SampleActivator.java [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/java/org/iotivity/service/sample/androidbundle/resources/DiscomfortIndexResource.java [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/java/org/iotivity/service/sample/androidbundle/resources/GyroscopeResource.java [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/java/org/iotivity/service/sample/androidbundle/resources/HumidityResource.java [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/java/org/iotivity/service/sample/androidbundle/resources/LightIntensityResource.java [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/java/org/iotivity/service/sample/androidbundle/resources/TemperatureResource.java [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/res/layout/activity_main.xml [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/res/menu/menu_main.xml [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/res/mipmap-hdpi/ic_launcher.png [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/res/mipmap-mdpi/ic_launcher.png [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/res/mipmap-xhdpi/ic_launcher.png [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/res/mipmap-xxhdpi/ic_launcher.png [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/res/values-v21/styles.xml [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/res/values-w820dp/dimens.xml [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/res/values/dimens.xml [moved from resource/csdk/connectivity/samples/android/casample/sampleService/src/main/res/values/dimens.xml with 98% similarity]
service/resource-container/examples/android/AndroidBundle/app/src/main/res/values/strings.xml [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/app/src/main/res/values/styles.xml [new file with mode: 0755]
service/resource-container/examples/android/AndroidBundle/build.gradle [moved from resource/csdk/connectivity/samples/android/casample/build.gradle with 56% similarity]
service/resource-container/examples/android/AndroidBundle/gradle/wrapper/gradle-wrapper.jar [moved from resource/csdk/connectivity/samples/android/casample/gradle/wrapper/gradle-wrapper.jar with 100% similarity]
service/resource-container/examples/android/AndroidBundle/gradle/wrapper/gradle-wrapper.properties [moved from resource/csdk/connectivity/samples/android/casample/gradle/wrapper/gradle-wrapper.properties with 80% similarity]
service/resource-container/examples/android/AndroidBundle/gradlew [moved from resource/csdk/connectivity/samples/android/casample/gradlew with 100% similarity]
service/resource-container/examples/android/AndroidBundle/gradlew.bat [moved from resource/csdk/connectivity/samples/android/casample/gradlew.bat with 100% similarity]
service/resource-container/examples/android/AndroidBundle/settings.gradle [new file with mode: 0755]
service/resource-container/examples/android/RCSampleClientApp/.gitignore [deleted file]
service/resource-container/examples/android/RCSampleClientApp/app/.gitignore [deleted file]
service/resource-container/examples/android/RCSampleClientApp/app/src/main/java/org/iotivity/service/sample/client/ContainerClientActivity.java
service/resource-container/examples/android/RCSampleClientApp/app/src/main/java/org/iotivity/service/sample/client/ResourceListAdapter.java [new file with mode: 0644]
service/resource-container/examples/android/RCSampleClientApp/app/src/main/java/org/iotivity/service/sample/client/ResourceListItem.java [new file with mode: 0644]
service/resource-container/examples/android/RCSampleClientApp/app/src/main/java/org/iotivity/service/sample/client/Utils.java
service/resource-container/examples/android/RCSampleClientApp/app/src/main/res/layout/activity_container_client.xml
service/resource-container/examples/android/RCSampleClientApp/app/src/main/res/layout/discovered_resource.xml [new file with mode: 0644]
service/resource-container/examples/android/RCSampleServerApp/.gitignore [deleted file]
service/resource-container/examples/android/RCSampleServerApp/RCSampleServerApp.iml [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/README [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/.gitignore [deleted file]
service/resource-container/examples/android/RCSampleServerApp/app/app.iml [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/build.gradle [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/androidTest/assets/lib/ResourceContainerConfig.xml [new file with mode: 0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/androidTest/java/org/iotivity/service/sample/container/ResourceContainerTest.java [new file with mode: 0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/main/AndroidManifest.xml [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/main/assets/lib/ResourceContainerConfig.xml [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/main/java/org/iotivity/service/sample/container/ResourceContainer.java [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/main/java/org/iotivity/service/sample/container/ResourceContainerActivity.java [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/main/res/layout/group.xml [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/main/res/layout/list_item.xml [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/main/res/layout/resource_container.xml [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/main/res/mipmap-hdpi/ic_launcher.png [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/main/res/mipmap-mdpi/ic_launcher.png [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/main/res/mipmap-xhdpi/ic_launcher.png [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.png [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/main/res/values-v21/styles.xml [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/main/res/values/strings.xml [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/app/src/main/res/values/styles.xml [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/build.gradle [changed mode: 0644->0755]
service/resource-container/examples/android/RCSampleServerApp/gradlew [new file with mode: 0755]
service/resource-container/examples/android/RCSampleServerApp/gradlew.bat [new file with mode: 0755]
service/resource-container/examples/android/RCSampleServerApp/settings.gradle [changed mode: 0644->0755]
service/resource-container/examples/tizen/ContainerServerApp/lib/ResourceContainerConfig.xml
service/resource-container/examples/tizen/ContainerServerApp/src/container.cpp
service/resource-container/include/RCSBundleInfo.h
service/resource-container/src/AndroidBundleResource.h [new file with mode: 0644]
service/resource-container/src/BundleInfoInternal.cpp
service/resource-container/src/BundleInfoInternal.h
service/resource-container/src/BundleResource.cpp
service/resource-container/src/Configuration.cpp
service/resource-container/src/Configuration.h
service/resource-container/src/DiscoverResourceUnit.cpp
service/resource-container/src/DiscoverResourceUnit.h
service/resource-container/src/InternalTypes.h
service/resource-container/src/JavaBundleResource.cpp
service/resource-container/src/JavaBundleResource.h
service/resource-container/src/RemoteResourceUnit.cpp
service/resource-container/src/ResourceContainerImpl.cpp
service/resource-container/src/ResourceContainerImpl.h
service/resource-container/unittests/ResourceContainerTest.cpp
service/resource-container/unittests/ResourceContainerTestSimulator.h
service/resource-container/unittests/TestBundle/include/TestBundleActivator.h
service/resource-directory/SConscript
service/resource-directory/include/rd_client.h
service/resource-directory/src/rd_client.c
service/resource-directory/src/rd_server.c
service/resource-encapsulation/android/service/src/androidTest/java/org/iotivity/service/TestBase.java [changed mode: 0644->0755]
service/resource-encapsulation/android/service/src/main/jni/Android.mk
service/resource-encapsulation/android/settings.gradle
service/resource-encapsulation/examples/android/RESampleClientApp/app/src/main/java/org/iotivity/service/sample/client/ResourceClientActivity.java
service/resource-encapsulation/examples/linux/NestedAttributesClient.cpp
service/resource-encapsulation/examples/linux/NestedAttributesServer.cpp
service/resource-encapsulation/examples/linux/SConscript
service/resource-encapsulation/examples/linux/SampleResourceClient.cpp [changed mode: 0755->0644]
service/resource-encapsulation/examples/linux/SampleResourceServer.cpp
service/resource-encapsulation/examples/linux/SeparateResponseServer.cpp [new file with mode: 0755]
service/resource-encapsulation/examples/linux/secureResourceExample/SConscript
service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/edc_resource/re_container_control.edc
service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/src/recontainerclient.cpp
service/resource-encapsulation/examples/tizen/RESampleClientApp/src/reclient.cpp
service/resource-encapsulation/include/RCSDiscoveryManager.h
service/resource-encapsulation/include/RCSRemoteResourceObject.h
service/resource-encapsulation/include/RCSRepresentation.h
service/resource-encapsulation/include/RCSRequest.h
service/resource-encapsulation/include/RCSResourceAttributes.h
service/resource-encapsulation/include/RCSResourceObject.h
service/resource-encapsulation/include/RCSResponse.h
service/resource-encapsulation/include/RCSSeparateResponse.h
service/resource-encapsulation/src/common/SConscript
service/resource-encapsulation/src/common/primitiveResource/include/AssertUtils.h
service/resource-encapsulation/src/common/primitiveResource/src/RCSRepresentation.cpp
service/resource-encapsulation/src/common/primitiveResource/src/RCSResourceAttributes.cpp
service/resource-encapsulation/src/resourceBroker/include/DevicePresence.h
service/resource-encapsulation/src/resourceBroker/src/DevicePresence.cpp
service/resource-encapsulation/src/resourceBroker/src/ResourceBroker.cpp
service/resource-encapsulation/src/resourceBroker/unittest/SConscript
service/resource-encapsulation/src/resourceCache/include/DataCache.h
service/resource-encapsulation/src/resourceCache/src/DataCache.cpp
service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp
service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp
service/resource-encapsulation/src/resourceClient/RCSDiscoveryManager.cpp [changed mode: 0755->0644]
service/resource-encapsulation/src/resourceClient/RCSDiscoveryManagerImpl.cpp
service/resource-encapsulation/src/resourceClient/RCSDiscoveryManagerImpl.h
service/resource-encapsulation/src/resourceClient/RCSRemoteResourceObject.cpp
service/resource-encapsulation/src/serverBuilder/SConscript
service/resource-encapsulation/src/serverBuilder/include/InterfaceHandler.h [new file with mode: 0644]
service/resource-encapsulation/src/serverBuilder/include/RequestHandler.h
service/resource-encapsulation/src/serverBuilder/src/InterfaceHandler.cpp [new file with mode: 0644]
service/resource-encapsulation/src/serverBuilder/src/RCSRequest.cpp
service/resource-encapsulation/src/serverBuilder/src/RCSResourceObject.cpp
service/resource-encapsulation/src/serverBuilder/src/RCSSeparateResponse.cpp
service/resource-encapsulation/src/serverBuilder/src/RequestHandler.cpp
service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp
service/resource-encapsulation/src/serverBuilder/unittests/RCSResponseTest.cpp
service/resource-encapsulation/src/serverBuilder/unittests/RequestHandlerTest.cpp
service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp
service/resource-encapsulation/unittests/ResourceClientTest.cpp
service/resource-encapsulation/unittests/SConscript
service/resource-hosting/SampleApp/android/SampleProviderApp/src/com/example/sample/provider/IMessageLogger.java
service/resource-hosting/SampleApp/linux/SConscript
service/resource-hosting/SampleApp/linux/sampleConsumer/SampleConsumer.cpp
service/resource-hosting/SampleApp/linux/sampleProvider/SampleProvider.cpp
service/resource-hosting/SampleApp/tizen/RHSampleApp/.cproject
service/resource-hosting/android/resource_hosting/jni/ResourceHosing_JNI.cpp
service/resource-hosting/src/HostingObject.cpp
service/resource-hosting/src/HostingObject.h
service/resource-hosting/src/RequestObject.cpp
service/resource-hosting/src/RequestObject.h
service/resource-hosting/src/ResourceHosting.cpp
service/resource-hosting/src/ResourceHosting.h
service/resource-hosting/unittest/HostingObjectUnitTest.cpp [changed mode: 0644->0755]
service/resource-hosting/unittest/RequestObjectUnitTest.cpp [changed mode: 0644->0755]
service/resource-hosting/unittest/ResourceEncapsulationTestSimulator.h [changed mode: 0644->0755]
service/resource-hosting/unittest/ResourceHostingUnitTest.cpp [changed mode: 0644->0755]
service/resource-hosting/unittest/SConscript
service/scene-manager/README.txt [new file with mode: 0755]
service/scene-manager/SConscript [new file with mode: 0755]
service/scene-manager/include/RemoteScene.h [new file with mode: 0644]
service/scene-manager/include/RemoteSceneAction.h [new file with mode: 0644]
service/scene-manager/include/RemoteSceneCollection.h [new file with mode: 0644]
service/scene-manager/include/RemoteSceneList.h [new file with mode: 0644]
service/scene-manager/include/Scene.h [new file with mode: 0755]
service/scene-manager/include/SceneAction.h [new file with mode: 0755]
service/scene-manager/include/SceneCollection.h [new file with mode: 0755]
service/scene-manager/include/SceneList.h [new file with mode: 0755]
service/scene-manager/sampleapp/SConscript [new file with mode: 0755]
service/scene-manager/sampleapp/linux/SConscript [new file with mode: 0755]
service/scene-manager/sampleapp/linux/fanserver.cpp [new file with mode: 0755]
service/scene-manager/sampleapp/linux/lightserver.cpp [moved from service/things-manager/sampleapp/linux/groupaction/lightserver.cpp with 100% similarity]
service/scene-manager/sampleapp/linux/sceneclient.cpp [new file with mode: 0755]
service/scene-manager/sampleapp/linux/sceneserver.cpp [new file with mode: 0755]
service/scene-manager/src/RemoteScene.cpp [new file with mode: 0644]
service/scene-manager/src/RemoteSceneAction.cpp [new file with mode: 0644]
service/scene-manager/src/RemoteSceneCollection.cpp [new file with mode: 0644]
service/scene-manager/src/RemoteSceneList.cpp [new file with mode: 0644]
service/scene-manager/src/RemoteSceneUtils.h [new file with mode: 0644]
service/scene-manager/src/Scene.cpp [new file with mode: 0755]
service/scene-manager/src/SceneAction.cpp [new file with mode: 0755]
service/scene-manager/src/SceneCollection.cpp [new file with mode: 0755]
service/scene-manager/src/SceneCollectionResource.cpp [new file with mode: 0755]
service/scene-manager/src/SceneCollectionResource.h [new file with mode: 0644]
service/scene-manager/src/SceneCollectionResourceRequestor.cpp [new file with mode: 0644]
service/scene-manager/src/SceneCollectionResourceRequestor.h [new file with mode: 0644]
service/scene-manager/src/SceneCommons.h [new file with mode: 0644]
service/scene-manager/src/SceneList.cpp [new file with mode: 0755]
service/scene-manager/src/SceneListResource.cpp [new file with mode: 0644]
service/scene-manager/src/SceneListResource.h [new file with mode: 0644]
service/scene-manager/src/SceneListResourceRequestor.cpp [new file with mode: 0644]
service/scene-manager/src/SceneListResourceRequestor.h [new file with mode: 0644]
service/scene-manager/src/SceneMemberResource.cpp [new file with mode: 0644]
service/scene-manager/src/SceneMemberResource.h [new file with mode: 0644]
service/scene-manager/src/SceneMemberResourceRequestor.cpp [new file with mode: 0644]
service/scene-manager/src/SceneMemberResourceRequestor.h [new file with mode: 0644]
service/scene-manager/src/SceneUtils.cpp [new file with mode: 0644]
service/scene-manager/unittests/RemoteSceneActionTest.cpp [new file with mode: 0755]
service/scene-manager/unittests/RemoteSceneCollectionTest.cpp [new file with mode: 0644]
service/scene-manager/unittests/RemoteSceneListTest.cpp [new file with mode: 0644]
service/scene-manager/unittests/RemoteSceneTest.cpp [new file with mode: 0644]
service/scene-manager/unittests/SConscript [new file with mode: 0755]
service/scene-manager/unittests/SceneActionTest.cpp [new file with mode: 0755]
service/scene-manager/unittests/SceneCollectionTest.cpp [new file with mode: 0755]
service/scene-manager/unittests/SceneListTest.cpp [new file with mode: 0755]
service/scene-manager/unittests/SceneTest.cpp [new file with mode: 0755]
service/simulator/SConscript
service/simulator/examples/client/simulator_client.cpp
service/simulator/examples/server/simulator_server.cpp
service/simulator/inc/simulator_client_types.h
service/simulator/inc/simulator_collection_resource.h
service/simulator/inc/simulator_error_codes.h
service/simulator/inc/simulator_manager.h
service/simulator/inc/simulator_remote_resource.h
service/simulator/inc/simulator_request_model.h [new file with mode: 0644]
service/simulator/inc/simulator_resource.h
service/simulator/inc/simulator_resource_model.h
service/simulator/inc/simulator_resource_model_schema.h [new file with mode: 0644]
service/simulator/inc/simulator_single_resource.h
service/simulator/inc/simulator_uncopyable.h
service/simulator/java/eclipse-plugin/ClientControllerPlugin/.classpath
service/simulator/java/eclipse-plugin/ClientControllerPlugin/META-INF/MANIFEST.MF
service/simulator/java/eclipse-plugin/ClientControllerPlugin/plugin.xml
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/Activator.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/listener/IVerificationUIListener.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/ImageManager.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/LogManager.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/ResourceManager.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/manager/UiListenerHandler.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/perspective/PerspectiveFactory.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/remoteresource/AttributeElement.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/remoteresource/RemoteResource.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/remoteresource/ResourceRepresentation.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/remoteresource/SerializedClientController.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/utils/AttributeValueBuilder.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/utils/AttributeValueStringConverter.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/utils/Utility.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/AttributeEditingSupport.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/AttributeView.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/LogView.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/MetaPropertiesView.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/MultiResourceOrchestrationView.java [deleted file]
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/ResourceManagerView.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FilterDialog.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FindResourcePage.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/FindResourceWizard.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/GetRequestDialog.java [new file with mode: 0644]
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/LoadRAMLDialog.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/LogDetailsDialog.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/ModelArrayAddItemDialog.java [new file with mode: 0644]
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/PostRequestDialog.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/PutRequestDialog.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/UpdatePrimitiveArrayAttributeDialog.java [new file with mode: 0644]
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/clientcontroller/view/dialogs/VerificationDialog.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LogContentProvider.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LogLabelProvider.java
service/simulator/java/eclipse-plugin/ClientControllerPlugin/src/oic/simulator/logger/LoggerCallback.java
service/simulator/java/eclipse-plugin/README.txt
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/.classpath
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/META-INF/MANIFEST.MF
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/icons/collection_resource.gif [deleted file]
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/icons/device.gif [deleted file]
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LogContentProvider.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LogLabelProvider.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/logger/LoggerCallback.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/Activator.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/Data.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/ImageManager.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/LogManager.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/manager/ResourceManager.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/AttributeElement.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/AttributeHelper.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/AutomationSettingHelper.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/Resource.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/ResourceRepresentation.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/model/SerializedServiceProvider.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/perspective/PerspectiveFactory.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/utils/AttributeValueBuilder.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/utils/AttributeValueStringConverter.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/utils/Constants.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/utils/Utility.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/AttributeEditingSupport.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/AttributeView.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/DevicePlatformInfoView.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/LogView.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/MetaPropertiesView.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/ResourceManagerView.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/ResourceObserverView.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AddAttributeDialog.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AddInterfaceTypeDialog.java [new file with mode: 0644]
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/AutomationSettingDialog.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/CreateResourceWizard.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/DeleteResourcePage.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/DeleteResourceWizard.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/FilterDialog.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/LoadRamlPage.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/LogDetailsDialog.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/MainPage.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/ModelArrayAddItemDialog.java [new file with mode: 0644]
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/ResourceWizardDialog.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceAddAttributePage.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceBasicDetailsPage.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/SimpleResourceOtherDetailsPage.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/UpdateMultiInstanceCreationPropertiesPage.java [new file with mode: 0644]
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/UpdatePrimitiveArrayAttributeDialog.java [new file with mode: 0644]
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/UpdatePropertiesPage.java
service/simulator/java/eclipse-plugin/ServiceProviderPlugin/src/oic/simulator/serviceprovider/view/dialogs/UpdateResourceInterfaceDialog.java
service/simulator/java/jni/jni_listener_holder.h
service/simulator/java/jni/jni_map.cpp [moved from service/simulator/ramlparser/raml/jsonSchemaParser/Helpers.h with 50% similarity, mode: 0644]
service/simulator/java/jni/jni_map.h [moved from service/easy-setup/sampleapp/enrollee/tizen/EnrolleeGUISample/res/ui_controls.edc with 69% similarity]
service/simulator/java/jni/jni_queryparam.cpp
service/simulator/java/jni/jni_queryparam.h
service/simulator/java/jni/jni_string.cpp
service/simulator/java/jni/jni_vector.cpp
service/simulator/java/jni/jni_vector.h
service/simulator/java/jni/simulator_collection_resource_jni.cpp
service/simulator/java/jni/simulator_device_info_jni.cpp
service/simulator/java/jni/simulator_device_info_jni.h
service/simulator/java/jni/simulator_exceptions_jni.cpp
service/simulator/java/jni/simulator_exceptions_jni.h
service/simulator/java/jni/simulator_init_jni.cpp
service/simulator/java/jni/simulator_manager_jni.cpp
service/simulator/java/jni/simulator_platform_info_jni.cpp
service/simulator/java/jni/simulator_platform_info_jni.h
service/simulator/java/jni/simulator_remote_resource_jni.cpp
service/simulator/java/jni/simulator_resource_attribute_jni.cpp [new file with mode: 0644]
service/simulator/java/jni/simulator_resource_attribute_jni.h [new file with mode: 0644]
service/simulator/java/jni/simulator_resource_jni.cpp
service/simulator/java/jni/simulator_resource_model_jni.cpp
service/simulator/java/jni/simulator_resource_model_jni.h
service/simulator/java/jni/simulator_resource_model_schema_jni.cpp [new file with mode: 0644]
service/simulator/java/jni/simulator_resource_model_schema_jni.h [moved from service/easy-setup/sampleapp/enrollee/tizen/Enrolleesample/res/ui_controls.edc with 60% similarity]
service/simulator/java/jni/simulator_resource_utils_jni.cpp
service/simulator/java/jni/simulator_resource_utils_jni.h
service/simulator/java/jni/simulator_single_resource_jni.cpp
service/simulator/java/jni/simulator_utils_jni.cpp
service/simulator/java/jni/simulator_utils_jni.h
service/simulator/java/sdk/src/org/oic/simulator/ArrayProperty.java [new file with mode: 0644]
service/simulator/java/sdk/src/org/oic/simulator/ArrayValueValidator.java [new file with mode: 0644]
service/simulator/java/sdk/src/org/oic/simulator/AttributeProperty.java
service/simulator/java/sdk/src/org/oic/simulator/AttributeValue.java
service/simulator/java/sdk/src/org/oic/simulator/AttributeValueValidation.java [deleted file]
service/simulator/java/sdk/src/org/oic/simulator/AttributeValueVisitor.java
service/simulator/java/sdk/src/org/oic/simulator/BooleanProperty.java [new file with mode: 0644]
service/simulator/java/sdk/src/org/oic/simulator/DeviceListener.java
service/simulator/java/sdk/src/org/oic/simulator/DoubleProperty.java [new file with mode: 0644]
service/simulator/java/sdk/src/org/oic/simulator/DoubleValueValidator.java [new file with mode: 0644]
service/simulator/java/sdk/src/org/oic/simulator/IntegerProperty.java [new file with mode: 0644]
service/simulator/java/sdk/src/org/oic/simulator/IntegerValueValidator.java [new file with mode: 0644]
service/simulator/java/sdk/src/org/oic/simulator/InvalidArgsException.java
service/simulator/java/sdk/src/org/oic/simulator/ModelProperty.java [new file with mode: 0644]
service/simulator/java/sdk/src/org/oic/simulator/ModelValueValidator.java [new file with mode: 0644]
service/simulator/java/sdk/src/org/oic/simulator/NoSupportException.java
service/simulator/java/sdk/src/org/oic/simulator/OperationInProgressException.java
service/simulator/java/sdk/src/org/oic/simulator/PlatformInfo.java
service/simulator/java/sdk/src/org/oic/simulator/PlatformListener.java
service/simulator/java/sdk/src/org/oic/simulator/SimulatorException.java
service/simulator/java/sdk/src/org/oic/simulator/SimulatorManager.java
service/simulator/java/sdk/src/org/oic/simulator/SimulatorResourceAttribute.java
service/simulator/java/sdk/src/org/oic/simulator/SimulatorResourceModel.java
service/simulator/java/sdk/src/org/oic/simulator/SimulatorResult.java
service/simulator/java/sdk/src/org/oic/simulator/StringProperty.java [new file with mode: 0644]
service/simulator/java/sdk/src/org/oic/simulator/StringValueValidator.java [new file with mode: 0644]
service/simulator/java/sdk/src/org/oic/simulator/client/FindResourceListener.java
service/simulator/java/sdk/src/org/oic/simulator/client/SimulatorConnectivityType.java
service/simulator/java/sdk/src/org/oic/simulator/client/SimulatorRemoteResource.java
service/simulator/java/sdk/src/org/oic/simulator/client/SimulatorRequestModel.java [new file with mode: 0644]
service/simulator/java/sdk/src/org/oic/simulator/server/SimulatorCollectionResource.java
service/simulator/java/sdk/src/org/oic/simulator/server/SimulatorResource.java
service/simulator/java/sdk/src/org/oic/simulator/server/SimulatorSingleResource.java
service/simulator/ramlparser/SConscript
service/simulator/ramlparser/raml/IncludeResolver.cpp
service/simulator/ramlparser/raml/IncludeResolver.h
service/simulator/ramlparser/raml/jsonSchemaParser/AllowedValues.h [deleted file]
service/simulator/ramlparser/raml/jsonSchemaParser/Definitions.cpp [new file with mode: 0755]
service/simulator/ramlparser/raml/jsonSchemaParser/Definitions.h
service/simulator/ramlparser/raml/jsonSchemaParser/Items.h [deleted file]
service/simulator/ramlparser/raml/jsonSchemaParser/JsonSchema.cpp
service/simulator/ramlparser/raml/jsonSchemaParser/JsonSchema.h
service/simulator/ramlparser/raml/jsonSchemaParser/Properties.cpp [new file with mode: 0755]
service/simulator/ramlparser/raml/jsonSchemaParser/Properties.h
service/simulator/ramlparser/raml/model/Schema.h
service/simulator/src/client/attribute_generator.cpp [deleted file]
service/simulator/src/client/auto_request_gen_mngr.h [deleted file]
service/simulator/src/client/get_request_generator.cpp
service/simulator/src/client/get_request_generator.h
service/simulator/src/client/post_request_generator.cpp
service/simulator/src/client/post_request_generator.h
service/simulator/src/client/put_request_generator.cpp
service/simulator/src/client/put_request_generator.h
service/simulator/src/client/request_automation_manager.cpp [moved from service/simulator/src/client/auto_request_gen_mngr.cpp with 56% similarity]
service/simulator/src/client/request_automation_manager.h [new file with mode: 0644]
service/simulator/src/client/request_generation.cpp [moved from service/simulator/src/client/auto_request_gen.cpp with 77% similarity]
service/simulator/src/client/request_generation.h [moved from service/simulator/src/client/auto_request_gen.h with 80% similarity]
service/simulator/src/client/request_sender.cpp
service/simulator/src/client/request_sender.h
service/simulator/src/client/simulator_remote_resource_impl.cpp
service/simulator/src/client/simulator_remote_resource_impl.h
service/simulator/src/client/simulator_request_model.cpp [new file with mode: 0644]
service/simulator/src/common/attribute_generator.cpp [new file with mode: 0644]
service/simulator/src/common/attribute_generator.h [moved from service/simulator/src/client/attribute_generator.h with 70% similarity]
service/simulator/src/common/attribute_value_generator.cpp [new file with mode: 0644]
service/simulator/src/common/attribute_value_generator.h [new file with mode: 0644]
service/simulator/src/common/request_model.cpp
service/simulator/src/common/request_model.h
service/simulator/src/common/request_model_builder.cpp
service/simulator/src/common/request_model_builder.h [changed mode: 0644->0755]
service/simulator/src/common/resource_model_schema_builder.cpp [new file with mode: 0644]
service/simulator/src/common/resource_model_schema_builder.h [new file with mode: 0644]
service/simulator/src/common/response_model.cpp
service/simulator/src/common/response_model.h
service/simulator/src/common/simulator_resource_model.cpp
service/simulator/src/common/simulator_resource_model_schema.cpp [new file with mode: 0644]
service/simulator/src/common/simulator_utils.cpp
service/simulator/src/common/simulator_utils.h
service/simulator/src/server/oc_interface_details.cpp [new file with mode: 0644]
service/simulator/src/server/oc_interface_details.h [new file with mode: 0644]
service/simulator/src/server/resource_update_automation.cpp
service/simulator/src/server/resource_update_automation.h
service/simulator/src/server/resource_update_automation_mngr.cpp
service/simulator/src/server/resource_update_automation_mngr.h
service/simulator/src/server/simulator_collection_resource_impl.cpp
service/simulator/src/server/simulator_collection_resource_impl.h
service/simulator/src/server/simulator_resource.cpp [moved from service/simulator/inc/simulator_server_types.h with 61% similarity]
service/simulator/src/server/simulator_resource_factory.cpp
service/simulator/src/server/simulator_resource_factory.h
service/simulator/src/server/simulator_single_resource_impl.cpp
service/simulator/src/server/simulator_single_resource_impl.h
service/simulator/src/simulator_manager.cpp
service/simulator/unittests/SimulatorTest/src/org/oic/simulator/client/test/SimulatorRemoteResourceTest.java
service/simulator/unittests/SimulatorTest/src/org/oic/simulator/server/test/SimulatorCollectionResourceTest.java
service/simulator/unittests/SimulatorTest/src/org/oic/simulator/server/test/SimulatorResourceTest.java
service/simulator/unittests/SimulatorTest/src/org/oic/simulator/server/test/SimulatorSingleResourceTest.java
service/simulator/unittests/SimulatorTest/src/org/oic/simulator/test/ArrayPropertyTest.java [new file with mode: 0644]
service/simulator/unittests/SimulatorTest/src/org/oic/simulator/test/AttributeValueTest.java
service/simulator/unittests/SimulatorTest/src/org/oic/simulator/test/AttributeValueValidationTest.java [deleted file]
service/simulator/unittests/SimulatorTest/src/org/oic/simulator/test/BooleanPropertyTest.java [new file with mode: 0644]
service/simulator/unittests/SimulatorTest/src/org/oic/simulator/test/DoublePropertyTest.java [new file with mode: 0644]
service/simulator/unittests/SimulatorTest/src/org/oic/simulator/test/IntegerPropertyTest.java [new file with mode: 0644]
service/simulator/unittests/SimulatorTest/src/org/oic/simulator/test/ModelPropertyTest.java [new file with mode: 0644]
service/simulator/unittests/SimulatorTest/src/org/oic/simulator/test/SimulatorManagerTest.java
service/simulator/unittests/SimulatorTest/src/org/oic/simulator/test/SimulatorResourceModelTest.java
service/simulator/unittests/SimulatorTest/src/org/oic/simulator/test/StringPropertyTest.java [new file with mode: 0644]
service/things-manager/sampleapp/SConscript
service/things-manager/sampleapp/linux/configuration/SConscript
service/things-manager/sampleapp/linux/groupaction/SConscript [deleted file]
service/things-manager/sampleapp/linux/groupaction/bookmark.cpp [deleted file]
service/things-manager/sampleapp/linux/groupaction/groupserver.cpp [deleted file]
service/things-manager/unittests/SConscript
service/third_party_libs.scons
tools/tizen/.gbs.conf
tools/tizen/iotivity.spec

index e9e1f02..a0884f9 100644 (file)
@@ -1,5 +1,5 @@
 Copyright (c) 2014, 2015 IoTivity
-<http://www.iotivity.com/>
+<http://www.iotivity.org/>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
index 3d81eae..56f5f02 100644 (file)
@@ -202,7 +202,7 @@ Tizen:
     $ scons TARGET_OS=tizen TARGET_TRANSPORT=ALL -c (for clean)
 
 (we provide the spec file required by gbs tool at toools/tizen directory.
-gbs is default build tool for Tizen platfrom, we can refer the following
+gbs is default build tool for Tizen platform, we can refer the following
 wiki to setup Tizen development environment:
 https://source.tizen.org/documentation/developer-guide/getting-started-guide)
 
index 0ebc436..1e8ebfb 100644 (file)
@@ -65,6 +65,9 @@ SConscript(build_dir + 'service/SConscript')
 # Build "plugin interface" sub-project
 SConscript(build_dir + 'plugins/SConscript')
 
+# Build "cloud" sub-project
+SConscript(build_dir + 'cloud/SConscript')
+
 # Append targets information to the help information, to see help info, execute command line:
 #     $ scon [options] -h
 env.PrintTargets()
index 4ba4b8b..38e174e 100755 (executable)
@@ -1,23 +1,23 @@
 /*\r
- * //******************************************************************\r
- * //\r
- * // Copyright 2015 Intel Corporation.\r
- * //\r
- * //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
- * //\r
- * // Licensed under the Apache License, Version 2.0 (the "License");\r
- * // you may not use this file except in compliance with the License.\r
- * // You may obtain a copy of the License at\r
- * //\r
- * //      http://www.apache.org/licenses/LICENSE-2.0\r
- * //\r
- * // Unless required by applicable law or agreed to in writing, software\r
- * // distributed under the License is distributed on an "AS IS" BASIS,\r
- * // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * // See the License for the specific language governing permissions and\r
- * // limitations under the License.\r
- * //\r
- * //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
+ *******************************************************************\r
+ *\r
+ * Copyright 2015 Intel Corporation.\r
+ *\r
+ *-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ *\r
+ *-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
  */\r
 \r
 apply plugin: 'com.android.library'\r
index 0381ca4..0bc2d5e 100644 (file)
@@ -1,6 +1,6 @@
 LOCAL_PATH := $(call my-dir)\r
 TARGET_ARCH_ABI := $(APP_ABI)\r
-SECURED := $(SECURE)
+SECURED := $(SECURE)\r
 \r
 include $(CLEAR_VARS)\r
 OIC_LIB_PATH := ../../../../out/android/$(APP_ABI)/$(APP_OPTIM)\r
@@ -26,20 +26,20 @@ LOCAL_MODULE := libandroid-ca
 LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libconnectivity_abstraction.so\r
 include $(PREBUILT_SHARED_LIBRARY)\r
 \r
-ifeq ($(SECURED), 1)
-include $(CLEAR_VARS)
-OIC_LIB_PATH := ../../../../out/android/$(APP_ABI)/$(APP_OPTIM)
-LOCAL_MODULE := libandroid-ocprovision
-LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libocprovision.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-OIC_LIB_PATH := ../../../../out/android/$(APP_ABI)/$(APP_OPTIM)
-LOCAL_MODULE := libandroid-ocpmapi
-LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libocpmapi.so
-include $(PREBUILT_SHARED_LIBRARY)
-endif
-
+ifeq ($(SECURED), 1)\r
+include $(CLEAR_VARS)\r
+OIC_LIB_PATH := ../../../../out/android/$(APP_ABI)/$(APP_OPTIM)\r
+LOCAL_MODULE := libandroid-ocprovision\r
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libocprovision.so\r
+include $(PREBUILT_SHARED_LIBRARY)\r
+\r
+include $(CLEAR_VARS)\r
+OIC_LIB_PATH := ../../../../out/android/$(APP_ABI)/$(APP_OPTIM)\r
+LOCAL_MODULE := libandroid-ocpmapi\r
+LOCAL_SRC_FILES := $(OIC_LIB_PATH)/libocpmapi.so\r
+include $(PREBUILT_SHARED_LIBRARY)\r
+endif\r
+\r
 include $(CLEAR_VARS)\r
 OIC_SRC_PATH := ../../../resource\r
 LOCAL_MODULE := libca-interface\r
@@ -73,16 +73,16 @@ LOCAL_SRC_FILES :=  JniOcStack.cpp \
                     JniOcResourceResponse.cpp \\r
                     JniOcPlatform.cpp \\r
                     JniOcResource.cpp \\r
-                    JniOcResourceIdentifier.cpp \
-                    JniOcSecurity.cpp
-ifeq ($(SECURED), 1)
-LOCAL_SRC_FILES +=  JniOcSecureResource.cpp \
-                    JniOcProvisioning.cpp \
-                    JniSecureUtils.cpp \
-                    JniProvisionResultListner.cpp \
-                    JniPinCheckListener.cpp \
-                    JniDisplayPinListener.cpp
-endif
+                    JniOcResourceIdentifier.cpp \\r
+                    JniOcSecurity.cpp\r
+ifeq ($(SECURED), 1)\r
+LOCAL_SRC_FILES +=  JniOcSecureResource.cpp \\r
+                    JniOcProvisioning.cpp \\r
+                    JniSecureUtils.cpp \\r
+                    JniProvisionResultListner.cpp \\r
+                    JniPinCheckListener.cpp \\r
+                    JniDisplayPinListener.cpp\r
+endif\r
 \r
 LOCAL_LDLIBS := -llog\r
 LOCAL_STATIC_LIBRARIES := android-oc\r
@@ -91,24 +91,24 @@ LOCAL_STATIC_LIBRARIES += android-coap
 LOCAL_STATIC_LIBRARIES += android-oc_logger\r
 LOCAL_STATIC_LIBRARIES += android-ca\r
 LOCAL_STATIC_LIBRARIES += android_cpp11_compat\r
-ifeq ($(SECURED), 1)
-LOCAL_STATIC_LIBRARIES += android-ocprovision
-LOCAL_STATIC_LIBRARIES += android-ocpmapi
-endif
+ifeq ($(SECURED), 1)\r
+LOCAL_STATIC_LIBRARIES += android-ocprovision\r
+LOCAL_STATIC_LIBRARIES += android-ocpmapi\r
+endif\r
 \r
 LOCAL_CPPFLAGS += -std=c++0x\r
 LOCAL_CPP_FEATURES := rtti exceptions\r
 LOCAL_C_INCLUDES := $(OIC_SRC_PATH)/include\r
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/c_common\r
-LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/c_common/oic_string/include
-LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/c_common/oic_malloc/include
+LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/c_common/oic_string/include\r
+LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/c_common/oic_malloc/include\r
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/stack/include\r
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/ocsocket/include\r
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/oc_logger/include\r
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../extlibs/boost/boost_1_58_0\r
 LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/../build_common/android/compatibility\r
-LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include
-LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include/oxm/
-LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include/internal
-LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/include
+LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include\r
+LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include/oxm/\r
+LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/provisioning/include/internal\r
+LOCAL_C_INCLUDES += $(OIC_SRC_PATH)/csdk/security/include\r
 include $(BUILD_SHARED_LIBRARY)\r
index b9e12ce..d641f3d 100644 (file)
 #include <stdio.h>
 #include "cainterface.h"
 #include "JniCaInterface.h"
+#include "cautilinterface.h"
+#include "cacommon.h"
 
 #define  LOG_TAG   "JNI_CA_INTERFACE"
 #define  LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
 #define  LOGE(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
 
+static jobject g_foundDeviceListenerObject = NULL;
+static jobject g_listenerObject = NULL;
+static JavaVM *g_jvm = NULL;
+
 JNIEXPORT jint JNI_OnLoad(JavaVM *jvm, void *reserved)
 {
     LOGI("CaInterface_initialize");
+    g_jvm = jvm;
     CANativeJNISetJavaVM(jvm);
 
     return JNI_VERSION_1_6;
@@ -51,4 +58,274 @@ Java_org_iotivity_ca_CaInterface_initialize
 
     CANativeSetActivity(env, activity);
     CANativeJNISetContext(env, context);
-}
\ No newline at end of file
+}
+
+void CAManagerConnectionStateChangedCB(CATransportAdapter_t adapter,
+                                       const char *remote_address,
+                                       bool connected)
+{
+    LOGI("Callback - CAManagerConnectionStateChangedCB : type(%d), address(%s), connected(%d)",
+         adapter, remote_address, connected);
+
+    if (!g_listenerObject)
+    {
+        LOGE("g_listener is NULL, cannot have callback");
+        return;
+    }
+
+    bool isAttached = false;
+    JNIEnv* env;
+    jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
+    if (JNI_OK != res)
+    {
+        LOGI("AttachCurrentThread will be called for JNIEnv pointer");
+        res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL);
+
+        if (JNI_OK != res)
+        {
+            LOGE("AttachCurrentThread has failed");
+            return;
+        }
+        isAttached = true;
+    }
+
+    jclass jni_cls_listener = (*env)->GetObjectClass(env, g_listenerObject);
+    if (!jni_cls_listener)
+    {
+        LOGE("could not get jni_cls_listener");
+        goto exit_error;
+    }
+
+    jmethodID jni_mid_listener = (*env)->GetMethodID(env, jni_cls_listener,
+                                                     "onConnectionStateChanged",
+                                                     "(Lorg/iotivity/base/OcConnectivityType;"
+                                                     "Ljava/lang/String;Z)V");
+    if (!jni_mid_listener)
+    {
+        LOGE("could not get Method ID");
+        goto exit_error;
+    }
+
+    jstring jni_address = (*env)->NewStringUTF(env, remote_address);
+    if (!jni_address)
+    {
+        LOGE("jni_address is null");
+        goto exit_error;
+    }
+
+    jclass jni_cls_enum = (*env)->FindClass(env, "org/iotivity/base/OcConnectivityType");
+    if (!jni_cls_enum)
+    {
+        LOGE("could not get jni_cls_enum");
+        goto exit_error;
+    }
+
+    jmethodID jni_mid_enum = (*env)->GetStaticMethodID(env, jni_cls_enum, "getInstance",
+                                                       "(I)Lorg/iotivity/base/OcConnectivityType;");
+    if (!jni_mid_enum)
+    {
+        LOGE("could not get Method ID (getInstance)");
+        goto exit_error;
+    }
+
+    jobject jni_adaptertype = (*env)->CallStaticObjectMethod(env, jni_cls_enum,
+                                                             jni_mid_enum, adapter);
+    (*env)->CallVoidMethod(env, g_listenerObject, jni_mid_listener,
+                           jni_adaptertype, jni_address,
+                           (jboolean)connected);
+
+exit_error:
+    if (isAttached)
+    {
+        (*g_jvm)->DetachCurrentThread(g_jvm);
+    }
+
+    LOGI("OUT - CAManagerConnectionStateChangedCB");
+}
+
+void CAManagerAdapterStateChangedCB(CATransportAdapter_t adapter, bool enabled)
+{
+    LOGI("Callback - CAManagerAdapterStateChangedCB : type(%d), enabled(%d)",
+         adapter, enabled);
+
+    if (!g_listenerObject)
+    {
+        LOGE("g_listener is NULL, cannot have callback");
+        return;
+    }
+
+    bool isAttached = false;
+    JNIEnv* env;
+    jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
+    if (JNI_OK != res)
+    {
+        LOGI("AttachCurrentThread will be called for JNIEnv pointer");
+        res = (*g_jvm)->AttachCurrentThread(g_jvm, &env, NULL);
+
+        if (JNI_OK != res)
+        {
+            LOGE("AttachCurrentThread has failed");
+            return;
+        }
+        isAttached = true;
+    }
+
+    jclass jni_cls_listener = (*env)->GetObjectClass(env, g_listenerObject);
+    if (!jni_cls_listener)
+    {
+        LOGE("could not get jni_cls_listener");
+        goto exit_error;
+    }
+
+    jmethodID jni_mid_listener = (*env)->GetMethodID(env, jni_cls_listener,
+                                                     "onAdapterStateChanged",
+                                                     "(Lorg/iotivity/base/OcConnectivityType;Z)V");
+    if (!jni_mid_listener)
+    {
+        LOGE("could not get Method ID");
+        goto exit_error;
+    }
+
+    jclass jni_cls_enum = (*env)->FindClass(env, "org/iotivity/base/OcConnectivityType");
+    if (!jni_cls_enum)
+    {
+        LOGE("could not get jni_cls_enum");
+        goto exit_error;
+    }
+
+    jmethodID jni_mid_enum = (*env)->GetStaticMethodID(env, jni_cls_enum, "getInstance",
+                                                       "(I)Lorg/iotivity/base/OcConnectivityType;");
+    if (!jni_mid_enum)
+    {
+        LOGE("could not get Method ID (getInstance)");
+        goto exit_error;
+    }
+
+    jobject jni_adaptertype = (*env)->CallStaticObjectMethod(env, jni_cls_enum,
+                                                             jni_mid_enum, adapter);
+
+    (*env)->CallVoidMethod(env, g_listenerObject, jni_mid_listener,
+                           jni_adaptertype, (jboolean)enabled);
+
+exit_error:
+    if (isAttached)
+    {
+        (*g_jvm)->DetachCurrentThread(g_jvm);
+    }
+    LOGI("OUT -  CAManagerAdapterStateChangedCB");
+}
+
+JNIEXPORT void JNICALL
+Java_org_iotivity_ca_CaInterface_caManagerInitialize(JNIEnv *env, jclass clazz,
+                                                     jobject context, jobject listener)
+{
+    LOGI("CaManagere_initialize");
+
+    CAUtilClientInitialize(env, g_jvm, context);
+
+    g_listenerObject = (*env)->NewGlobalRef(env, listener);
+
+    CARegisterNetworkMonitorHandler(CAManagerAdapterStateChangedCB,
+                                    CAManagerConnectionStateChangedCB);
+}
+
+JNIEXPORT void JNICALL
+Java_org_iotivity_ca_CaInterface_caManagerTerminate(JNIEnv *env, jclass clazz)
+{
+    LOGI("CaManager_terminate");
+
+    CAUtilClientTerminate(env);
+
+    if (g_listenerObject)
+    {
+        (*env)->DeleteGlobalRef(env, g_listenerObject);
+        g_listenerObject = NULL;
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_org_iotivity_ca_CaInterface_caManagerSetAutoConnectionDeviceInfo(JNIEnv *env,
+                                                                      jclass clazz,
+                                                                      jstring jaddress)
+{
+    LOGI("CaManager_setAutoConnectionDeviceInfo");
+
+    const char* address = (*env)->GetStringUTFChars(env, jaddress, NULL);
+    if (!address)
+    {
+        LOGE("address is null");
+        return;
+    }
+
+    CASetAutoConnectionDeviceInfo(address);
+
+    (*env)->ReleaseStringUTFChars(env, jaddress, address);
+}
+
+JNIEXPORT void JNICALL
+Java_org_iotivity_ca_CaInterface_caManagerUnsetAutoConnectionDeviceInfo(JNIEnv *env,
+                                                                        jclass clazz,
+                                                                        jstring jaddress)
+{
+    LOGI("CaManager_unsetAutoConnectionDeviceInfo");
+
+    const char* address = (*env)->GetStringUTFChars(env, jaddress, NULL);
+    if (!address)
+    {
+        LOGE("address is null");
+        return;
+    }
+
+    CAUnsetAutoConnectionDeviceInfo(address);
+
+    (*env)->ReleaseStringUTFChars(env, jaddress, address);
+}
+
+JNIEXPORT void JNICALL
+Java_org_iotivity_ca_CaInterface_caBtPairingInitialize(JNIEnv *env, jclass clazz,
+                                                       jobject context, jobject listener)
+{
+    LOGI("caBtPairingInitialize");
+    (void)clazz;
+
+    CAUtilClientInitialize(env, g_jvm, context);
+
+    g_foundDeviceListenerObject = (*env)->NewGlobalRef(env, listener);
+    CAUtilSetFoundDeviceListener(g_foundDeviceListenerObject);
+}
+
+JNIEXPORT void JNICALL
+Java_org_iotivity_ca_CaInterface_caBtPairingTerminate(JNIEnv *env, jclass clazz)
+{
+    LOGI("caBtPairingTerminate");
+    (void)clazz;
+
+    if (g_foundDeviceListenerObject)
+    {
+        (*env)->DeleteGlobalRef(env, g_foundDeviceListenerObject);
+    }
+}
+
+JNIEXPORT void JNICALL
+Java_org_iotivity_ca_CaInterface_caBtPairingStartScan(JNIEnv *env, jclass clazz)
+{
+    LOGI("caBtPairingStartScan");
+    (void)clazz;
+    CAUtilStartScan(env);
+}
+
+JNIEXPORT void JNICALL
+Java_org_iotivity_ca_CaInterface_caBtPairingStopScan(JNIEnv *env, jclass clazz)
+{
+    LOGI("caBtPairingStopScan");
+    (void)clazz;
+    CAUtilStopScan(env);
+}
+
+JNIEXPORT void JNICALL
+Java_org_iotivity_ca_CaInterface_caBtPairingCreateBond(JNIEnv *env, jclass clazz, jobject device)
+{
+    LOGI("caBtPairingCreateBond");
+    (void)clazz;
+    CAUtilCreateBond(env, device);
+}