From e9faf4a4925a6150dbd23113df15d212c95b5ab2 Mon Sep 17 00:00:00 2001 From: Markus Jung Date: Tue, 28 Jul 2015 10:03:33 +0900 Subject: [PATCH] Including RCS prefix in ResourceContainer class name Change-Id: Icc1c47349687911ed8ad878e6b0d546e177769a8 Signed-off-by: Markus Jung Reviewed-on: https://gerrit.iotivity.org/gerrit/1945 Tested-by: jenkins-iotivity Reviewed-by: Madan Lanka --- .../include/RCSResourceContainer.h | 16 ++++++++-------- .../src/resourceContainer/SConscript | 2 +- .../resourceContainer/include/ResourceContainerImpl.h | 2 +- .../src/resourceContainer/src/ContainerSample.cpp | 2 +- .../{ResourceContainer.cpp => RCSResourceContainer.cpp} | 8 ++++---- .../unittests/ResourceContainerTest.cpp | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) rename service/resource-encapsulation/src/resourceContainer/src/{ResourceContainer.cpp => RCSResourceContainer.cpp} (79%) diff --git a/service/resource-encapsulation/include/RCSResourceContainer.h b/service/resource-encapsulation/include/RCSResourceContainer.h index 4a06f1b..cab5aa3 100644 --- a/service/resource-encapsulation/include/RCSResourceContainer.h +++ b/service/resource-encapsulation/include/RCSResourceContainer.h @@ -24,8 +24,8 @@ * This file contains the resource container APIs provided to the developers. */ -#ifndef RESOURCECONTAINER_H_ -#define RESOURCECONTAINER_H_ +#ifndef RCSRESOURCECONTAINER_H_ +#define RCSRESOURCECONTAINER_H_ #include #include @@ -45,18 +45,18 @@ namespace OIC * @brief This class provides APIs for managing the container and bundles in the container. * */ - class ResourceContainer + class RCSResourceContainer { public: /** * Constructor */ - ResourceContainer(); + RCSResourceContainer(); /** *virtual Destructor */ - virtual ~ResourceContainer(); + virtual ~RCSResourceContainer(); /** * API for starting the Container @@ -145,12 +145,12 @@ namespace OIC /** * API for getting the Instance of ResourceContainer class * - * @return ResourceContainer - Instance of the "ResourceContainer" class + * @return RCSResourceContainer - Instance of the "RCSResourceContainer" class * */ - static ResourceContainer *getInstance(); + static RCSResourceContainer *getInstance(); }; } } -#endif /* RESOURCECONTAINER_H_ */ +#endif /* RCSRESOURCECONTAINER_H_ */ diff --git a/service/resource-encapsulation/src/resourceContainer/SConscript b/service/resource-encapsulation/src/resourceContainer/SConscript index cb2061c..b0c242e 100644 --- a/service/resource-encapsulation/src/resourceContainer/SConscript +++ b/service/resource-encapsulation/src/resourceContainer/SConscript @@ -116,7 +116,7 @@ if int(containerJavaSupport): ###################################################################### res_container_src = ['src/BaseActivator.cpp','src/BundleActivator.cpp','src/RCSBundleInfo.cpp', 'src/BundleInfoInternal.cpp', 'src/BundleResource.cpp', 'src/Configuration.cpp', 'src/JavaBundleResource.cpp', 'src/ProtocolBridgeResource.cpp', - 'src/ProtocolBridgeConnector.cpp', 'src/ResourceContainer.cpp', 'src/ResourceContainerBundleAPI.cpp', 'src/ResourceContainerImpl.cpp', + 'src/ProtocolBridgeConnector.cpp', 'src/RCSResourceContainer.cpp', 'src/ResourceContainerBundleAPI.cpp', 'src/ResourceContainerImpl.cpp', 'src/SoftSensorResource.cpp'] res_container_static = resource_container_env.StaticLibrary('rcs_container', res_container_src) diff --git a/service/resource-encapsulation/src/resourceContainer/include/ResourceContainerImpl.h b/service/resource-encapsulation/src/resourceContainer/include/ResourceContainerImpl.h index de046cd..c9bb210 100644 --- a/service/resource-encapsulation/src/resourceContainer/include/ResourceContainerImpl.h +++ b/service/resource-encapsulation/src/resourceContainer/include/ResourceContainerImpl.h @@ -44,7 +44,7 @@ namespace OIC namespace Service { - class ResourceContainerImpl: public ResourceContainer, public ResourceContainerBundleAPI + class ResourceContainerImpl: public RCSResourceContainer, public ResourceContainerBundleAPI { public: ResourceContainerImpl(); diff --git a/service/resource-encapsulation/src/resourceContainer/src/ContainerSample.cpp b/service/resource-encapsulation/src/resourceContainer/src/ContainerSample.cpp index a363dab..9b84abe 100644 --- a/service/resource-encapsulation/src/resourceContainer/src/ContainerSample.cpp +++ b/service/resource-encapsulation/src/resourceContainer/src/ContainerSample.cpp @@ -43,7 +43,7 @@ int main() info_logger() << "Starting container test." << std::flush; - ResourceContainer *container = ResourceContainer::getInstance(); + RCSResourceContainer *container = RCSResourceContainer::getInstance(); container->startContainer("examples/ResourceContainerConfig.xml"); /*so bundle add test*/ diff --git a/service/resource-encapsulation/src/resourceContainer/src/ResourceContainer.cpp b/service/resource-encapsulation/src/resourceContainer/src/RCSResourceContainer.cpp similarity index 79% rename from service/resource-encapsulation/src/resourceContainer/src/ResourceContainer.cpp rename to service/resource-encapsulation/src/resourceContainer/src/RCSResourceContainer.cpp index 10110bf..9830c2b 100644 --- a/service/resource-encapsulation/src/resourceContainer/src/ResourceContainer.cpp +++ b/service/resource-encapsulation/src/resourceContainer/src/RCSResourceContainer.cpp @@ -23,19 +23,19 @@ namespace OIC{ namespace Service{ - ResourceContainer::ResourceContainer() + RCSResourceContainer::RCSResourceContainer() { } - ResourceContainer::~ResourceContainer() + RCSResourceContainer::~RCSResourceContainer() { } - ResourceContainer *ResourceContainer::getInstance() + RCSResourceContainer *RCSResourceContainer::getInstance() { - return (ResourceContainer *)ResourceContainerImpl::getImplInstance(); + return (RCSResourceContainer *)ResourceContainerImpl::getImplInstance(); } } } diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp index 148bda7..f672046 100644 --- a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp +++ b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp @@ -67,13 +67,13 @@ class ResourceContainerTest: public TestWithMock { public: - ResourceContainer *m_pResourceContainer; + RCSResourceContainer *m_pResourceContainer; protected: void SetUp() { TestWithMock::SetUp(); - m_pResourceContainer = ResourceContainer::getInstance(); + m_pResourceContainer = RCSResourceContainer::getInstance(); } }; -- 2.7.4