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

projects / platform / upstream / iotivity.git / commit

author	Sudarshan Prasad <sudarshan.prasad@intel.com>
	Tue, 23 Dec 2014 22:49:30 +0000 (14:49 -0800)
committer	Sudarshan Prasad <sudarshan.prasad@intel.com>
	Tue, 23 Dec 2014 22:49:30 +0000 (14:49 -0800)
commit	36154a01af605d6ffa16cbfade44bf1d745f9f77
tree	aebe89beab2f679d076dac26680fa7aa78b19d96	tree \| snapshot
parent	59783cd3fa4de855ae9b972d02998e6bada01f2d	commit \| diff

Merge from master to connectivity-abstraction branch

Change-Id: Ib27785b3f8681b37885a94e608650eed871f9051
Signed-off-by: Sudarshan Prasad <sudarshan.prasad@intel.com>

234 files changed:

.gitignore		diff \| blob \| history
SConstruct		diff \| blob \| history
build_common/SConscript		diff \| blob \| history
build_common/arduino/SConscript	[changed mode: 0755->0644]	blob \| history
resource/csdk/SConscript		diff \| blob \| history
resource/csdk/connectivity/common/src/logger.c		diff \| blob \| history
resource/csdk/connectivity/lib/libcoap-4.1.1/examples/tiny.c		diff \| blob \| history
resource/csdk/libcoap-4.1.1/examples/tiny.c		diff \| blob \| history
resource/csdk/libcoap-4.1.1/net.c		diff \| blob \| history
resource/csdk/libcoap-4.1.1/sec/netdtls.c		diff \| blob \| history
resource/csdk/logger/src/logger.c		diff \| blob \| history
resource/csdk/logger/test/loggertests.cpp		diff \| blob \| history
resource/csdk/makefile		diff \| blob \| history
resource/csdk/occoap/include/occoaphelper.h		diff \| blob \| history
resource/csdk/occoap/src/occoap.c		diff \| blob \| history
resource/csdk/occoap/src/occoaphelper.c		diff \| blob \| history
resource/csdk/ocsocket/src/ocsocket.c		diff \| blob \| history
resource/csdk/ocsocket/src/ocsocket_arduino.cpp		diff \| blob \| history
resource/csdk/ocsocket/src/ocsocket_arduino_wifi.cpp		diff \| blob \| history
resource/csdk/stack/include/internal/ocresource.h		diff \| blob \| history
resource/csdk/stack/include/internal/ocresourcehandler.h		diff \| blob \| history
resource/csdk/stack/include/internal/oicgroup.h	[new file with mode: 0644]	blob
resource/csdk/stack/include/ocstack.h		diff \| blob \| history
resource/csdk/stack/include/ocstackconfig.h		diff \| blob \| history
resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp		diff \| blob \| history
resource/csdk/stack/samples/linux/SimpleClientServer/occlient.h		diff \| blob \| history
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp		diff \| blob \| history
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.h		diff \| blob \| history
resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp		diff \| blob \| history
resource/csdk/stack/src/occollection.c		diff \| blob \| history
resource/csdk/stack/src/ocobserve.c		diff \| blob \| history
resource/csdk/stack/src/ocresource.c		diff \| blob \| history
resource/csdk/stack/src/ocserverrequest.c		diff \| blob \| history
resource/csdk/stack/src/ocstack.c		diff \| blob \| history
resource/csdk/stack/src/oicgroup.c	[new file with mode: 0644]	blob
resource/examples/SConscript		diff \| blob \| history
resource/examples/devicediscoveryclient.cpp	[new file with mode: 0644]	blob
resource/examples/devicediscoveryserver.cpp	[new file with mode: 0644]	blob
resource/examples/groupclient.cpp	[new file with mode: 0755]	blob
resource/examples/groupserver.cpp	[new file with mode: 0755]	blob
resource/examples/lightserver.cpp	[new file with mode: 0755]	blob
resource/examples/makefile	[changed mode: 0644->0755]	diff \| blob \| history
resource/examples/presenceclient.cpp		diff \| blob \| history
resource/examples/presenceserver.cpp		diff \| blob \| history
resource/include/IClientWrapper.h		diff \| blob \| history
resource/include/IServerWrapper.h		diff \| blob \| history
resource/include/InProcClientWrapper.h		diff \| blob \| history
resource/include/InProcServerWrapper.h		diff \| blob \| history
resource/include/OCApi.h		diff \| blob \| history
resource/include/OCPlatform.h		diff \| blob \| history
resource/include/OCPlatform_impl.h		diff \| blob \| history
resource/include/OCResourceRequest.h		diff \| blob \| history
resource/include/OutOfProcClientWrapper.h		diff \| blob \| history
resource/include/OutOfProcServerWrapper.h		diff \| blob \| history
resource/include/StringConstants.h		diff \| blob \| history
resource/releaseNotes/Dec20th2014.txt	[new file with mode: 0644]	blob
resource/src/InProcClientWrapper.cpp		diff \| blob \| history
resource/src/InProcServerWrapper.cpp		diff \| blob \| history
resource/src/OCException.cpp		diff \| blob \| history
resource/src/OCPlatform.cpp		diff \| blob \| history
resource/src/OCPlatform_impl.cpp		diff \| blob \| history
resource/src/OCRepresentation.cpp		diff \| blob \| history
resource/src/OCUtilities.cpp		diff \| blob \| history
resource/third_party_libs.scons		diff \| blob \| history
resource/unittests/README		diff \| blob \| history
resource/unittests/makefile		diff \| blob \| history
service/SConscript		diff \| blob \| history
service/docs/Control Manager-Programmer's guide.pdf	[new file with mode: 0644]	blob
service/docs/Getting Started_IoTivity Services_20141218.pdf	[new file with mode: 0755]	blob
service/docs/Getting Started_SSM_PPM_Things Manager_NM_20141218.pdf	[new file with mode: 0755]	blob
service/docs/IoTivity Services_20141216.pdf	[new file with mode: 0644]	blob
service/docs/Notification Manager - Programmer's guide.pdf	[new file with mode: 0644]	blob
service/docs/PPM - Programmer's Guide_20141218.pdf	[new file with mode: 0755]	blob
service/docs/SSM - Programmer's guide_20141216.pdf	[new file with mode: 0755]	blob
service/docs/Things Manager - Programmer's guide_M2_SDK_APIs.pdf	[new file with mode: 0644]	blob
service/notification-manager/NotificationManager/build/linux/Makefile		diff \| blob \| history
service/notification-manager/NotificationManager/include/HostingConfig.h	[new file with mode: 0644]	blob
service/notification-manager/NotificationManager/include/HostingHandler.h	[new file with mode: 0644]	blob
service/notification-manager/NotificationManager/include/HostingInterface.h	[new file with mode: 0644]	blob
service/notification-manager/NotificationManager/include/NotificationManager.h		diff \| blob \| history
service/notification-manager/NotificationManager/include/OICPlatformConfig.h	[new file with mode: 0644]	blob
service/notification-manager/NotificationManager/include/RegistrationManager.h		diff \| blob \| history
service/notification-manager/NotificationManager/include/ResourceManager.h		diff \| blob \| history
service/notification-manager/NotificationManager/include/VirtualRepresentation.h		diff \| blob \| history
service/notification-manager/NotificationManager/src/HostingHandler.cpp	[new file with mode: 0644]	blob
service/notification-manager/NotificationManager/src/HostingInterface.cpp	[new file with mode: 0644]	blob
service/notification-manager/NotificationManager/src/LinuxMain.cpp	[deleted file]	blob \| history
service/notification-manager/NotificationManager/src/NotificationManager.cpp		diff \| blob \| history
service/notification-manager/NotificationManager/src/OICPlatformConfig.cpp	[new file with mode: 0644]	blob
service/notification-manager/NotificationManager/src/RegistrationManager.cpp		diff \| blob \| history
service/notification-manager/NotificationManager/src/ResourceManager.cpp		diff \| blob \| history
service/notification-manager/NotificationManager/src/VirtualRepresentation.cpp		diff \| blob \| history
service/notification-manager/NotificationManager/src/linux/main.cpp	[new file with mode: 0644]	blob
service/notification-manager/SampleApp/linux/sampleConsumer/SampleConsumer.cpp		diff \| blob \| history
service/notification-manager/SampleApp/linux/sampleProvider/SampleProvider.cpp		diff \| blob \| history
service/protocol-plugin/build/linux/Makefile		diff \| blob \| history
service/protocol-plugin/lib/cpluff/SConscript		diff \| blob \| history
service/protocol-plugin/lib/cpluff/libcpluff/psymbol.c		diff \| blob \| history
service/protocol-plugin/plugin-manager/SConscript		diff \| blob \| history
service/protocol-plugin/plugin-manager/src/Config.cpp		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.h		diff \| blob \| history
service/protocol-plugin/plugin-manager/src/Plugin.h		diff \| blob \| history
service/protocol-plugin/plugin-manager/src/PluginManager.cpp		diff \| blob \| history
service/protocol-plugin/plugin-manager/src/PluginManager.h		diff \| blob \| history
service/protocol-plugin/plugin-manager/src/PluginManagerImpl.cpp		diff \| blob \| history
service/protocol-plugin/plugins/SConscript		diff \| blob \| history
service/protocol-plugin/plugins/mqtt-fan/build/linux/Makefile		diff \| blob \| history
service/protocol-plugin/plugins/mqtt-fan/src/fanserver_mqtt_plugin.cpp		diff \| blob \| history
service/protocol-plugin/plugins/mqtt-light/build/linux/Makefile		diff \| blob \| history
service/protocol-plugin/plugins/mqtt-light/src/lightserver_mqtt_plugin.cpp		diff \| blob \| history
service/protocol-plugin/readme		diff \| blob \| history
service/protocol-plugin/sample-app/linux/SConscript		diff \| blob \| history
service/protocol-plugin/sample-app/linux/mqtt/Makefile		diff \| blob \| history
service/protocol-plugin/sample-app/linux/mqtt/mqttclient.cpp		diff \| blob \| history
service/soft-sensor-manager/Readme.txt		diff \| blob \| history
service/soft-sensor-manager/SConscript		diff \| blob \| history
service/soft-sensor-manager/SDK/cpp/build/linux/Makefile	[moved from service/soft-sensor-manager/SDK/build/linux/Makefile with 76% similarity]	diff \| blob \| history
service/soft-sensor-manager/SDK/cpp/include/SSMInterface.h	[new file with mode: 0644]	blob
service/soft-sensor-manager/SDK/cpp/src/InprocSSMCore.cpp	[moved from service/soft-sensor-manager/SDK/src/InprocSSMCore.cpp with 100% similarity]	blob \| history
service/soft-sensor-manager/SDK/include/ISSMClientListener.h	[deleted file]	blob \| history
service/soft-sensor-manager/SDK/include/SSMClient.h	[deleted file]	blob \| history
service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/CoreController.java	[new file with mode: 0644]	blob
service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/DataReader.java	[new file with mode: 0644]	blob
service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/IQueryEngineEvent.java	[new file with mode: 0644]	blob
service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/IReportReceiver.java	[new file with mode: 0644]	blob
service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/ModelData.java	[new file with mode: 0644]	blob
service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/QueryEngine.java	[new file with mode: 0644]	blob
service/soft-sensor-manager/SDK/java/org/iotivity/service/ssm/SSMInterface.java	[new file with mode: 0644]	blob
service/soft-sensor-manager/SDK/src/SSMClient.cpp	[deleted file]	blob \| history
service/soft-sensor-manager/SSMCore/build/linux/Makefile		diff \| blob \| history
service/soft-sensor-manager/SSMCore/include/SSMInterface.h		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/Common/ObjectManager.h		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/Common/PlatformLayer.h		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/Common/sqlite3.h		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/QueryProcessor/ContextModel.cpp		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/QueryProcessor/EvaluationEngine.cpp		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/QueryProcessor/PropagationEngine.cpp		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/QueryProcessor/QueryEngine.cpp		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMCore.h		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMResourceServer.cpp		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/SSMInterface/SSMResourceServer.h		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/SensorProcessor/ContextExecutor.cpp		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/SensorProcessor/ContextRepository.cpp		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/SensorProcessor/ResourceFinder.cpp		diff \| blob \| history
service/soft-sensor-manager/SSMCore/src/SensorProcessor/ResourceFinder.h		diff \| blob \| history
service/soft-sensor-manager/SampleApp/SConscript		diff \| blob \| history
service/soft-sensor-manager/SampleApp/arduino/Reference_Thing/build/makefile	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Reference_Thing/include/bleLib.h	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Reference_Thing/include/oic_lanLib.h	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Reference_Thing/src/bleLib.cpp	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Reference_Thing/src/oic_lanLib.cpp	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Reference_Thing/src/readme.txt	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Reference_Thing/src/reference.cpp	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/THSensorApp/build/Makefile	[deleted file]	blob \| history
service/soft-sensor-manager/SampleApp/arduino/THSensorApp/build/makefile	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/THSensorApp/src/thserver.cpp		diff \| blob \| history
service/soft-sensor-manager/SampleApp/arduino/Trackee_Thing/build/makefile	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Trackee_Thing/include/bleLib.h	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Trackee_Thing/include/oic_lanLib.h	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Trackee_Thing/include/proximity.h	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Trackee_Thing/include/trackee.h	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Trackee_Thing/src/bleLib.cpp	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Trackee_Thing/src/oic_lanLib.cpp	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Trackee_Thing/src/proximity.cpp	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Trackee_Thing/src/readme.txt	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/arduino/Trackee_Thing/src/trackee.cpp	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/linux/ClientApp/SConscript	[deleted file]	blob \| history
service/soft-sensor-manager/SampleApp/linux/SSMTesterApp/SConscript	[new file with mode: 0644]	blob
service/soft-sensor-manager/SampleApp/linux/SSMTesterApp/build/Makefile		diff \| blob \| history
service/soft-sensor-manager/SampleApp/linux/SSMTesterApp/include/SSMTestApp.h		diff \| blob \| history
service/soft-sensor-manager/SampleApp/linux/SSMTesterApp/src/SSMTestApp.cpp		diff \| blob \| history
service/soft-sensor-manager/SampleApp/linux/THSensorApp/SConscript		diff \| blob \| history
service/soft-sensor-manager/SampleApp/linux/THSensorApp/include/ThingResourceServer.h		diff \| blob \| history
service/soft-sensor-manager/SampleApp/linux/THSensorApp/src/ThingResourceServer.cpp		diff \| blob \| history
service/soft-sensor-manager/SampleApp/linux/THSensorApp1/SConscript		diff \| blob \| history
service/soft-sensor-manager/SampleApp/linux/THSensorApp1/include/ThingResourceServer1.h		diff \| blob \| history
service/soft-sensor-manager/SampleApp/linux/THSensorApp1/src/ThingResourceServer1.cpp		diff \| blob \| history
service/soft-sensor-manager/SampleApp/tizen/SSMTesterApp/oic-sample/CMakeLists.txt		diff \| blob \| history
service/soft-sensor-manager/SampleApp/tizen/SSMTesterApp/oic-sample/src/oicapp-test.cpp		diff \| blob \| history
service/soft-sensor-manager/SoftSensorPlugin/DiscomfortIndexSensor/SoftSensorDescription.xml	[deleted file]	blob \| history
service/soft-sensor-manager/SoftSensorPlugin/DiscomfortIndexSensor/build/linux/Makefile		diff \| blob \| history
service/soft-sensor-manager/SoftSensorPlugin/SoftSensorDescription.xml	[new file with mode: 0644]	blob
service/soft-sensor-manager/build/arduino/Makefile		diff \| blob \| history
service/soft-sensor-manager/build/arduino/environment.mk		diff \| blob \| history
service/soft-sensor-manager/build/arduino/local.properties		diff \| blob \| history
service/soft-sensor-manager/build/linux/environment.mk		diff \| blob \| history
service/soft-sensor-manager/doc/SSM Developer s guide_v0.1.pdf	[deleted file]	blob \| history
service/soft-sensor-manager/doc/SSM Getting Started_v0.1.pdf	[deleted file]	blob \| history
service/things-manager/SConscript		diff \| blob \| history
service/things-manager/build/linux/Makefile	[deleted file]	blob \| history
service/things-manager/build/linux/makefile	[new file with mode: 0644]	blob
service/things-manager/sampleapp/SConscript		diff \| blob \| history
service/things-manager/sampleapp/linux/configuration/ConfigurationCollection.cpp	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/configuration/ConfigurationCollection.h	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/configuration/DiagnosticsCollection.cpp	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/configuration/DiagnosticsCollection.h	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/configuration/FactorySetCollection.cpp	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/configuration/FactorySetCollection.h	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/configuration/SConscript	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/configuration/bootstrapserver.cpp	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/configuration/con-client.cpp	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/configuration/con-server.cpp	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/configuration/makefile	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/groupaction/SConscript	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/groupaction/bookmark.cpp	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/groupaction/groupserver.cpp	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/groupaction/lightserver.cpp	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/groupaction/makefile	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/groupsyncaction/SConscript	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/groupsyncaction/group.cpp	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/groupsyncaction/makefile	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/groupsyncaction/musicplayer.cpp	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/groupsyncaction/phone.cpp	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/groupsyncaction/speaker.cpp	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/makefile	[new file with mode: 0644]	blob
service/things-manager/sampleapp/linux/tgmclient/SConscript	[deleted file]	blob \| history
service/things-manager/sampleapp/linux/tgmclient/makefile	[deleted file]	blob \| history
service/things-manager/sampleapp/linux/tgmclient/tgmsdkclient.cpp	[deleted file]	blob \| history
service/things-manager/sdk/build/linux/Makefile		diff \| blob \| history
service/things-manager/sdk/inc/TGMClient.h	[deleted file]	blob \| history
service/things-manager/sdk/inc/ThingsManager.h	[new file with mode: 0644]	blob
service/things-manager/sdk/src/GroupManager.cpp	[new file with mode: 0644]	blob
service/things-manager/sdk/src/GroupManager.h	[new file with mode: 0644]	blob
service/things-manager/sdk/src/GroupSynchronization.cpp	[new file with mode: 0644]	blob
service/things-manager/sdk/src/GroupSynchronization.h	[new file with mode: 0644]	blob
service/things-manager/sdk/src/TGMClient.cpp	[deleted file]	blob \| history
service/things-manager/sdk/src/ThingsConfiguration.cpp	[new file with mode: 0644]	blob
service/things-manager/sdk/src/ThingsConfiguration.h	[new file with mode: 0644]	blob
service/things-manager/sdk/src/ThingsDiagnostics.cpp	[new file with mode: 0644]	blob
service/things-manager/sdk/src/ThingsDiagnostics.h	[new file with mode: 0644]	blob
service/things-manager/sdk/src/ThingsManager.cpp	[new file with mode: 0644]	blob
service/third_party_libs.scons		diff \| blob \| history

Domain: Network & Connectivity / IoT Connectivity;

RSS Atom