projects / contrib / iotivity.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a16e6fa) | patch
Merging primitive services(TM, SSM and NM) from android-api branch.
authorJay Sharma <jay.sharma@samsung.com>
Wed, 20 May 2015 14:42:15 +0000 (20:12 +0530)
committerUze Choi <uzchoi@samsung.com>
Wed, 20 May 2015 15:02:40 +0000 (15:02 +0000)
commitc9f704c82ae7686bc6826d72e2f48b9ed12523d0
treece649d3738900b4e8eca23adea2145779908adb2tree | snapshot
parenta16e6faa29c0bf20a2bf437a96a79acc1f44433acommit | diff
Merging primitive services(TM, SSM and NM) from android-api branch.

Change-Id: Ic94647509c50a44265dca63509f0883e99173f59
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1036
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
160 files changed:
SConstruct diff | blob | history
build_common/SConscript diff | blob | history
build_common/android/compatibility/android_cpp11_compat.cpp diff | blob | history
build_common/android/compatibility/android_cpp11_compat.h diff | blob | history
build_common/external_libs.scons diff | blob | history
resource/csdk/stack/include/ocstack.h diff | blob | history
service/SConscript diff | blob | history
service/notification-manager/NotificationManager/src/resourceCoordinator_JNI.cpp [new file with mode: 0644] blob
service/notification-manager/NotificationManager/src/resourceCoordinator_JNI.h [new file with mode: 0644] blob
service/notification-manager/SConscript diff | blob | history
service/notification-manager/SampleApp/android/ResourceHostingSampleApp/.classpath [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/ResourceHostingSampleApp/.project [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/ResourceHostingSampleApp/AndroidManifest.xml [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/ResourceHostingSampleApp/ic_launcher-web.png [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/ResourceHostingSampleApp/jni/Android.mk [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/ResourceHostingSampleApp/jni/Application.mk [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/ResourceHostingSampleApp/jni/armeabi [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/ResourceHostingSampleApp/project.properties [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/ResourceHostingSampleApp/src/com/example/resourcehostingsampleapp/ResourceHosting.java [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleConsumer/.classpath [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleConsumer/.project [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleConsumer/AndroidManifest.xml [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleConsumer/project.properties [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleConsumer/res/layout/sampleconsumer_layout.xml [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleConsumer/res/values/strings.xml [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleConsumer/src/com/example/sample/consumer/SampleConsumer.java [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleProviderApp/.classpath [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleProviderApp/.project [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleProviderApp/AndroidManifest.xml [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleProviderApp/jni/Android.mk [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleProviderApp/jni/Application.mk [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleProviderApp/project.properties [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleProviderApp/res/layout/sampleprovider_layout.xml [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleProviderApp/res/values/strings.xml [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleProviderApp/src/com/example/sample/provider/IMessageLogger.java [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleProviderApp/src/com/example/sample/provider/SampleProvider.java [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleProviderApp/src/com/example/sample/provider/StringConstants.java [new file with mode: 0644] blob
service/notification-manager/SampleApp/android/SampleProviderApp/src/com/example/sample/provider/TemperatureResource.java [new file with mode: 0644] blob
service/notification-manager/SampleApp/linux/SConscript diff | blob | history
service/notification-manager/SampleApp/linux/sampleConsumer/SampleConsumer.cpp diff | blob | history
service/notification-manager/SampleApp/tizen/NMSampleApp/src/main.cpp diff | blob | history
service/notification-manager/SampleApp/tizen/NMSampleApp/src/nmsampleapp.cpp diff | blob | history
service/notification-manager/SampleApp/tizen/sampleConsumer/src/oicapp-client.cpp diff | blob | history
service/notification-manager/SampleApp/tizen/sampleConsumer/src/oicapp-sampleConsumer.c diff | blob | history
service/protocol-plugin/sample-app/linux/mqtt/mqttclient.cpp diff | blob | history
service/soft-sensor-manager/SConscript diff | blob | history
service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/CoreController.java diff | blob | history
service/soft-sensor-manager/SSMCore/src/SensorProcessor/ResourceFinder.cpp diff | blob | history
service/soft-sensor-manager/SampleApp/android/SSMTesterApp/src/org/iotivity/service/ssm/sample/MainActivity.java diff | blob | history
service/soft-sensor-manager/SampleApp/arduino/Reference_Thing/src/bleLib.cpp diff | blob | history
service/soft-sensor-manager/SampleApp/linux/HeightSensorApp/src/HeightSensorApp.cpp diff | blob | history
service/soft-sensor-manager/SampleApp/linux/SSMTesterApp/src/SSMTestApp.cpp diff | blob | history
service/soft-sensor-manager/SampleApp/linux/THSensorApp/src/ThingResourceServer.cpp diff | blob | history
service/soft-sensor-manager/SampleApp/linux/THSensorApp1/src/ThingResourceServer1.cpp diff | blob | history
service/soft-sensor-manager/SampleApp/linux/WeightSensorApp/src/WeightSensorApp.cpp diff | blob | history
service/things-manager/SConscript diff | blob | history
service/things-manager/sampleapp/android/Sample/.classpath [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/.project [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/AndroidManifest.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/ic_launcher-web.png [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/project.properties [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/drawable-hdpi/ic_launcher.png [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/drawable-hdpi/iot.jpg [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/drawable-mdpi/ic_launcher.png [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/drawable-xhdpi/ic_launcher.png [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/drawable-xxhdpi/ic_launcher.png [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/layout/activity_main.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/layout/configapis.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/layout/custom_dialog.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/layout/groupapis.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/layout/userinputforregionvalue.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/menu/main.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/values-v11/styles.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/values-v14/styles.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/values-w820dp/dimens.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/values/dimens.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/values/strings.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/res/values/styles.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ActionListener.java [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ConfigurationApiActivity.java [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/src/com/tm/sample/ConfigurationListener.java [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/src/com/tm/sample/DiagnosticListener.java [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/src/com/tm/sample/GroupApiActivity.java [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/src/com/tm/sample/GroupClient.java [new file with mode: 0644] blob
service/things-manager/sampleapp/android/Sample/src/com/tm/sample/MainActivity.java [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/.classpath [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/.project [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/AndroidManifest.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/ic_launcher-web.png [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/project.properties [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/res/drawable-hdpi/ic_launcher.png [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/res/drawable-mdpi/ic_launcher.png [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/res/drawable-xhdpi/ic_launcher.png [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/res/drawable-xxhdpi/ic_launcher.png [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/res/layout/activity_main.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/res/menu/main.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/res/values-v11/styles.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/res/values-v14/styles.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/res/values-w820dp/dimens.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/res/values/dimens.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/res/values/strings.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/res/values/styles.xml [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/src/com/example/con_server/ConfigurationResource.java [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/src/com/example/con_server/ConfigurationServer.java [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/src/com/example/con_server/DiagnosticsResource.java [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/src/com/example/con_server/FactorySetResource.java [new file with mode: 0644] blob
service/things-manager/sampleapp/android/con-server/src/com/example/con_server/MainActivity.java [new file with mode: 0644] blob
service/things-manager/sampleapp/linux/configuration/con-client.cpp diff | blob | history
service/things-manager/sampleapp/linux/configuration/con-server.cpp diff | blob | history
service/things-manager/sampleapp/linux/groupaction/bookmark.cpp diff | blob | history
service/things-manager/sampleapp/linux/groupaction/groupserver.cpp diff | blob | history
service/things-manager/sampleapp/linux/groupsyncaction/group.cpp diff | blob | history
service/things-manager/sampleapp/linux/groupsyncaction/musicplayer.cpp diff | blob | history
service/things-manager/sampleapp/linux/groupsyncaction/phone.cpp diff | blob | history
service/things-manager/sampleapp/linux/groupsyncaction/speaker.cpp diff | blob | history
service/things-manager/sampleapp/tizen/ConServerApp/src/conserverapp.cpp diff | blob | history
service/things-manager/sampleapp/tizen/TMSampleApp/src/group.cpp diff | blob | history
service/things-manager/sampleapp/tizen/TMSampleApp/src/tmsampleapp.cpp diff | blob | history
service/things-manager/sdk/java/AndroidManifest.xml [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/Android.mk [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/Application.mk [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/SConscript [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/jniutil/inc/jni_getter.h [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/jniutil/inc/jni_object.h [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/jniutil/inc/jni_setter.h [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/jniutil/inc/jni_string.h [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/jniutil/inc/jni_things_manager_jvm.h [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/jniutil/src/jni_getter.cpp [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/jniutil/src/jni_object.cpp [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/jniutil/src/jni_setter.cpp [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/jniutil/src/jni_string.cpp [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/jniutil/src/jni_things_manager_jvm.cpp [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/tm/inc/jni_action.h [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/tm/inc/jni_action_set.h [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/tm/inc/jni_capability.h [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/tm/inc/jni_things_manager.h [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/tm/inc/jni_things_manager_callbacks.h [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/tm/inc/jni_things_manager_util.h [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/tm/src/jni_action.cpp [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/tm/src/jni_action_set.cpp [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/tm/src/jni_capability.cpp [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/tm/src/jni_things_manager.cpp [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/tm/src/jni_things_manager_callbacks.cpp [new file with mode: 0644] blob
service/things-manager/sdk/java/jni/tm/src/jni_things_manager_util.cpp [new file with mode: 0644] blob
service/things-manager/sdk/java/project.properties [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/Action.java [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/ActionSet.java [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/Capability.java [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/IActionListener.java [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/IConfigurationListener.java [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/IDiagnosticsListener.java [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/IFindCandidateResourceListener.java [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/IFindGroupListener.java [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/ISubscribePresenceListener.java [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/OCStackResult.java [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/ThingsManager.java [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/ThingsManagerCallback.java [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/ThingsManagerInterface.java [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/ThingsManagerNativeInterface.java [new file with mode: 0644] blob
service/things-manager/sdk/java/src/org/iotivity/service/tm/Time.java [new file with mode: 0644] blob
Domain: SCM / Uncategorized;