CBOR rebase onto master for merge/review 13/1613/12
authorOmkar Hegde <omkar.m.hegde@intel.com>
Fri, 10 Jul 2015 21:41:46 +0000 (14:41 -0700)
committerErich Keane <erich.keane@intel.com>
Tue, 14 Jul 2015 20:03:42 +0000 (20:03 +0000)
commit632666ef557d61eee5ef438a2af51d760cace39f
treef5bcc92175a1b6f1e37ee101b762657ff22dd261
parenta8c4123bfd4d51a1b64383d5d2002454ecf0b328
CBOR rebase onto master for merge/review

The CA layer has been converted to use binary data, rather
than string data to support CBOR as a transport.  The CSDK has
been changed to use the OCPlatform object model instead of json
strings.  Underneath this, the JSON encoding has been replaced
with CBOR.

Also, some of the previous blockwise transfer functionality has
been removed, since the blockwise-transfer functionality has been
pushed ot the CA stack.

Change-Id: I6423a5180643cea3d311ec7497b246117f7c02b0
Signed-off-by: Erich Keane <erich.keane@intel.com>
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1613
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
88 files changed:
.gitignore
NOTICE.md
Readme.scons.txt
android/android_api/base/jni/JniOcRepresentation.cpp
android/android_api/base/jni/JniOcRepresentation.h
build_common/external_libs.scons
examples/OICMiddle/LineInput.cpp
examples/OICMiddle/WrapResource.cpp
extlibs/buildDependencies.sh
extlibs/cereal/SConscript [deleted file]
extlibs/tinycbor/SConscript [new file with mode: 0644]
extra_options.scons
gbsbuild.sh
resource/c_common/oic_malloc/include/oic_malloc.h
resource/c_common/oic_malloc/src/oic_malloc.c
resource/csdk/SConscript
resource/csdk/connectivity/api/cacommon.h
resource/csdk/connectivity/common/src/caremotehandler.c
resource/csdk/connectivity/inc/caprotocolmessage.h
resource/csdk/connectivity/lib/libcoap-4.1.1/pdu.c
resource/csdk/connectivity/lib/libcoap-4.1.1/pdu.h
resource/csdk/connectivity/samples/arduino/casample.cpp
resource/csdk/connectivity/src/camessagehandler.c
resource/csdk/connectivity/src/caprotocolmessage.c
resource/csdk/connectivity/test/ca_api_unittest.cpp
resource/csdk/security/provisioning/SConscript
resource/csdk/security/provisioning/src/provisioningmanager.c
resource/csdk/security/src/aclresource.c
resource/csdk/security/src/credresource.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/pstatresource.c
resource/csdk/security/src/resourcemanager.c
resource/csdk/security/unittest/aclresourcetest.cpp
resource/csdk/security/unittest/pstatresource.cpp
resource/csdk/stack/include/internal/ocobserve.h
resource/csdk/stack/include/internal/ocpayloadcbor.h [new file with mode: 0644]
resource/csdk/stack/include/internal/ocresource.h
resource/csdk/stack/include/internal/ocresourcehandler.h
resource/csdk/stack/include/internal/ocserverrequest.h
resource/csdk/stack/include/internal/ocstackinternal.h
resource/csdk/stack/include/ocpayload.h [new file with mode: 0644]
resource/csdk/stack/include/ocpresence.h [new file with mode: 0644]
resource/csdk/stack/include/ocstack.h
resource/csdk/stack/include/ocstackconfig.h
resource/csdk/stack/include/octypes.h
resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/ocserver.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.h
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.h
resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.h
resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp
resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp
resource/csdk/stack/samples/linux/secure/SConscript
resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp
resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp
resource/csdk/stack/samples/linux/secure/ocserverbasicops.h
resource/csdk/stack/src/occlientcb.c
resource/csdk/stack/src/occollection.c
resource/csdk/stack/src/ocobserve.c
resource/csdk/stack/src/ocpayload.c [new file with mode: 0644]
resource/csdk/stack/src/ocpayloadconvert.c [new file with mode: 0644]
resource/csdk/stack/src/ocpayloadparse.c [new file with mode: 0644]
resource/csdk/stack/src/ocresource.c
resource/csdk/stack/src/ocserverrequest.c
resource/csdk/stack/src/ocstack.c
resource/csdk/stack/src/oicgroup.c
resource/csdk/stack/test/stacktests.cpp
resource/include/InProcClientWrapper.h
resource/include/OCApi.h
resource/include/OCRepresentation.h
resource/include/OCResourceRequest.h
resource/include/OCResourceResponse.h
resource/include/OCSerialization.h
resource/include/OicJsonSerializer.hpp [deleted file]
resource/patches/cereal_gcc46.patch [deleted file]
resource/src/InProcClientWrapper.cpp
resource/src/InProcServerWrapper.cpp
resource/src/OCPlatform_impl.cpp
resource/src/OCRepresentation.cpp
resource/src/OCResourceRequest.cpp
resource/src/SConscript
service/notification-manager/NotificationManager/src/hosting.c
tools/vagrant/iotivity-setup.sh