review.tizen.org Git - platform/upstream/iotivity.git/commit

projects / platform / upstream / iotivity.git / commit

author	YounghyunJoo <yh_.joo@samsung.com>
	Thu, 21 May 2015 01:52:54 +0000 (10:52 +0900)
committer	Madan Lanka <lanka.madan@samsung.com>
	Thu, 21 May 2015 02:42:04 +0000 (02:42 +0000)
commit	00edd72ebece46be81e947afca414e72fc1acd27
tree	3e88ca582ffb6284fdafe117db08b7ea627c6f4b	tree \| snapshot
parent	28360f5e37ed965ac4eebc646bea9e723f395312	commit \| diff

Android Protocol Plugin Manager API merge from android-api branch to master

Merge anroid-api branch ppm codes to master branch

Change-Id: I41f35246bcb9d2728d112a719fb19f482c157df7
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1049
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

79 files changed:

build_common/android/SConscript		diff \| blob \| history
extlibs/expat/SConscript		diff \| blob \| history
service/protocol-plugin/SConscript		diff \| blob \| history
service/protocol-plugin/plugin-manager/SConscript		diff \| blob \| history
service/protocol-plugin/plugin-manager/src/Android/.classpath	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/.project	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/AndroidManifest.xml	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/assets/files/pluginmanager.xml	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/ic_launcher-web.png	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/jni/Android.mk	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/jni/Application.mk	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/jni/PluginManager.cpp	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/jni/PluginManager.h	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/jni/SConscript	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/lint.xml	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/proguard-project.txt	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/project.properties	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/res/drawable-hdpi/ic_launcher.png	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/res/drawable-mdpi/ic_launcher.png	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/res/drawable-xhdpi/ic_launcher.png	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/res/drawable-xxhdpi/ic_launcher.png	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/res/layout/activity_main.xml	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/res/layout/fragment_main.xml	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/res/menu/main.xml	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/res/values-v11/styles.xml	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/res/values-v14/styles.xml	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/res/values-w820dp/dimens.xml	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/res/values/dimens.xml	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/res/values/strings.xml	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/res/values/styles.xml	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/FelixManager.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/FoundResource.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/MainActivity.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/OnGetBelkinplug.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/OnGetGear.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/OnGetHuebulb.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/OnPutBelkinplug.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/OnPutGear.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/OnPutHuebulb.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/Plugin.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Android/src/org/iotivity/service/ppm/PluginManager.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugin-manager/src/Config.cpp		diff \| blob \| history
service/protocol-plugin/plugin-manager/src/Config.h		diff \| blob \| history
service/protocol-plugin/plugin-manager/src/CpluffAdapter.cpp		diff \| blob \| history
service/protocol-plugin/plugin-manager/src/CpluffAdapter.h		diff \| blob \| history
service/protocol-plugin/plugin-manager/src/FelixAdapter.cpp		diff \| blob \| history
service/protocol-plugin/plugin-manager/src/PluginManagerImpl.cpp		diff \| blob \| history
service/protocol-plugin/plugin-manager/src/PluginManagerImpl.h		diff \| blob \| history
service/protocol-plugin/plugin-manager/src/pluginmanager.xml	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.gear.noti/.classpath	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.gear.noti/META-INF/MANIFEST.MF	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.gear.noti/build.properties	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.gear.noti/lib/gson.jar	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.gear.noti/lib/richnotification.jar	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.gear.noti/lib/sdk.jar	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.gear.noti/src/oic/plugin/gear/noti/Activator.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.gear.noti/src/oic/plugin/gear/noti/EntityHandlerNoti.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.gear.noti/src/oic/plugin/gear/noti/IExample.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.gear.noti/src/oic/plugin/gear/noti/SmallHeaderExample.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.hue/.classpath	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.hue/META-INF/MANIFEST.MF	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.hue/build.properties	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.hue/lib/huelocalsdk.jar	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.hue/lib/huesdkresources.jar	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.hue/src/oic/plugin/hue/AccessPointListAdapter.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.hue/src/oic/plugin/hue/Activator.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.hue/src/oic/plugin/hue/EntityHandlerHue.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.hue/src/oic/plugin/hue/HueSharedPreferences.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.wemo/.classpath	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.wemo/META-INF/MANIFEST.MF	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.wemo/build.properties	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.wemo/lib/wemosdk.jar	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.wemo/src/oic/plugin/wemo/Activator.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/Android/plugin.wemo/src/oic/plugin/wemo/EntityHandlerWemo.java	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/mqtt-fan/lib/config.mk	[new file with mode: 0644]	blob
service/protocol-plugin/plugins/mqtt-light/lib/config.mk	[new file with mode: 0644]	blob
service/protocol-plugin/sample-app/SConscript		diff \| blob \| history
service/protocol-plugin/sample-app/linux/mqtt/mqttclient.cpp		diff \| blob \| history
service/protocol-plugin/sample-app/tizen/PPMSampleApp/src/ppmsampleapp.cpp		diff \| blob \| history

Domain: Network & Connectivity / IoT Connectivity;

RSS Atom