From fe0ddc8f4e1f31d2028c7d11435713ee0d4f20b4 Mon Sep 17 00:00:00 2001 From: Jay Sharma Date: Fri, 17 Jul 2015 19:21:03 +0530 Subject: [PATCH] Updated Resource Client and sample apps as per new Header structure. Change-Id: I74bbee499c4c829bd49a27d8514c73e12308a044 Signed-off-by: Jay Sharma Reviewed-on: https://gerrit.iotivity.org/gerrit/1722 Reviewed-by: Uze Choi Tested-by: Uze Choi --- service/resource-manipulation/SConscript | 17 +++++++++-------- service/resource-manipulation/examples/linux/SConscript | 4 +++- .../examples/linux/SampleResourceClient.cpp | 2 +- .../examples/linux/SampleResourceServer.cpp | 8 ++++---- service/resource-manipulation/include/ResourceClient.h | 15 ++++++++------- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/service/resource-manipulation/SConscript b/service/resource-manipulation/SConscript index a6f00d2..5243193 100644 --- a/service/resource-manipulation/SConscript +++ b/service/resource-manipulation/SConscript @@ -63,7 +63,7 @@ resourceClient_env.AppendUnique(CPPPATH = ['src/resourceCache/include']) resourceClient_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) -resourceClient_env.PrependUnique(LIBS = ['oc', 'ResourceBroker' , 'ResourceCache', 'service_common', 'octbstack', 'gnustl_shared','oc_logger', 'compatibility', 'log']) +resourceClient_env.PrependUnique(LIBS = ['oc', 'service_common', 'ResourceBroker' , 'ResourceCache', 'octbstack', 'gnustl_shared','oc_logger', 'compatibility', 'log']) if target_os not in ['windows', 'winrt']: @@ -74,18 +74,19 @@ if target_os == 'linux': ###################################################################### # Source files and Targets ###################################################################### -# resourceClient_src = 'src/' -# client_src = [ -# resourceClient_src+ 'ResourceClient.cpp'] -#ResourceClientsdk = resourceClient_env.StaticLibrary('ResourceClient', client_src) -# resourceClient_env.InstallTarget(ResourceClientsdk , 'libResourceClient') +resourceClient_src = 'src/' +client_src = [ + resourceClient_src+ 'ResourceClient.cpp'] +ResourceClientsdk = resourceClient_env.StaticLibrary('ResourceClient', client_src) +resourceClient_env.InstallTarget(ResourceClientsdk , 'libResourceClient') ###################################################################### # Build Sample App: SampleResourceClient & SampleResourceServer ###################################################################### -# SConscript('examples/SConscript') +SConscript('examples/SConscript') + ###################################################################### # Build UnitTests Resource Client ################################################ ###################### -# SConscript('unittests/SConscript') +SConscript('unittests/SConscript') diff --git a/service/resource-manipulation/examples/linux/SConscript b/service/resource-manipulation/examples/linux/SConscript index 86569af..6c5a98d 100644 --- a/service/resource-manipulation/examples/linux/SConscript +++ b/service/resource-manipulation/examples/linux/SConscript @@ -36,10 +36,11 @@ ResourceServer_env = lib_env.Clone() ResourceClient_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x']) ResourceClient_env.AppendUnique(LIBS = ['ResourceClient','ResourceCache', 'ResourceBroker', 'ExpiryTimer','service_common','oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap', 'pthread']) +ResourceClient_env.AppendUnique(CPPPATH = ['../../include']) ResourceClient_env.AppendUnique(CPPPATH = ['../../src/resourceBroker/include']) ResourceClient_env.AppendUnique(CPPPATH = ['../../src/resourceCache/include']) ResourceClient_env.AppendUnique(CPPPATH = ['../../src/common/primitiveResource/include']) -ResourceClient_env.AppendUnique(CPPPATH = ['../../include']) + ###################################################################### @@ -48,6 +49,7 @@ ResourceClient_env.AppendUnique(CPPPATH = ['../../include']) ResourceServer_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-fmessage-length=0', '-std=c++0x']) ResourceServer_env.AppendUnique(LIBS = ['libserver_builder', 'libservice_common','oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap', 'pthread']) +ResourceServer_env.AppendUnique(CPPPATH = ['../../include']) ResourceServer_env.AppendUnique(CPPPATH = ['../../src/common/primitiveResource/include']) ResourceServer_env.AppendUnique(CPPPATH = ['../../src/serverBuilder/include']) diff --git a/service/resource-manipulation/examples/linux/SampleResourceClient.cpp b/service/resource-manipulation/examples/linux/SampleResourceClient.cpp index 9146e6f..d7b7f7f 100644 --- a/service/resource-manipulation/examples/linux/SampleResourceClient.cpp +++ b/service/resource-manipulation/examples/linux/SampleResourceClient.cpp @@ -128,7 +128,7 @@ int main() try { - uri = OC_MULTICAST_DISCOVERY_URI + uri + "?rt=" + rt; + uri = OC_RSRVD_WELL_KNOWN_URI + uri + "?rt=" + rt; //discover the resource in the network discoveryManagerInstance->discoverResource(address, uri , CT_DEFAULT, &OnResourceDiscovered); } diff --git a/service/resource-manipulation/examples/linux/SampleResourceServer.cpp b/service/resource-manipulation/examples/linux/SampleResourceServer.cpp index de47741..e1c07b1 100644 --- a/service/resource-manipulation/examples/linux/SampleResourceServer.cpp +++ b/service/resource-manipulation/examples/linux/SampleResourceServer.cpp @@ -45,7 +45,7 @@ void displayMenu() } //hander for get request (if developer choose second option for resource Creation) -PrimitiveGetResponse RequestHandlerForGet(const PrimitiveRequest &request, +RCSGetResponse RequestHandlerForGet(const RCSRequest &request, ResourceAttributes &attrs) { cout << "Recieved a Get request from Client" << std::endl; @@ -58,11 +58,11 @@ PrimitiveGetResponse RequestHandlerForGet(const PrimitiveRequest &request, std::cout << "\tkey : " << iter->key() << "\n\tvalue : " << iter->value().toString() << std::endl; ++iter; } - return PrimitiveGetResponse::create(attr); + return RCSGetResponse::create(attr); } //hander for set request (if developer choose second option for resource Creation) -PrimitiveSetResponse RequestHandlerForSet(const PrimitiveRequest &request, +RCSSetResponse RequestHandlerForSet(const RCSRequest &request, ResourceAttributes &attrs) { cout << "Recieved a Set request from Client" << std::endl; @@ -79,7 +79,7 @@ PrimitiveSetResponse RequestHandlerForSet(const PrimitiveRequest &request, std::cout << "\tkey : " << iter->key() << "\n\tvalue : " << iter->value().toString() << std::endl; ++iter; } - return PrimitiveSetResponse::create(attrs); + return RCSSetResponse::create(attrs); } int main(void) diff --git a/service/resource-manipulation/include/ResourceClient.h b/service/resource-manipulation/include/ResourceClient.h index 6476e4e..1990091 100644 --- a/service/resource-manipulation/include/ResourceClient.h +++ b/service/resource-manipulation/include/ResourceClient.h @@ -29,6 +29,7 @@ #include #include "ResourceAttributes.h" +#include "PrimitiveResource.h" namespace OIC { @@ -62,7 +63,7 @@ namespace OIC /* * Forward Declaration of Classes */ - class PrimitiveResource; + class RCSException; class RemoteResourceObject; /** @@ -71,11 +72,11 @@ namespace OIC * This class inherited from PrimitiveException class. * */ - class BadRequestException: public PrimitiveException + class BadRequestException: public RCSException { public: - BadRequestException(const std::string &what) : PrimitiveException { what } {} - BadRequestException(std::string &&what) : PrimitiveException { std::move(what) } {} + BadRequestException(const std::string &what) : RCSException{ what } {} + BadRequestException(std::string &&what) : RCSException{ std::move(what) } {} }; /** @@ -83,11 +84,11 @@ namespace OIC * @brief It is used to throw exception to the upper layer if parameter is invalid. * This class inherited from PrimitiveException class. */ - class InvalidParameterException: public PrimitiveException + class InvalidParameterException: public RCSException { public: - InvalidParameterException(const std::string &what) : PrimitiveException { what } {} - InvalidParameterException(std::string &&what) : PrimitiveException { std::move(what) } {} + InvalidParameterException(const std::string &what) : RCSException{ what } {} + InvalidParameterException(std::string &&what) : RCSException{ std::move(what) } {} }; /** -- 2.7.4