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

projects / platform / upstream / iotivity.git / commit

author	Jee Hyeok Kim <jihyeok13.kim@samsung.com>
	Thu, 20 Oct 2016 09:00:19 +0000 (18:00 +0900)
committer	Jee Hyeok Kim <jihyeok13.kim@samsung.com>
	Fri, 21 Oct 2016 00:59:27 +0000 (00:59 +0000)
commit	8811eb919e6e92b52c8b646027a709e7d6030f3e
tree	a166af0a44914da920136fb4f8137e75527ffee1	tree \| snapshot
parent	8a1ff1d307cfd3517f2a707f3f085180db323c9e	commit \| diff

Merge 1.2-rel cloud project into master

1. Overwrite 1.2-rel cloud project into master

Change-Id: I9271607595166fce4bda9011f028a40514908fec
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13487
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Yeonghun Nam <yeonghun.nam@samsung.com>

93 files changed:

cloud/account/README		diff \| blob \| history
cloud/account/properties/config.properties		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/AccountServer.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/Constants.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/db/AccountDBManager.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/db/GroupTable.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/db/InviteTable.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/db/TokenTable.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/db/UserTable.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/acl/id/Acl.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/acl/id/AclManager.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/acl/id/AclResource.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/acl/invite/InviteManager.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/acl/invite/InviteResource.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/acl/verify/AclVerifyResource.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/credprov/cert/CertificateConstants.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/credprov/cert/CertificateManager.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/credprov/cert/CertificateResource.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/credprov/cert/CertificateStorage.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/credprov/crl/CrlManager.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/resources/credprov/crl/CrlResource.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/x509/cert/CSRParser.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/x509/cert/CertificateBuilder.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/x509/cert/CertificateExtension.java		diff \| blob \| history
cloud/account/src/main/java/org/iotivity/cloud/accountserver/x509/crl/CrlIssuer.java		diff \| blob \| history
cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/account/AccountResourceTest.java		diff \| blob \| history
cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/account/credprov/cert/CertificateResourceTest.java		diff \| blob \| history
cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/account/credprov/crl/CrlResourceTest.java		diff \| blob \| history
cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/account/session/SessionResourceTest.java		diff \| blob \| history
cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/account/tokenrefresh/TokenRefreshResourceTest.java		diff \| blob \| history
cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/acl/group/GroupResourceTest.java		diff \| blob \| history
cloud/account/src/test/java/org/iotivity/cloud/accountserver/resources/acl/invite/InviteResourceTest.java		diff \| blob \| history
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/Constants.java		diff \| blob \| history
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/DeviceServerSystem.java		diff \| blob \| history
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/DiResource.java		diff \| blob \| history
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/account/Account.java		diff \| blob \| history
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/account/AccountSession.java		diff \| blob \| history
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/account/Acl.java		diff \| blob \| history
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/account/AclGroup.java		diff \| blob \| history
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/account/AclInvite.java		diff \| blob \| history
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/account/Certificate.java		diff \| blob \| history
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/mq/MessageQueue.java		diff \| blob \| history
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/rd/DevicePresence.java		diff \| blob \| history
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/rd/ResourceDirectory.java		diff \| blob \| history
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/rd/ResourceFind.java		diff \| blob \| history
cloud/interface/src/main/java/org/iotivity/cloud/ciserver/resources/proxy/rd/ResourcePresence.java		diff \| blob \| history
cloud/interface/src/test/java/org/iotivity/cloud/ciserver/resources/proxy/rd/DevicePresenceTest.java		diff \| blob \| history
cloud/interface/src/test/java/org/iotivity/cloud/ciserver/resources/proxy/rd/ResourceFindTest.java		diff \| blob \| history
cloud/interface/src/test/java/org/iotivity/cloud/ciserver/resources/proxy/rd/ResourcePresenceTest.java		diff \| blob \| history
cloud/messagequeue/src/main/java/org/iotivity/cloud/mqserver/MessageQueueUtils.java		diff \| blob \| history
cloud/messagequeue/src/main/java/org/iotivity/cloud/mqserver/kafka/KafkaCommonWrapper.java		diff \| blob \| history
cloud/messagequeue/src/main/java/org/iotivity/cloud/mqserver/kafka/KafkaConsumerWrapper.java		diff \| blob \| history
cloud/messagequeue/src/main/java/org/iotivity/cloud/mqserver/kafka/KafkaProducerWrapper.java		diff \| blob \| history
cloud/messagequeue/src/main/java/org/iotivity/cloud/mqserver/resources/MQBrokerResource.java		diff \| blob \| history
cloud/messagequeue/src/main/java/org/iotivity/cloud/mqserver/topic/Topic.java		diff \| blob \| history
cloud/messagequeue/src/main/java/org/iotivity/cloud/mqserver/topic/TopicManager.java		diff \| blob \| history
cloud/messagequeue/src/test/java/org/iotivity/cloud/mqserver/resources/MQBrokerResourceTest.java		diff \| blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/Constants.java		diff \| blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/ResourceDirectoryServer.java		diff \| blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/db/DBManager.java		diff \| blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/db/MongoDB.java		diff \| blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/directory/PayloadManager.java	[new file with mode: 0644]	blob
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/directory/RDManager.java	[new file with mode: 0644]	blob
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/directory/rd/InsManager.java		diff \| blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/directory/rd/PublishLinks.java	[deleted file]	blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/directory/rd/PublishPayload.java	[deleted file]	blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/directory/rd/PublishTags.java	[deleted file]	blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/directory/rd/ResourceDirectoryResource.java		diff \| blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/directory/res/DiscoveryLinks.java	[deleted file]	blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/directory/res/DiscoveryPayload.java	[deleted file]	blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/directory/res/DiscoveryResource.java		diff \| blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/directory/res/DiscoveryTags.java	[deleted file]	blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/presence/PresenceManager.java	[new file with mode: 0644]	blob
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/presence/ResPresenceManager.java	[deleted file]	blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/presence/device/DevicePresenceResource.java		diff \| blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/presence/device/DeviceState.java	[deleted file]	blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/presence/resource/ResPresencePayload.java	[deleted file]	blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/resources/presence/resource/ResPresenceResource.java		diff \| blob \| history
cloud/resourcedirectory/src/main/java/org/iotivity/cloud/rdserver/util/TypeCastingManager.java	[deleted file]	blob \| history
cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/DevicePresenceResourceTest.java		diff \| blob \| history
cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/DiscoveryResourceTest.java		diff \| blob \| history
cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/RDServerTestUtils.java		diff \| blob \| history
cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/ResourceDirectoryResourceTest.java		diff \| blob \| history
cloud/resourcedirectory/src/test/java/org/iotivity/cloud/testrdserver/ResourcePresenceResourceTest.java		diff \| blob \| history
cloud/samples/client/SConscript		diff \| blob \| history
cloud/samples/client/airconditioner/aircon_controller.cpp		diff \| blob \| history
cloud/samples/client/group_invite/group_invite.cpp		diff \| blob \| history
cloud/samples/client/group_invite/group_light_share.cpp	[new file with mode: 0644]	blob
cloud/samples/client/messagequeue/mq_publisher.cpp		diff \| blob \| history
cloud/samples/client/messagequeue/mq_subscriber.cpp		diff \| blob \| history
cloud/samples/client/thin_light/thin_room_light.cpp		diff \| blob \| history
cloud/stack/src/main/java/org/iotivity/cloud/base/connector/CoapClient.java		diff \| blob \| history
cloud/stack/src/main/java/org/iotivity/cloud/base/device/CoapDevice.java		diff \| blob \| history

Domain: Network & Connectivity / IoT Connectivity;

RSS Atom