From 431c03a03699eb189f23ee093bbda48513a927a7 Mon Sep 17 00:00:00 2001 From: "hunje.yeon" Date: Tue, 14 Jul 2015 21:31:46 +0900 Subject: [PATCH] Change 'resource-manipulation' folder structure Move sub-folders of 'modules' to 'src'. Remove 'modules' folder Update SConscript according to the folder changes Disable SConscript of 'resource-manipulation' due to gcc version (jenkins is not gcc4.7) Change-Id: I90a6f6e0afd3a72a569d70d8c16fd69cad897c8d Signed-off-by: hunje.yeon Reviewed-on: https://gerrit.iotivity.org/gerrit/1646 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi Tested-by: Uze Choi --- service/resource-manipulation/SConscript | 18 +++++++++--------- .../resource-manipulation/examples/linux/SConscript | 10 +++++----- .../{modules => src}/common/SConscript | 0 .../{modules => src}/common/expiryTimer/SConscript | 0 .../common/expiryTimer/include/ExpiryTimer.h | 2 -- .../common/expiryTimer/src/ExpiryTimer.cpp | 0 .../common/expiryTimer/src/ExpiryTimer_Impl.cpp | 0 .../common/expiryTimer/src/ExpiryTimer_Impl.h | 0 .../common/primitiveResource/SConscript | 0 .../primitiveResource/include/PresenceSubscriber.h | 0 .../primitiveResource/include/PrimitiveException.h | 0 .../primitiveResource/include/PrimitiveResource.h | 0 .../primitiveResource/include/ResourceAttributes.h | 0 .../primitiveResource/include/ResponseStatement.h | 0 .../primitiveResource/include/internal/AssertUtils.h | 0 .../include/internal/PrimitiveResourceImpl.h | 0 .../include/internal/ResourceAttributesConverter.h | 0 .../include/internal/ResourceAttributesUtils.h | 0 .../primitiveResource/src/PresenceSubscriber.cpp | 0 .../primitiveResource/src/PrimitiveResource.cpp | 0 .../primitiveResource/src/PrimtiveException.cpp | 0 .../primitiveResource/src/ResourceAttributes.cpp | 0 .../primitiveResource/src/ResponseStatement.cpp | 0 .../unittests/PresenceSubscriberTest.cpp | 0 .../unittests/PrimitiveResourceTest.cpp | 0 .../unittests/ResourceAttributesTest.cpp | 0 .../{modules => src}/resourceBroker/SConscript | 0 .../resourceBroker/include/BrokerTypes.h | 0 .../resourceBroker/include/DeviceAssociation.h | 0 .../resourceBroker/include/DevicePresence.h | 0 .../resourceBroker/include/ResourceBroker.h | 0 .../resourceBroker/include/ResourcePresence.h | 0 .../resourceBroker/src/DeviceAssociation.cpp | 0 .../resourceBroker/src/DevicePresence.cpp | 0 .../resourceBroker/src/ResourceBroker.cpp | 0 .../resourceBroker/src/ResourcePresence.cpp | 0 .../{modules => src}/resourceCache/SConscript | 0 .../resourceCache/include/CacheTypes.h | 0 .../resourceCache/include/DataCache.h | 0 .../resourceCache/include/ResourceCacheManager.h | 0 .../{modules => src}/resourceCache/src/DataCache.cpp | 0 .../resourceCache/src/ResourceCacheManager.cpp | 0 .../{modules => src}/resourceContainer/SConscript | 0 .../bundle-api/include/BundleActivator.h | 0 .../bundle-api/include/BundleResource.h | 0 .../bundle-api/include/NotificationReceiver.h | 0 .../bundle-api/include/ProtocolBridgeConnector.h | 0 .../bundle-api/include/ProtocolBridgeResource.h | 0 .../bundle-api/include/ResourceContainerBundleAPI.h | 0 .../bundle-api/include/SoftSensorResource.h | 0 .../resourceContainer/bundle-java-api/pom.xml | 0 .../resourcecontainer/bundle/api/BaseActivator.java | 0 .../resourcecontainer/bundle/api/BundleActivator.java | 0 .../resourcecontainer/bundle/api/BundleResource.java | 0 .../bundle/api/ProtocolBridgeConnector.java | 0 .../resourcecontainer/bundle/api/ResourceConfig.java | 0 .../examples/HueJavaSampleBundle/hue/pom.xml | 0 .../org/iotivity/bundle/hue/HueBundleActivator.java | 0 .../java/org/iotivity/bundle/hue/HueConnector.java | 0 .../org/iotivity/bundle/hue/HueLightResource.java | 0 .../examples/HueSampleBundle/include/HueConnector.h | 0 .../examples/HueSampleBundle/include/HueLight.h | 0 .../include/HueSampleBundleActivator.h | 0 .../examples/HueSampleBundle/src/HueConnector.cpp | 0 .../examples/HueSampleBundle/src/HueLight.cpp | 0 .../HueSampleBundle/src/HueSampleBundleActivator.cpp | 0 .../examples/ResourceContainerConfig.xml | 0 .../include/DiscomfortIndexSensor.h | 0 .../include/DiscomfortIndexSensorResource.h | 0 .../include/SoftSensorBundleActivator.h | 0 .../SoftSensorSampleBundle/include/SysTimer.h | 0 .../src/DiscomfortIndexSensor.cpp | 0 .../src/DiscomfortIndexSensorResource.cpp | 0 .../src/SoftSensorBundleActivator.cpp | 0 .../examples/SoftSensorSampleBundle/src/SysTimer.cpp | 0 .../resourceContainer/include/BundleInfo.h | 0 .../resourceContainer/include/ResourceContainer.h | 0 .../include/internal/BundleInfoInternal.h | 0 .../include/internal/Configuration.h | 0 .../include/internal/JavaBundleResource.h | 0 .../include/internal/ResourceContainerImpl.h | 0 ...ivity_resourcecontainer_bundle_api_BaseActivator.h | 0 .../resourceContainer/src/BaseActivator.cpp | 0 .../resourceContainer/src/BundleActivator.cpp | 0 .../resourceContainer/src/BundleInfo.cpp | 0 .../resourceContainer/src/BundleInfoInternal.cpp | 0 .../resourceContainer/src/BundleResource.cpp | 0 .../resourceContainer/src/Configuration.cpp | 0 .../resourceContainer/src/ContainerSample.cpp | 0 .../resourceContainer/src/JavaBundleResource.cpp | 0 .../resourceContainer/src/ProtocolBridgeConnector.cpp | 0 .../resourceContainer/src/ProtocolBridgeResource.cpp | 0 .../resourceContainer/src/ResourceContainer.cpp | 0 .../src/ResourceContainerBundleAPI.cpp | 0 .../resourceContainer/src/ResourceContainerImpl.cpp | 0 .../resourceContainer/src/SoftSensorResource.cpp | 0 .../unittests/ResourceContainerInvalidConfig.xml | 0 .../unittests/ResourceContainerTest.cpp | 0 .../unittests/ResourceContainerTestConfig.xml | 0 .../resourceContainer/unittests/SConscript | 0 .../TestBundle/include/TestBundleActivator.h | 0 .../unittests/TestBundle/src/TestBundleActivator.cpp | 0 .../TestBundleJava/hue-0.1-jar-with-dependencies.jar | Bin .../{modules => src}/serverBuilder/SConscript | 0 .../serverBuilder/include/PrimitiveRequest.h | 0 .../serverBuilder/include/PrimitiveResponse.h | 0 .../serverBuilder/include/ResourceObject.h | 0 .../serverBuilder/include/internal/RequestHandler.h | 0 .../serverBuilder/src/PrimitiveRequest.cpp | 0 .../serverBuilder/src/PrimitiveResponse.cpp | 0 .../serverBuilder/src/RequestHandler.cpp | 0 .../serverBuilder/src/ResourceObject.cpp | 0 .../serverBuilder/unittests/PrimitiveResponseTest.cpp | 0 .../serverBuilder/unittests/RequestHandlerTest.cpp | 0 .../serverBuilder/unittests/ResourceObjectTest.cpp | 0 115 files changed, 14 insertions(+), 16 deletions(-) rename service/resource-manipulation/{modules => src}/common/SConscript (100%) rename service/resource-manipulation/{modules => src}/common/expiryTimer/SConscript (100%) rename service/resource-manipulation/{modules => src}/common/expiryTimer/include/ExpiryTimer.h (99%) rename service/resource-manipulation/{modules => src}/common/expiryTimer/src/ExpiryTimer.cpp (100%) rename service/resource-manipulation/{modules => src}/common/expiryTimer/src/ExpiryTimer_Impl.cpp (100%) rename service/resource-manipulation/{modules => src}/common/expiryTimer/src/ExpiryTimer_Impl.h (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/SConscript (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/include/PresenceSubscriber.h (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/include/PrimitiveException.h (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/include/PrimitiveResource.h (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/include/ResourceAttributes.h (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/include/ResponseStatement.h (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/include/internal/AssertUtils.h (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/include/internal/PrimitiveResourceImpl.h (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/include/internal/ResourceAttributesConverter.h (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/include/internal/ResourceAttributesUtils.h (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/src/PresenceSubscriber.cpp (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/src/PrimitiveResource.cpp (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/src/PrimtiveException.cpp (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/src/ResourceAttributes.cpp (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/src/ResponseStatement.cpp (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/unittests/PresenceSubscriberTest.cpp (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/unittests/PrimitiveResourceTest.cpp (100%) rename service/resource-manipulation/{modules => src}/common/primitiveResource/unittests/ResourceAttributesTest.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceBroker/SConscript (100%) rename service/resource-manipulation/{modules => src}/resourceBroker/include/BrokerTypes.h (100%) rename service/resource-manipulation/{modules => src}/resourceBroker/include/DeviceAssociation.h (100%) rename service/resource-manipulation/{modules => src}/resourceBroker/include/DevicePresence.h (100%) rename service/resource-manipulation/{modules => src}/resourceBroker/include/ResourceBroker.h (100%) rename service/resource-manipulation/{modules => src}/resourceBroker/include/ResourcePresence.h (100%) rename service/resource-manipulation/{modules => src}/resourceBroker/src/DeviceAssociation.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceBroker/src/DevicePresence.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceBroker/src/ResourceBroker.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceBroker/src/ResourcePresence.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceCache/SConscript (100%) rename service/resource-manipulation/{modules => src}/resourceCache/include/CacheTypes.h (100%) rename service/resource-manipulation/{modules => src}/resourceCache/include/DataCache.h (100%) rename service/resource-manipulation/{modules => src}/resourceCache/include/ResourceCacheManager.h (100%) rename service/resource-manipulation/{modules => src}/resourceCache/src/DataCache.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceCache/src/ResourceCacheManager.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/SConscript (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/bundle-api/include/BundleActivator.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/bundle-api/include/BundleResource.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/bundle-api/include/NotificationReceiver.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/bundle-api/include/ProtocolBridgeConnector.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/bundle-api/include/ProtocolBridgeResource.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/bundle-api/include/ResourceContainerBundleAPI.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/bundle-api/include/SoftSensorResource.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/bundle-java-api/pom.xml (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/HueSampleBundle/include/HueConnector.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/HueSampleBundle/include/HueLight.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/ResourceContainerConfig.xml (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensor.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensorResource.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/SoftSensorSampleBundle/include/SoftSensorBundleActivator.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/SoftSensorSampleBundle/include/SysTimer.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensor.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensorResource.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/SoftSensorSampleBundle/src/SoftSensorBundleActivator.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/examples/SoftSensorSampleBundle/src/SysTimer.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/include/BundleInfo.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/include/ResourceContainer.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/include/internal/BundleInfoInternal.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/include/internal/Configuration.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/include/internal/JavaBundleResource.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/include/internal/ResourceContainerImpl.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/include/internal/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/src/BaseActivator.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/src/BundleActivator.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/src/BundleInfo.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/src/BundleInfoInternal.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/src/BundleResource.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/src/Configuration.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/src/ContainerSample.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/src/JavaBundleResource.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/src/ProtocolBridgeConnector.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/src/ProtocolBridgeResource.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/src/ResourceContainer.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/src/ResourceContainerBundleAPI.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/src/ResourceContainerImpl.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/src/SoftSensorResource.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/unittests/ResourceContainerInvalidConfig.xml (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/unittests/ResourceContainerTest.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/unittests/ResourceContainerTestConfig.xml (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/unittests/SConscript (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/unittests/TestBundle/src/TestBundleActivator.cpp (100%) rename service/resource-manipulation/{modules => src}/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar (100%) rename service/resource-manipulation/{modules => src}/serverBuilder/SConscript (100%) rename service/resource-manipulation/{modules => src}/serverBuilder/include/PrimitiveRequest.h (100%) rename service/resource-manipulation/{modules => src}/serverBuilder/include/PrimitiveResponse.h (100%) rename service/resource-manipulation/{modules => src}/serverBuilder/include/ResourceObject.h (100%) rename service/resource-manipulation/{modules => src}/serverBuilder/include/internal/RequestHandler.h (100%) rename service/resource-manipulation/{modules => src}/serverBuilder/src/PrimitiveRequest.cpp (100%) rename service/resource-manipulation/{modules => src}/serverBuilder/src/PrimitiveResponse.cpp (100%) rename service/resource-manipulation/{modules => src}/serverBuilder/src/RequestHandler.cpp (100%) rename service/resource-manipulation/{modules => src}/serverBuilder/src/ResourceObject.cpp (100%) rename service/resource-manipulation/{modules => src}/serverBuilder/unittests/PrimitiveResponseTest.cpp (100%) rename service/resource-manipulation/{modules => src}/serverBuilder/unittests/RequestHandlerTest.cpp (100%) rename service/resource-manipulation/{modules => src}/serverBuilder/unittests/ResourceObjectTest.cpp (100%) diff --git a/service/resource-manipulation/SConscript b/service/resource-manipulation/SConscript index f44943b..d0ea7ec 100644 --- a/service/resource-manipulation/SConscript +++ b/service/resource-manipulation/SConscript @@ -25,11 +25,11 @@ import platform Import('env') -SConscript('modules/common/SConscript') -SConscript('modules/resourceBroker/SConscript') -SConscript('modules/resourceCache/SConscript') -SConscript('modules/serverBuilder/SConscript') -SConscript('modules/resourceContainer/SConscript') +SConscript('src/common/SConscript') +SConscript('src/resourceBroker/SConscript') +SConscript('src/resourceCache/SConscript') +SConscript('src/serverBuilder/SConscript') +SConscript('src/resourceContainer/SConscript') SConscript('sdk/SConscript') ###################################################################### @@ -55,10 +55,10 @@ target_os = env.get('TARGET_OS') # Build flags ###################################################################### resourceClient_env.AppendUnique(CPPPATH = ['include']) -resourceClient_env.AppendUnique(CPPPATH = ['modules/common/primitiveResource/include']) -resourceClient_env.AppendUnique(CPPPATH = ['modules/common/expiryTimer/include']) -resourceClient_env.AppendUnique(CPPPATH = ['modules/resourceBroker/include']) -resourceClient_env.AppendUnique(CPPPATH = ['modules/resourceCache/include']) +resourceClient_env.AppendUnique(CPPPATH = ['src/common/primitiveResource/include']) +resourceClient_env.AppendUnique(CPPPATH = ['src/common/expiryTimer/include']) +resourceClient_env.AppendUnique(CPPPATH = ['src/resourceBroker/include']) +resourceClient_env.AppendUnique(CPPPATH = ['src/resourceCache/include']) resourceClient_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) diff --git a/service/resource-manipulation/examples/linux/SConscript b/service/resource-manipulation/examples/linux/SConscript index 7014693..86569af 100644 --- a/service/resource-manipulation/examples/linux/SConscript +++ b/service/resource-manipulation/examples/linux/SConscript @@ -36,9 +36,9 @@ 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 = ['../../modules/resourceBroker/include']) -ResourceClient_env.AppendUnique(CPPPATH = ['../../modules/resourceCache/include']) -ResourceClient_env.AppendUnique(CPPPATH = ['../../modules/common/primitiveResource/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,8 +48,8 @@ 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 = ['../../modules/common/primitiveResource/include']) -ResourceServer_env.AppendUnique(CPPPATH = ['../../modules/serverBuilder/include']) +ResourceServer_env.AppendUnique(CPPPATH = ['../../src/common/primitiveResource/include']) +ResourceServer_env.AppendUnique(CPPPATH = ['../../src/serverBuilder/include']) if env.get('SECURED') == '1': ResourceClient_env.AppendUnique(LIBS = ['tinydtls']) diff --git a/service/resource-manipulation/modules/common/SConscript b/service/resource-manipulation/src/common/SConscript similarity index 100% rename from service/resource-manipulation/modules/common/SConscript rename to service/resource-manipulation/src/common/SConscript diff --git a/service/resource-manipulation/modules/common/expiryTimer/SConscript b/service/resource-manipulation/src/common/expiryTimer/SConscript similarity index 100% rename from service/resource-manipulation/modules/common/expiryTimer/SConscript rename to service/resource-manipulation/src/common/expiryTimer/SConscript diff --git a/service/resource-manipulation/modules/common/expiryTimer/include/ExpiryTimer.h b/service/resource-manipulation/src/common/expiryTimer/include/ExpiryTimer.h similarity index 99% rename from service/resource-manipulation/modules/common/expiryTimer/include/ExpiryTimer.h rename to service/resource-manipulation/src/common/expiryTimer/include/ExpiryTimer.h index dd44907..9a57080 100644 --- a/service/resource-manipulation/modules/common/expiryTimer/include/ExpiryTimer.h +++ b/service/resource-manipulation/src/common/expiryTimer/include/ExpiryTimer.h @@ -34,8 +34,6 @@ public: public: ExpiryTimer(); - -private: ~ExpiryTimer(); public: diff --git a/service/resource-manipulation/modules/common/expiryTimer/src/ExpiryTimer.cpp b/service/resource-manipulation/src/common/expiryTimer/src/ExpiryTimer.cpp similarity index 100% rename from service/resource-manipulation/modules/common/expiryTimer/src/ExpiryTimer.cpp rename to service/resource-manipulation/src/common/expiryTimer/src/ExpiryTimer.cpp diff --git a/service/resource-manipulation/modules/common/expiryTimer/src/ExpiryTimer_Impl.cpp b/service/resource-manipulation/src/common/expiryTimer/src/ExpiryTimer_Impl.cpp similarity index 100% rename from service/resource-manipulation/modules/common/expiryTimer/src/ExpiryTimer_Impl.cpp rename to service/resource-manipulation/src/common/expiryTimer/src/ExpiryTimer_Impl.cpp diff --git a/service/resource-manipulation/modules/common/expiryTimer/src/ExpiryTimer_Impl.h b/service/resource-manipulation/src/common/expiryTimer/src/ExpiryTimer_Impl.h similarity index 100% rename from service/resource-manipulation/modules/common/expiryTimer/src/ExpiryTimer_Impl.h rename to service/resource-manipulation/src/common/expiryTimer/src/ExpiryTimer_Impl.h diff --git a/service/resource-manipulation/modules/common/primitiveResource/SConscript b/service/resource-manipulation/src/common/primitiveResource/SConscript similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/SConscript rename to service/resource-manipulation/src/common/primitiveResource/SConscript diff --git a/service/resource-manipulation/modules/common/primitiveResource/include/PresenceSubscriber.h b/service/resource-manipulation/src/common/primitiveResource/include/PresenceSubscriber.h similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/include/PresenceSubscriber.h rename to service/resource-manipulation/src/common/primitiveResource/include/PresenceSubscriber.h diff --git a/service/resource-manipulation/modules/common/primitiveResource/include/PrimitiveException.h b/service/resource-manipulation/src/common/primitiveResource/include/PrimitiveException.h similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/include/PrimitiveException.h rename to service/resource-manipulation/src/common/primitiveResource/include/PrimitiveException.h diff --git a/service/resource-manipulation/modules/common/primitiveResource/include/PrimitiveResource.h b/service/resource-manipulation/src/common/primitiveResource/include/PrimitiveResource.h similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/include/PrimitiveResource.h rename to service/resource-manipulation/src/common/primitiveResource/include/PrimitiveResource.h diff --git a/service/resource-manipulation/modules/common/primitiveResource/include/ResourceAttributes.h b/service/resource-manipulation/src/common/primitiveResource/include/ResourceAttributes.h similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/include/ResourceAttributes.h rename to service/resource-manipulation/src/common/primitiveResource/include/ResourceAttributes.h diff --git a/service/resource-manipulation/modules/common/primitiveResource/include/ResponseStatement.h b/service/resource-manipulation/src/common/primitiveResource/include/ResponseStatement.h similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/include/ResponseStatement.h rename to service/resource-manipulation/src/common/primitiveResource/include/ResponseStatement.h diff --git a/service/resource-manipulation/modules/common/primitiveResource/include/internal/AssertUtils.h b/service/resource-manipulation/src/common/primitiveResource/include/internal/AssertUtils.h similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/include/internal/AssertUtils.h rename to service/resource-manipulation/src/common/primitiveResource/include/internal/AssertUtils.h diff --git a/service/resource-manipulation/modules/common/primitiveResource/include/internal/PrimitiveResourceImpl.h b/service/resource-manipulation/src/common/primitiveResource/include/internal/PrimitiveResourceImpl.h similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/include/internal/PrimitiveResourceImpl.h rename to service/resource-manipulation/src/common/primitiveResource/include/internal/PrimitiveResourceImpl.h diff --git a/service/resource-manipulation/modules/common/primitiveResource/include/internal/ResourceAttributesConverter.h b/service/resource-manipulation/src/common/primitiveResource/include/internal/ResourceAttributesConverter.h similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/include/internal/ResourceAttributesConverter.h rename to service/resource-manipulation/src/common/primitiveResource/include/internal/ResourceAttributesConverter.h diff --git a/service/resource-manipulation/modules/common/primitiveResource/include/internal/ResourceAttributesUtils.h b/service/resource-manipulation/src/common/primitiveResource/include/internal/ResourceAttributesUtils.h similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/include/internal/ResourceAttributesUtils.h rename to service/resource-manipulation/src/common/primitiveResource/include/internal/ResourceAttributesUtils.h diff --git a/service/resource-manipulation/modules/common/primitiveResource/src/PresenceSubscriber.cpp b/service/resource-manipulation/src/common/primitiveResource/src/PresenceSubscriber.cpp similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/src/PresenceSubscriber.cpp rename to service/resource-manipulation/src/common/primitiveResource/src/PresenceSubscriber.cpp diff --git a/service/resource-manipulation/modules/common/primitiveResource/src/PrimitiveResource.cpp b/service/resource-manipulation/src/common/primitiveResource/src/PrimitiveResource.cpp similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/src/PrimitiveResource.cpp rename to service/resource-manipulation/src/common/primitiveResource/src/PrimitiveResource.cpp diff --git a/service/resource-manipulation/modules/common/primitiveResource/src/PrimtiveException.cpp b/service/resource-manipulation/src/common/primitiveResource/src/PrimtiveException.cpp similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/src/PrimtiveException.cpp rename to service/resource-manipulation/src/common/primitiveResource/src/PrimtiveException.cpp diff --git a/service/resource-manipulation/modules/common/primitiveResource/src/ResourceAttributes.cpp b/service/resource-manipulation/src/common/primitiveResource/src/ResourceAttributes.cpp similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/src/ResourceAttributes.cpp rename to service/resource-manipulation/src/common/primitiveResource/src/ResourceAttributes.cpp diff --git a/service/resource-manipulation/modules/common/primitiveResource/src/ResponseStatement.cpp b/service/resource-manipulation/src/common/primitiveResource/src/ResponseStatement.cpp similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/src/ResponseStatement.cpp rename to service/resource-manipulation/src/common/primitiveResource/src/ResponseStatement.cpp diff --git a/service/resource-manipulation/modules/common/primitiveResource/unittests/PresenceSubscriberTest.cpp b/service/resource-manipulation/src/common/primitiveResource/unittests/PresenceSubscriberTest.cpp similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/unittests/PresenceSubscriberTest.cpp rename to service/resource-manipulation/src/common/primitiveResource/unittests/PresenceSubscriberTest.cpp diff --git a/service/resource-manipulation/modules/common/primitiveResource/unittests/PrimitiveResourceTest.cpp b/service/resource-manipulation/src/common/primitiveResource/unittests/PrimitiveResourceTest.cpp similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/unittests/PrimitiveResourceTest.cpp rename to service/resource-manipulation/src/common/primitiveResource/unittests/PrimitiveResourceTest.cpp diff --git a/service/resource-manipulation/modules/common/primitiveResource/unittests/ResourceAttributesTest.cpp b/service/resource-manipulation/src/common/primitiveResource/unittests/ResourceAttributesTest.cpp similarity index 100% rename from service/resource-manipulation/modules/common/primitiveResource/unittests/ResourceAttributesTest.cpp rename to service/resource-manipulation/src/common/primitiveResource/unittests/ResourceAttributesTest.cpp diff --git a/service/resource-manipulation/modules/resourceBroker/SConscript b/service/resource-manipulation/src/resourceBroker/SConscript similarity index 100% rename from service/resource-manipulation/modules/resourceBroker/SConscript rename to service/resource-manipulation/src/resourceBroker/SConscript diff --git a/service/resource-manipulation/modules/resourceBroker/include/BrokerTypes.h b/service/resource-manipulation/src/resourceBroker/include/BrokerTypes.h similarity index 100% rename from service/resource-manipulation/modules/resourceBroker/include/BrokerTypes.h rename to service/resource-manipulation/src/resourceBroker/include/BrokerTypes.h diff --git a/service/resource-manipulation/modules/resourceBroker/include/DeviceAssociation.h b/service/resource-manipulation/src/resourceBroker/include/DeviceAssociation.h similarity index 100% rename from service/resource-manipulation/modules/resourceBroker/include/DeviceAssociation.h rename to service/resource-manipulation/src/resourceBroker/include/DeviceAssociation.h diff --git a/service/resource-manipulation/modules/resourceBroker/include/DevicePresence.h b/service/resource-manipulation/src/resourceBroker/include/DevicePresence.h similarity index 100% rename from service/resource-manipulation/modules/resourceBroker/include/DevicePresence.h rename to service/resource-manipulation/src/resourceBroker/include/DevicePresence.h diff --git a/service/resource-manipulation/modules/resourceBroker/include/ResourceBroker.h b/service/resource-manipulation/src/resourceBroker/include/ResourceBroker.h similarity index 100% rename from service/resource-manipulation/modules/resourceBroker/include/ResourceBroker.h rename to service/resource-manipulation/src/resourceBroker/include/ResourceBroker.h diff --git a/service/resource-manipulation/modules/resourceBroker/include/ResourcePresence.h b/service/resource-manipulation/src/resourceBroker/include/ResourcePresence.h similarity index 100% rename from service/resource-manipulation/modules/resourceBroker/include/ResourcePresence.h rename to service/resource-manipulation/src/resourceBroker/include/ResourcePresence.h diff --git a/service/resource-manipulation/modules/resourceBroker/src/DeviceAssociation.cpp b/service/resource-manipulation/src/resourceBroker/src/DeviceAssociation.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceBroker/src/DeviceAssociation.cpp rename to service/resource-manipulation/src/resourceBroker/src/DeviceAssociation.cpp diff --git a/service/resource-manipulation/modules/resourceBroker/src/DevicePresence.cpp b/service/resource-manipulation/src/resourceBroker/src/DevicePresence.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceBroker/src/DevicePresence.cpp rename to service/resource-manipulation/src/resourceBroker/src/DevicePresence.cpp diff --git a/service/resource-manipulation/modules/resourceBroker/src/ResourceBroker.cpp b/service/resource-manipulation/src/resourceBroker/src/ResourceBroker.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceBroker/src/ResourceBroker.cpp rename to service/resource-manipulation/src/resourceBroker/src/ResourceBroker.cpp diff --git a/service/resource-manipulation/modules/resourceBroker/src/ResourcePresence.cpp b/service/resource-manipulation/src/resourceBroker/src/ResourcePresence.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceBroker/src/ResourcePresence.cpp rename to service/resource-manipulation/src/resourceBroker/src/ResourcePresence.cpp diff --git a/service/resource-manipulation/modules/resourceCache/SConscript b/service/resource-manipulation/src/resourceCache/SConscript similarity index 100% rename from service/resource-manipulation/modules/resourceCache/SConscript rename to service/resource-manipulation/src/resourceCache/SConscript diff --git a/service/resource-manipulation/modules/resourceCache/include/CacheTypes.h b/service/resource-manipulation/src/resourceCache/include/CacheTypes.h similarity index 100% rename from service/resource-manipulation/modules/resourceCache/include/CacheTypes.h rename to service/resource-manipulation/src/resourceCache/include/CacheTypes.h diff --git a/service/resource-manipulation/modules/resourceCache/include/DataCache.h b/service/resource-manipulation/src/resourceCache/include/DataCache.h similarity index 100% rename from service/resource-manipulation/modules/resourceCache/include/DataCache.h rename to service/resource-manipulation/src/resourceCache/include/DataCache.h diff --git a/service/resource-manipulation/modules/resourceCache/include/ResourceCacheManager.h b/service/resource-manipulation/src/resourceCache/include/ResourceCacheManager.h similarity index 100% rename from service/resource-manipulation/modules/resourceCache/include/ResourceCacheManager.h rename to service/resource-manipulation/src/resourceCache/include/ResourceCacheManager.h diff --git a/service/resource-manipulation/modules/resourceCache/src/DataCache.cpp b/service/resource-manipulation/src/resourceCache/src/DataCache.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceCache/src/DataCache.cpp rename to service/resource-manipulation/src/resourceCache/src/DataCache.cpp diff --git a/service/resource-manipulation/modules/resourceCache/src/ResourceCacheManager.cpp b/service/resource-manipulation/src/resourceCache/src/ResourceCacheManager.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceCache/src/ResourceCacheManager.cpp rename to service/resource-manipulation/src/resourceCache/src/ResourceCacheManager.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/SConscript b/service/resource-manipulation/src/resourceContainer/SConscript similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/SConscript rename to service/resource-manipulation/src/resourceContainer/SConscript diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-api/include/BundleActivator.h b/service/resource-manipulation/src/resourceContainer/bundle-api/include/BundleActivator.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/bundle-api/include/BundleActivator.h rename to service/resource-manipulation/src/resourceContainer/bundle-api/include/BundleActivator.h diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-api/include/BundleResource.h b/service/resource-manipulation/src/resourceContainer/bundle-api/include/BundleResource.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/bundle-api/include/BundleResource.h rename to service/resource-manipulation/src/resourceContainer/bundle-api/include/BundleResource.h diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-api/include/NotificationReceiver.h b/service/resource-manipulation/src/resourceContainer/bundle-api/include/NotificationReceiver.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/bundle-api/include/NotificationReceiver.h rename to service/resource-manipulation/src/resourceContainer/bundle-api/include/NotificationReceiver.h diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-api/include/ProtocolBridgeConnector.h b/service/resource-manipulation/src/resourceContainer/bundle-api/include/ProtocolBridgeConnector.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/bundle-api/include/ProtocolBridgeConnector.h rename to service/resource-manipulation/src/resourceContainer/bundle-api/include/ProtocolBridgeConnector.h diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-api/include/ProtocolBridgeResource.h b/service/resource-manipulation/src/resourceContainer/bundle-api/include/ProtocolBridgeResource.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/bundle-api/include/ProtocolBridgeResource.h rename to service/resource-manipulation/src/resourceContainer/bundle-api/include/ProtocolBridgeResource.h diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-api/include/ResourceContainerBundleAPI.h b/service/resource-manipulation/src/resourceContainer/bundle-api/include/ResourceContainerBundleAPI.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/bundle-api/include/ResourceContainerBundleAPI.h rename to service/resource-manipulation/src/resourceContainer/bundle-api/include/ResourceContainerBundleAPI.h diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-api/include/SoftSensorResource.h b/service/resource-manipulation/src/resourceContainer/bundle-api/include/SoftSensorResource.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/bundle-api/include/SoftSensorResource.h rename to service/resource-manipulation/src/resourceContainer/bundle-api/include/SoftSensorResource.h diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-java-api/pom.xml b/service/resource-manipulation/src/resourceContainer/bundle-java-api/pom.xml similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/bundle-java-api/pom.xml rename to service/resource-manipulation/src/resourceContainer/bundle-java-api/pom.xml diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java b/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java rename to service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java b/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java rename to service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java b/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java rename to service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java b/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java rename to service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java diff --git a/service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java b/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java rename to service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java diff --git a/service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml b/service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml rename to service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml diff --git a/service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java b/service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java rename to service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java diff --git a/service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java b/service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java rename to service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java diff --git a/service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java b/service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java rename to service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java diff --git a/service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/include/HueConnector.h b/service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/include/HueConnector.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/include/HueConnector.h rename to service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/include/HueConnector.h diff --git a/service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/include/HueLight.h b/service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/include/HueLight.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/include/HueLight.h rename to service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/include/HueLight.h diff --git a/service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h b/service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h rename to service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h diff --git a/service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp b/service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp rename to service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp b/service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp rename to service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp b/service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp rename to service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/examples/ResourceContainerConfig.xml b/service/resource-manipulation/src/resourceContainer/examples/ResourceContainerConfig.xml similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/ResourceContainerConfig.xml rename to service/resource-manipulation/src/resourceContainer/examples/ResourceContainerConfig.xml diff --git a/service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensor.h b/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensor.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensor.h rename to service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensor.h diff --git a/service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensorResource.h b/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensorResource.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensorResource.h rename to service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensorResource.h diff --git a/service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/include/SoftSensorBundleActivator.h b/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/SoftSensorBundleActivator.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/include/SoftSensorBundleActivator.h rename to service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/SoftSensorBundleActivator.h diff --git a/service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/include/SysTimer.h b/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/SysTimer.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/include/SysTimer.h rename to service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/SysTimer.h diff --git a/service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensor.cpp b/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensor.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensor.cpp rename to service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensor.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensorResource.cpp b/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensorResource.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensorResource.cpp rename to service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensorResource.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/src/SoftSensorBundleActivator.cpp b/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SoftSensorBundleActivator.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/src/SoftSensorBundleActivator.cpp rename to service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SoftSensorBundleActivator.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/src/SysTimer.cpp b/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SysTimer.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/examples/SoftSensorSampleBundle/src/SysTimer.cpp rename to service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SysTimer.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/include/BundleInfo.h b/service/resource-manipulation/src/resourceContainer/include/BundleInfo.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/include/BundleInfo.h rename to service/resource-manipulation/src/resourceContainer/include/BundleInfo.h diff --git a/service/resource-manipulation/modules/resourceContainer/include/ResourceContainer.h b/service/resource-manipulation/src/resourceContainer/include/ResourceContainer.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/include/ResourceContainer.h rename to service/resource-manipulation/src/resourceContainer/include/ResourceContainer.h diff --git a/service/resource-manipulation/modules/resourceContainer/include/internal/BundleInfoInternal.h b/service/resource-manipulation/src/resourceContainer/include/internal/BundleInfoInternal.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/include/internal/BundleInfoInternal.h rename to service/resource-manipulation/src/resourceContainer/include/internal/BundleInfoInternal.h diff --git a/service/resource-manipulation/modules/resourceContainer/include/internal/Configuration.h b/service/resource-manipulation/src/resourceContainer/include/internal/Configuration.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/include/internal/Configuration.h rename to service/resource-manipulation/src/resourceContainer/include/internal/Configuration.h diff --git a/service/resource-manipulation/modules/resourceContainer/include/internal/JavaBundleResource.h b/service/resource-manipulation/src/resourceContainer/include/internal/JavaBundleResource.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/include/internal/JavaBundleResource.h rename to service/resource-manipulation/src/resourceContainer/include/internal/JavaBundleResource.h diff --git a/service/resource-manipulation/modules/resourceContainer/include/internal/ResourceContainerImpl.h b/service/resource-manipulation/src/resourceContainer/include/internal/ResourceContainerImpl.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/include/internal/ResourceContainerImpl.h rename to service/resource-manipulation/src/resourceContainer/include/internal/ResourceContainerImpl.h diff --git a/service/resource-manipulation/modules/resourceContainer/include/internal/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h b/service/resource-manipulation/src/resourceContainer/include/internal/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/include/internal/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h rename to service/resource-manipulation/src/resourceContainer/include/internal/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h diff --git a/service/resource-manipulation/modules/resourceContainer/src/BaseActivator.cpp b/service/resource-manipulation/src/resourceContainer/src/BaseActivator.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/src/BaseActivator.cpp rename to service/resource-manipulation/src/resourceContainer/src/BaseActivator.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/src/BundleActivator.cpp b/service/resource-manipulation/src/resourceContainer/src/BundleActivator.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/src/BundleActivator.cpp rename to service/resource-manipulation/src/resourceContainer/src/BundleActivator.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/src/BundleInfo.cpp b/service/resource-manipulation/src/resourceContainer/src/BundleInfo.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/src/BundleInfo.cpp rename to service/resource-manipulation/src/resourceContainer/src/BundleInfo.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/src/BundleInfoInternal.cpp b/service/resource-manipulation/src/resourceContainer/src/BundleInfoInternal.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/src/BundleInfoInternal.cpp rename to service/resource-manipulation/src/resourceContainer/src/BundleInfoInternal.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/src/BundleResource.cpp b/service/resource-manipulation/src/resourceContainer/src/BundleResource.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/src/BundleResource.cpp rename to service/resource-manipulation/src/resourceContainer/src/BundleResource.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/src/Configuration.cpp b/service/resource-manipulation/src/resourceContainer/src/Configuration.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/src/Configuration.cpp rename to service/resource-manipulation/src/resourceContainer/src/Configuration.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/src/ContainerSample.cpp b/service/resource-manipulation/src/resourceContainer/src/ContainerSample.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/src/ContainerSample.cpp rename to service/resource-manipulation/src/resourceContainer/src/ContainerSample.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/src/JavaBundleResource.cpp b/service/resource-manipulation/src/resourceContainer/src/JavaBundleResource.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/src/JavaBundleResource.cpp rename to service/resource-manipulation/src/resourceContainer/src/JavaBundleResource.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/src/ProtocolBridgeConnector.cpp b/service/resource-manipulation/src/resourceContainer/src/ProtocolBridgeConnector.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/src/ProtocolBridgeConnector.cpp rename to service/resource-manipulation/src/resourceContainer/src/ProtocolBridgeConnector.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/src/ProtocolBridgeResource.cpp b/service/resource-manipulation/src/resourceContainer/src/ProtocolBridgeResource.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/src/ProtocolBridgeResource.cpp rename to service/resource-manipulation/src/resourceContainer/src/ProtocolBridgeResource.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/src/ResourceContainer.cpp b/service/resource-manipulation/src/resourceContainer/src/ResourceContainer.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/src/ResourceContainer.cpp rename to service/resource-manipulation/src/resourceContainer/src/ResourceContainer.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/src/ResourceContainerBundleAPI.cpp b/service/resource-manipulation/src/resourceContainer/src/ResourceContainerBundleAPI.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/src/ResourceContainerBundleAPI.cpp rename to service/resource-manipulation/src/resourceContainer/src/ResourceContainerBundleAPI.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/src/ResourceContainerImpl.cpp b/service/resource-manipulation/src/resourceContainer/src/ResourceContainerImpl.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/src/ResourceContainerImpl.cpp rename to service/resource-manipulation/src/resourceContainer/src/ResourceContainerImpl.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/src/SoftSensorResource.cpp b/service/resource-manipulation/src/resourceContainer/src/SoftSensorResource.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/src/SoftSensorResource.cpp rename to service/resource-manipulation/src/resourceContainer/src/SoftSensorResource.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/unittests/ResourceContainerInvalidConfig.xml b/service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerInvalidConfig.xml similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/unittests/ResourceContainerInvalidConfig.xml rename to service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerInvalidConfig.xml diff --git a/service/resource-manipulation/modules/resourceContainer/unittests/ResourceContainerTest.cpp b/service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerTest.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/unittests/ResourceContainerTest.cpp rename to service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerTest.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/unittests/ResourceContainerTestConfig.xml b/service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/unittests/ResourceContainerTestConfig.xml rename to service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml diff --git a/service/resource-manipulation/modules/resourceContainer/unittests/SConscript b/service/resource-manipulation/src/resourceContainer/unittests/SConscript similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/unittests/SConscript rename to service/resource-manipulation/src/resourceContainer/unittests/SConscript diff --git a/service/resource-manipulation/modules/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h b/service/resource-manipulation/src/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h rename to service/resource-manipulation/src/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h diff --git a/service/resource-manipulation/modules/resourceContainer/unittests/TestBundle/src/TestBundleActivator.cpp b/service/resource-manipulation/src/resourceContainer/unittests/TestBundle/src/TestBundleActivator.cpp similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/unittests/TestBundle/src/TestBundleActivator.cpp rename to service/resource-manipulation/src/resourceContainer/unittests/TestBundle/src/TestBundleActivator.cpp diff --git a/service/resource-manipulation/modules/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar b/service/resource-manipulation/src/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar similarity index 100% rename from service/resource-manipulation/modules/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar rename to service/resource-manipulation/src/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar diff --git a/service/resource-manipulation/modules/serverBuilder/SConscript b/service/resource-manipulation/src/serverBuilder/SConscript similarity index 100% rename from service/resource-manipulation/modules/serverBuilder/SConscript rename to service/resource-manipulation/src/serverBuilder/SConscript diff --git a/service/resource-manipulation/modules/serverBuilder/include/PrimitiveRequest.h b/service/resource-manipulation/src/serverBuilder/include/PrimitiveRequest.h similarity index 100% rename from service/resource-manipulation/modules/serverBuilder/include/PrimitiveRequest.h rename to service/resource-manipulation/src/serverBuilder/include/PrimitiveRequest.h diff --git a/service/resource-manipulation/modules/serverBuilder/include/PrimitiveResponse.h b/service/resource-manipulation/src/serverBuilder/include/PrimitiveResponse.h similarity index 100% rename from service/resource-manipulation/modules/serverBuilder/include/PrimitiveResponse.h rename to service/resource-manipulation/src/serverBuilder/include/PrimitiveResponse.h diff --git a/service/resource-manipulation/modules/serverBuilder/include/ResourceObject.h b/service/resource-manipulation/src/serverBuilder/include/ResourceObject.h similarity index 100% rename from service/resource-manipulation/modules/serverBuilder/include/ResourceObject.h rename to service/resource-manipulation/src/serverBuilder/include/ResourceObject.h diff --git a/service/resource-manipulation/modules/serverBuilder/include/internal/RequestHandler.h b/service/resource-manipulation/src/serverBuilder/include/internal/RequestHandler.h similarity index 100% rename from service/resource-manipulation/modules/serverBuilder/include/internal/RequestHandler.h rename to service/resource-manipulation/src/serverBuilder/include/internal/RequestHandler.h diff --git a/service/resource-manipulation/modules/serverBuilder/src/PrimitiveRequest.cpp b/service/resource-manipulation/src/serverBuilder/src/PrimitiveRequest.cpp similarity index 100% rename from service/resource-manipulation/modules/serverBuilder/src/PrimitiveRequest.cpp rename to service/resource-manipulation/src/serverBuilder/src/PrimitiveRequest.cpp diff --git a/service/resource-manipulation/modules/serverBuilder/src/PrimitiveResponse.cpp b/service/resource-manipulation/src/serverBuilder/src/PrimitiveResponse.cpp similarity index 100% rename from service/resource-manipulation/modules/serverBuilder/src/PrimitiveResponse.cpp rename to service/resource-manipulation/src/serverBuilder/src/PrimitiveResponse.cpp diff --git a/service/resource-manipulation/modules/serverBuilder/src/RequestHandler.cpp b/service/resource-manipulation/src/serverBuilder/src/RequestHandler.cpp similarity index 100% rename from service/resource-manipulation/modules/serverBuilder/src/RequestHandler.cpp rename to service/resource-manipulation/src/serverBuilder/src/RequestHandler.cpp diff --git a/service/resource-manipulation/modules/serverBuilder/src/ResourceObject.cpp b/service/resource-manipulation/src/serverBuilder/src/ResourceObject.cpp similarity index 100% rename from service/resource-manipulation/modules/serverBuilder/src/ResourceObject.cpp rename to service/resource-manipulation/src/serverBuilder/src/ResourceObject.cpp diff --git a/service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveResponseTest.cpp b/service/resource-manipulation/src/serverBuilder/unittests/PrimitiveResponseTest.cpp similarity index 100% rename from service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveResponseTest.cpp rename to service/resource-manipulation/src/serverBuilder/unittests/PrimitiveResponseTest.cpp diff --git a/service/resource-manipulation/modules/serverBuilder/unittests/RequestHandlerTest.cpp b/service/resource-manipulation/src/serverBuilder/unittests/RequestHandlerTest.cpp similarity index 100% rename from service/resource-manipulation/modules/serverBuilder/unittests/RequestHandlerTest.cpp rename to service/resource-manipulation/src/serverBuilder/unittests/RequestHandlerTest.cpp diff --git a/service/resource-manipulation/modules/serverBuilder/unittests/ResourceObjectTest.cpp b/service/resource-manipulation/src/serverBuilder/unittests/ResourceObjectTest.cpp similarity index 100% rename from service/resource-manipulation/modules/serverBuilder/unittests/ResourceObjectTest.cpp rename to service/resource-manipulation/src/serverBuilder/unittests/ResourceObjectTest.cpp -- 2.7.4