[Resource-Manipulation] Renamed Resource-Manipulation to Resource-Encapsulation

Change-Id: I2520ee961d6556b26c3ba52be8e6d16238615d30
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1888
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/SConscript b/service/SConscript
index 70baa22..5389725 100644 (file)
--- a/service/SConscript
+++ b/service/SConscript
@@ -42,9 +42,9 @@ if target_os not in ['arduino','darwin','ios']:
        if target_os not in ['android', 'tizen']:
                SConscript('notification-manager/SConscript')
 
-       # Build resource-manipulation project
+       # Build resource-encapsulation project
        if target_os not in ['android', 'tizen']:
-               SConscript('resource-manipulation/SConscript')
+               SConscript('resource-encapsulation/SConscript')
 #else:
 #      SConscript('notification-manager/SampleApp/arduino/SConscript')
 

diff --git a/service/notification-manager/SConscript b/service/notification-manager/SConscript
index 0949530..666d0ba 100644 (file)
--- a/service/notification-manager/SConscript
+++ b/service/notification-manager/SConscript
@@ -42,13 +42,13 @@ target_os = env.get('TARGET_OS')
 # Build flags
 ######################################################################
 notimgr_env.AppendUnique(CPPPATH = ['NotificationManager/include'])
-notimgr_env.AppendUnique(CPPPATH = ['../resource-manipulation/include'])
-notimgr_env.AppendUnique(CPPPATH = ['../resource-manipulation/src/common/primitiveResource/include'])
-notimgr_env.AppendUnique(CPPPATH = ['../resource-manipulation/src/serverBuilder/include'])
-notimgr_env.AppendUnique(CPPPATH = ['../resource-manipulation/src/resourceBroker/include'])
-notimgr_env.AppendUnique(CPPPATH = ['../resource-manipulation/src/resourceCache/include'])
-notimgr_env.AppendUnique(CPPPATH = ['../resource-manipulation/src/common/expiryTimer/include'])
-notimgr_env.AppendUnique(CPPPATH = ['../resource-manipulation/src/common/expiryTimer/src'])
+notimgr_env.AppendUnique(CPPPATH = ['../resource-encapsulation/include'])
+notimgr_env.AppendUnique(CPPPATH = ['../resource-encapsulation/src/common/primitiveResource/include'])
+notimgr_env.AppendUnique(CPPPATH = ['../resource-encapsulation/src/serverBuilder/include'])
+notimgr_env.AppendUnique(CPPPATH = ['../resource-encapsulation/src/resourceBroker/include'])
+notimgr_env.AppendUnique(CPPPATH = ['../resource-encapsulation/src/resourceCache/include'])
+notimgr_env.AppendUnique(CPPPATH = ['../resource-encapsulation/src/common/expiryTimer/include'])
+notimgr_env.AppendUnique(CPPPATH = ['../resource-encapsulation/src/common/expiryTimer/src'])
 #notimgr_env.AppendUnique(CPPPATH = ['../../extlibs/cjson'])
 #notimgr_env.AppendUnique(CPPPATH = ['../../resource/csdk/logger/include'])
 notimgr_env.PrependUnique(LIBS = [

diff --git a/service/resource-manipulation/README b/service/resource-encapsulation/README
similarity index 72%
rename from service/resource-manipulation/README
rename to service/resource-encapsulation/README
index 1c65801..b482100 100644 (file)
--- a/service/resource-manipulation/README
+++ b/service/resource-encapsulation/README
@@ -1,6 +1,6 @@
 == Brief Guide to Service Basis 
 
-Service Basis provides common functions such as resource broker, cache, resource container.
+resource encapsulation provides common functions such as resource broker, cache, resource container.
 
 1. resourceBroker 
 resourceBroker checks and monitors the status of resources. 
@@ -8,7 +8,7 @@ This module notifies the change of reachability of selected resource to users.
 
 2. resourceCache
 resourceCache provides the up-to-date "DATA" of remote resource to users.
-It tracks the most recent value of the selected resource and notifies to users according to the request notifying policy.
+It tracks the most recent value of the selected resource and notifies to users according to called API
 
 3. resourceContainer
 Need to be updated.

diff --git a/service/resource-manipulation/SConscript b/service/resource-encapsulation/SConscript
similarity index 99%
rename from service/resource-manipulation/SConscript
rename to service/resource-encapsulation/SConscript
index e3c69ff..d7275f5 100644 (file)
--- a/service/resource-manipulation/SConscript
+++ b/service/resource-encapsulation/SConscript
@@ -19,7 +19,7 @@
 #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 ######################################################################
-#  Resource-manipulation build script
+#  Resource-encapsulation build script
 ######################################################################
 import platform
 Import('env')

diff --git a/service/resource-manipulation/examples/SConscript b/service/resource-encapsulation/examples/SConscript
similarity index 100%
rename from service/resource-manipulation/examples/SConscript
rename to service/resource-encapsulation/examples/SConscript

diff --git a/service/resource-manipulation/examples/linux/SConscript b/service/resource-encapsulation/examples/linux/SConscript
similarity index 100%
rename from service/resource-manipulation/examples/linux/SConscript
rename to service/resource-encapsulation/examples/linux/SConscript

diff --git a/service/resource-manipulation/examples/linux/SampleResourceClient.cpp b/service/resource-encapsulation/examples/linux/SampleResourceClient.cpp
similarity index 100%
rename from service/resource-manipulation/examples/linux/SampleResourceClient.cpp
rename to service/resource-encapsulation/examples/linux/SampleResourceClient.cpp

diff --git a/service/resource-manipulation/examples/linux/SampleResourceServer.cpp b/service/resource-encapsulation/examples/linux/SampleResourceServer.cpp
similarity index 100%
rename from service/resource-manipulation/examples/linux/SampleResourceServer.cpp
rename to service/resource-encapsulation/examples/linux/SampleResourceServer.cpp

diff --git a/service/resource-manipulation/include/BundleInfo.h b/service/resource-encapsulation/include/BundleInfo.h
similarity index 100%
rename from service/resource-manipulation/include/BundleInfo.h
rename to service/resource-encapsulation/include/BundleInfo.h

diff --git a/service/resource-manipulation/include/RCSAddress.h b/service/resource-encapsulation/include/RCSAddress.h
similarity index 100%
rename from service/resource-manipulation/include/RCSAddress.h
rename to service/resource-encapsulation/include/RCSAddress.h

diff --git a/service/resource-manipulation/include/RCSException.h b/service/resource-encapsulation/include/RCSException.h
similarity index 96%
rename from service/resource-manipulation/include/RCSException.h
rename to service/resource-encapsulation/include/RCSException.h
index 5c65a9c..a47b1e4 100644 (file)
--- a/service/resource-manipulation/include/RCSException.h
+++ b/service/resource-encapsulation/include/RCSException.h
@@ -21,11 +21,11 @@
 /**
  * @file
  *
- * This file defines a class to handle exception thrown for resource manipulation.
+ * This file defines a class to handle exception thrown for resource encapsulation.
  */
 
-#ifndef RES_MANIPULATION_RCSEXCEPTION_H
-#define RES_MANIPULATION_RCSEXCEPTION_H
+#ifndef RES_ENCAPSULATION_RCSEXCEPTION_H
+#define RES_ENCAPSULATION_RCSEXCEPTION_H
 
 #include <string>
 
@@ -119,4 +119,4 @@ namespace OIC
     }
 }
 
-#endif // RES_MANIPULATION_RCSEXCEPTION_H
+#endif // RES_ENCAPSULATION_RCSEXCEPTION_H

diff --git a/service/resource-manipulation/include/RCSRequest.h b/service/resource-encapsulation/include/RCSRequest.h
similarity index 100%
rename from service/resource-manipulation/include/RCSRequest.h
rename to service/resource-encapsulation/include/RCSRequest.h

diff --git a/service/resource-manipulation/include/RCSResponse.h b/service/resource-encapsulation/include/RCSResponse.h
similarity index 100%
rename from service/resource-manipulation/include/RCSResponse.h
rename to service/resource-encapsulation/include/RCSResponse.h

diff --git a/service/resource-manipulation/include/ResourceAttributes.h b/service/resource-encapsulation/include/ResourceAttributes.h
similarity index 99%
rename from service/resource-manipulation/include/ResourceAttributes.h
rename to service/resource-encapsulation/include/ResourceAttributes.h
index 0b2d204..56fa3ae 100644 (file)
--- a/service/resource-manipulation/include/ResourceAttributes.h
+++ b/service/resource-encapsulation/include/ResourceAttributes.h
@@ -18,8 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef RES_MANIPULATION_RESOURCEATTRIBUTES_H
-#define RES_MANIPULATION_RESOURCEATTRIBUTES_H
+#ifndef RES_ENCAPSULATION_RESOURCEATTRIBUTES_H
+#define RES_ENCAPSULATION_RESOURCEATTRIBUTES_H
 
 // To avoid conflict using different boost::variant configuration with OC.
 // It causes compile errors.
@@ -750,4 +750,4 @@ namespace OIC
     }
 }
 
-#endif // RES_MANIPULATION_RESOURCEATTRIBUTES_H
+#endif // RES_ENCAPSULATION_RESOURCEATTRIBUTES_H

diff --git a/service/resource-manipulation/include/ResourceClient.h b/service/resource-encapsulation/include/ResourceClient.h
similarity index 99%
rename from service/resource-manipulation/include/ResourceClient.h
rename to service/resource-encapsulation/include/ResourceClient.h
index e754543..72f7588 100644 (file)
--- a/service/resource-manipulation/include/ResourceClient.h
+++ b/service/resource-encapsulation/include/ResourceClient.h
@@ -23,7 +23,7 @@
  *
  * This file contains the Resource Client APIs provided to the developers.
  * It is a common API layer for the Resource Broker and Resource Cache module of Resource
- * Manipulation layer.
+ * Encapsulation layer.
  */
 
 #ifndef RESOURCE_CLIENT_H_

diff --git a/service/resource-manipulation/include/ResourceContainer.h b/service/resource-encapsulation/include/ResourceContainer.h
similarity index 100%
rename from service/resource-manipulation/include/ResourceContainer.h
rename to service/resource-encapsulation/include/ResourceContainer.h

diff --git a/service/resource-manipulation/include/ResourceObject.h b/service/resource-encapsulation/include/ResourceObject.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/include/ResourceObject.h
rename to service/resource-encapsulation/include/ResourceObject.h

diff --git a/service/resource-manipulation/src/ResourceClient.cpp b/service/resource-encapsulation/src/ResourceClient.cpp
similarity index 100%
rename from service/resource-manipulation/src/ResourceClient.cpp
rename to service/resource-encapsulation/src/ResourceClient.cpp

diff --git a/service/resource-manipulation/src/common/SConscript b/service/resource-encapsulation/src/common/SConscript
similarity index 100%
rename from service/resource-manipulation/src/common/SConscript
rename to service/resource-encapsulation/src/common/SConscript

diff --git a/service/resource-manipulation/src/common/expiryTimer/include/ExpiryTimer.h b/service/resource-encapsulation/src/common/expiryTimer/include/ExpiryTimer.h
similarity index 100%
rename from service/resource-manipulation/src/common/expiryTimer/include/ExpiryTimer.h
rename to service/resource-encapsulation/src/common/expiryTimer/include/ExpiryTimer.h

diff --git a/service/resource-manipulation/src/common/expiryTimer/src/ExpiryTimer.cpp b/service/resource-encapsulation/src/common/expiryTimer/src/ExpiryTimer.cpp
similarity index 100%
rename from service/resource-manipulation/src/common/expiryTimer/src/ExpiryTimer.cpp
rename to service/resource-encapsulation/src/common/expiryTimer/src/ExpiryTimer.cpp

diff --git a/service/resource-manipulation/src/common/expiryTimer/src/ExpiryTimerImpl.cpp b/service/resource-encapsulation/src/common/expiryTimer/src/ExpiryTimerImpl.cpp
similarity index 100%
rename from service/resource-manipulation/src/common/expiryTimer/src/ExpiryTimerImpl.cpp
rename to service/resource-encapsulation/src/common/expiryTimer/src/ExpiryTimerImpl.cpp

diff --git a/service/resource-manipulation/src/common/expiryTimer/src/ExpiryTimerImpl.h b/service/resource-encapsulation/src/common/expiryTimer/src/ExpiryTimerImpl.h
similarity index 100%
rename from service/resource-manipulation/src/common/expiryTimer/src/ExpiryTimerImpl.h
rename to service/resource-encapsulation/src/common/expiryTimer/src/ExpiryTimerImpl.h

diff --git a/service/resource-manipulation/src/common/primitiveResource/include/AssertUtils.h b/service/resource-encapsulation/src/common/primitiveResource/include/AssertUtils.h
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/include/AssertUtils.h
rename to service/resource-encapsulation/src/common/primitiveResource/include/AssertUtils.h

diff --git a/service/resource-manipulation/src/common/primitiveResource/include/PresenceSubscriber.h b/service/resource-encapsulation/src/common/primitiveResource/include/PresenceSubscriber.h
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/include/PresenceSubscriber.h
rename to service/resource-encapsulation/src/common/primitiveResource/include/PresenceSubscriber.h

diff --git a/service/resource-manipulation/src/common/primitiveResource/include/PrimitiveResource.h b/service/resource-encapsulation/src/common/primitiveResource/include/PrimitiveResource.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/include/PrimitiveResource.h
rename to service/resource-encapsulation/src/common/primitiveResource/include/PrimitiveResource.h

diff --git a/service/resource-manipulation/src/common/primitiveResource/include/PrimitiveResourceImpl.h b/service/resource-encapsulation/src/common/primitiveResource/include/PrimitiveResourceImpl.h
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/include/PrimitiveResourceImpl.h
rename to service/resource-encapsulation/src/common/primitiveResource/include/PrimitiveResourceImpl.h

diff --git a/service/resource-manipulation/src/common/primitiveResource/include/RCSAddressDetail.h b/service/resource-encapsulation/src/common/primitiveResource/include/RCSAddressDetail.h
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/include/RCSAddressDetail.h
rename to service/resource-encapsulation/src/common/primitiveResource/include/RCSAddressDetail.h

diff --git a/service/resource-manipulation/src/common/primitiveResource/include/ResourceAttributesConverter.h b/service/resource-encapsulation/src/common/primitiveResource/include/ResourceAttributesConverter.h
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/include/ResourceAttributesConverter.h
rename to service/resource-encapsulation/src/common/primitiveResource/include/ResourceAttributesConverter.h

diff --git a/service/resource-manipulation/src/common/primitiveResource/include/ResourceAttributesUtils.h b/service/resource-encapsulation/src/common/primitiveResource/include/ResourceAttributesUtils.h
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/include/ResourceAttributesUtils.h
rename to service/resource-encapsulation/src/common/primitiveResource/include/ResourceAttributesUtils.h

diff --git a/service/resource-manipulation/src/common/primitiveResource/include/ResponseStatement.h b/service/resource-encapsulation/src/common/primitiveResource/include/ResponseStatement.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/include/ResponseStatement.h
rename to service/resource-encapsulation/src/common/primitiveResource/include/ResponseStatement.h

diff --git a/service/resource-manipulation/src/common/primitiveResource/src/PresenceSubscriber.cpp b/service/resource-encapsulation/src/common/primitiveResource/src/PresenceSubscriber.cpp
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/src/PresenceSubscriber.cpp
rename to service/resource-encapsulation/src/common/primitiveResource/src/PresenceSubscriber.cpp

diff --git a/service/resource-manipulation/src/common/primitiveResource/src/PrimitiveResource.cpp b/service/resource-encapsulation/src/common/primitiveResource/src/PrimitiveResource.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/src/PrimitiveResource.cpp
rename to service/resource-encapsulation/src/common/primitiveResource/src/PrimitiveResource.cpp

diff --git a/service/resource-manipulation/src/common/primitiveResource/src/RCSAddress.cpp b/service/resource-encapsulation/src/common/primitiveResource/src/RCSAddress.cpp
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/src/RCSAddress.cpp
rename to service/resource-encapsulation/src/common/primitiveResource/src/RCSAddress.cpp

diff --git a/service/resource-manipulation/src/common/primitiveResource/src/RCSException.cpp b/service/resource-encapsulation/src/common/primitiveResource/src/RCSException.cpp
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/src/RCSException.cpp
rename to service/resource-encapsulation/src/common/primitiveResource/src/RCSException.cpp

diff --git a/service/resource-manipulation/src/common/primitiveResource/src/ResourceAttributes.cpp b/service/resource-encapsulation/src/common/primitiveResource/src/ResourceAttributes.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/src/ResourceAttributes.cpp
rename to service/resource-encapsulation/src/common/primitiveResource/src/ResourceAttributes.cpp

diff --git a/service/resource-manipulation/src/common/primitiveResource/src/ResponseStatement.cpp b/service/resource-encapsulation/src/common/primitiveResource/src/ResponseStatement.cpp
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/src/ResponseStatement.cpp
rename to service/resource-encapsulation/src/common/primitiveResource/src/ResponseStatement.cpp

diff --git a/service/resource-manipulation/src/common/primitiveResource/unittests/PresenceSubscriberTest.cpp b/service/resource-encapsulation/src/common/primitiveResource/unittests/PresenceSubscriberTest.cpp
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/unittests/PresenceSubscriberTest.cpp
rename to service/resource-encapsulation/src/common/primitiveResource/unittests/PresenceSubscriberTest.cpp

diff --git a/service/resource-manipulation/src/common/primitiveResource/unittests/PrimitiveResourceTest.cpp b/service/resource-encapsulation/src/common/primitiveResource/unittests/PrimitiveResourceTest.cpp
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/unittests/PrimitiveResourceTest.cpp
rename to service/resource-encapsulation/src/common/primitiveResource/unittests/PrimitiveResourceTest.cpp

diff --git a/service/resource-manipulation/src/common/primitiveResource/unittests/ResourceAttributesTest.cpp b/service/resource-encapsulation/src/common/primitiveResource/unittests/ResourceAttributesTest.cpp
similarity index 100%
rename from service/resource-manipulation/src/common/primitiveResource/unittests/ResourceAttributesTest.cpp
rename to service/resource-encapsulation/src/common/primitiveResource/unittests/ResourceAttributesTest.cpp

diff --git a/service/resource-manipulation/src/common/utils/include/UnitTestHelper.h b/service/resource-encapsulation/src/common/utils/include/UnitTestHelper.h
similarity index 100%
rename from service/resource-manipulation/src/common/utils/include/UnitTestHelper.h
rename to service/resource-encapsulation/src/common/utils/include/UnitTestHelper.h

diff --git a/service/resource-manipulation/src/resourceBroker/include/BrokerTypes.h b/service/resource-encapsulation/src/resourceBroker/include/BrokerTypes.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/resourceBroker/include/BrokerTypes.h
rename to service/resource-encapsulation/src/resourceBroker/include/BrokerTypes.h

diff --git a/service/resource-manipulation/src/resourceBroker/include/DeviceAssociation.h b/service/resource-encapsulation/src/resourceBroker/include/DeviceAssociation.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/resourceBroker/include/DeviceAssociation.h
rename to service/resource-encapsulation/src/resourceBroker/include/DeviceAssociation.h

diff --git a/service/resource-manipulation/src/resourceBroker/include/DevicePresence.h b/service/resource-encapsulation/src/resourceBroker/include/DevicePresence.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/resourceBroker/include/DevicePresence.h
rename to service/resource-encapsulation/src/resourceBroker/include/DevicePresence.h

diff --git a/service/resource-manipulation/src/resourceBroker/include/ResourceBroker.h b/service/resource-encapsulation/src/resourceBroker/include/ResourceBroker.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/resourceBroker/include/ResourceBroker.h
rename to service/resource-encapsulation/src/resourceBroker/include/ResourceBroker.h

diff --git a/service/resource-manipulation/src/resourceBroker/include/ResourcePresence.h b/service/resource-encapsulation/src/resourceBroker/include/ResourcePresence.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/resourceBroker/include/ResourcePresence.h
rename to service/resource-encapsulation/src/resourceBroker/include/ResourcePresence.h

diff --git a/service/resource-manipulation/src/resourceBroker/src/DeviceAssociation.cpp b/service/resource-encapsulation/src/resourceBroker/src/DeviceAssociation.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/resourceBroker/src/DeviceAssociation.cpp
rename to service/resource-encapsulation/src/resourceBroker/src/DeviceAssociation.cpp

diff --git a/service/resource-manipulation/src/resourceBroker/src/DevicePresence.cpp b/service/resource-encapsulation/src/resourceBroker/src/DevicePresence.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/resourceBroker/src/DevicePresence.cpp
rename to service/resource-encapsulation/src/resourceBroker/src/DevicePresence.cpp

diff --git a/service/resource-manipulation/src/resourceBroker/src/ResourceBroker.cpp b/service/resource-encapsulation/src/resourceBroker/src/ResourceBroker.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/resourceBroker/src/ResourceBroker.cpp
rename to service/resource-encapsulation/src/resourceBroker/src/ResourceBroker.cpp

diff --git a/service/resource-manipulation/src/resourceBroker/src/ResourcePresence.cpp b/service/resource-encapsulation/src/resourceBroker/src/ResourcePresence.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/resourceBroker/src/ResourcePresence.cpp
rename to service/resource-encapsulation/src/resourceBroker/src/ResourcePresence.cpp

diff --git a/service/resource-manipulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp b/service/resource-encapsulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp
rename to service/resource-encapsulation/src/resourceBroker/unittest/DeviceAssociationUnitTest.cpp

diff --git a/service/resource-manipulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp b/service/resource-encapsulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp
rename to service/resource-encapsulation/src/resourceBroker/unittest/DevicePresenceUnitTest.cpp

diff --git a/service/resource-manipulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp b/service/resource-encapsulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp
rename to service/resource-encapsulation/src/resourceBroker/unittest/ResourceBrokerUnitTest.cpp

diff --git a/service/resource-manipulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp b/service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp
rename to service/resource-encapsulation/src/resourceBroker/unittest/ResourcePresenceUnitTest.cpp

diff --git a/service/resource-manipulation/src/resourceBroker/unittest/SConscript b/service/resource-encapsulation/src/resourceBroker/unittest/SConscript
similarity index 100%
rename from service/resource-manipulation/src/resourceBroker/unittest/SConscript
rename to service/resource-encapsulation/src/resourceBroker/unittest/SConscript

diff --git a/service/resource-manipulation/src/resourceCache/include/CacheTypes.h b/service/resource-encapsulation/src/resourceCache/include/CacheTypes.h
similarity index 100%
rename from service/resource-manipulation/src/resourceCache/include/CacheTypes.h
rename to service/resource-encapsulation/src/resourceCache/include/CacheTypes.h

diff --git a/service/resource-manipulation/src/resourceCache/include/DataCache.h b/service/resource-encapsulation/src/resourceCache/include/DataCache.h
similarity index 100%
rename from service/resource-manipulation/src/resourceCache/include/DataCache.h
rename to service/resource-encapsulation/src/resourceCache/include/DataCache.h

diff --git a/service/resource-manipulation/src/resourceCache/include/ResourceCacheManager.h b/service/resource-encapsulation/src/resourceCache/include/ResourceCacheManager.h
similarity index 100%
rename from service/resource-manipulation/src/resourceCache/include/ResourceCacheManager.h
rename to service/resource-encapsulation/src/resourceCache/include/ResourceCacheManager.h

diff --git a/service/resource-manipulation/src/resourceCache/src/DataCache.cpp b/service/resource-encapsulation/src/resourceCache/src/DataCache.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceCache/src/DataCache.cpp
rename to service/resource-encapsulation/src/resourceCache/src/DataCache.cpp

diff --git a/service/resource-manipulation/src/resourceCache/src/ResourceCacheManager.cpp b/service/resource-encapsulation/src/resourceCache/src/ResourceCacheManager.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceCache/src/ResourceCacheManager.cpp
rename to service/resource-encapsulation/src/resourceCache/src/ResourceCacheManager.cpp

diff --git a/service/resource-manipulation/src/resourceCache/unittests/DataCacheTest.cpp b/service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceCache/unittests/DataCacheTest.cpp
rename to service/resource-encapsulation/src/resourceCache/unittests/DataCacheTest.cpp

diff --git a/service/resource-manipulation/src/resourceCache/unittests/ResourceCacheTest.cpp b/service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceCache/unittests/ResourceCacheTest.cpp
rename to service/resource-encapsulation/src/resourceCache/unittests/ResourceCacheTest.cpp

diff --git a/service/resource-manipulation/src/resourceCache/unittests/SConscript b/service/resource-encapsulation/src/resourceCache/unittests/SConscript
similarity index 100%
rename from service/resource-manipulation/src/resourceCache/unittests/SConscript
rename to service/resource-encapsulation/src/resourceCache/unittests/SConscript

diff --git a/service/resource-manipulation/src/resourceContainer/SConscript b/service/resource-encapsulation/src/resourceContainer/SConscript
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/SConscript
rename to service/resource-encapsulation/src/resourceContainer/SConscript

diff --git a/service/resource-manipulation/src/resourceContainer/bundle-api/include/BundleActivator.h b/service/resource-encapsulation/src/resourceContainer/bundle-api/include/BundleActivator.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/bundle-api/include/BundleActivator.h
rename to service/resource-encapsulation/src/resourceContainer/bundle-api/include/BundleActivator.h

diff --git a/service/resource-manipulation/src/resourceContainer/bundle-api/include/BundleResource.h b/service/resource-encapsulation/src/resourceContainer/bundle-api/include/BundleResource.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/bundle-api/include/BundleResource.h
rename to service/resource-encapsulation/src/resourceContainer/bundle-api/include/BundleResource.h

diff --git a/service/resource-manipulation/src/resourceContainer/bundle-api/include/NotificationReceiver.h b/service/resource-encapsulation/src/resourceContainer/bundle-api/include/NotificationReceiver.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/bundle-api/include/NotificationReceiver.h
rename to service/resource-encapsulation/src/resourceContainer/bundle-api/include/NotificationReceiver.h

diff --git a/service/resource-manipulation/src/resourceContainer/bundle-api/include/ProtocolBridgeConnector.h b/service/resource-encapsulation/src/resourceContainer/bundle-api/include/ProtocolBridgeConnector.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/bundle-api/include/ProtocolBridgeConnector.h
rename to service/resource-encapsulation/src/resourceContainer/bundle-api/include/ProtocolBridgeConnector.h

diff --git a/service/resource-manipulation/src/resourceContainer/bundle-api/include/ProtocolBridgeResource.h b/service/resource-encapsulation/src/resourceContainer/bundle-api/include/ProtocolBridgeResource.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/bundle-api/include/ProtocolBridgeResource.h
rename to service/resource-encapsulation/src/resourceContainer/bundle-api/include/ProtocolBridgeResource.h

diff --git a/service/resource-manipulation/src/resourceContainer/bundle-api/include/ResourceContainerBundleAPI.h b/service/resource-encapsulation/src/resourceContainer/bundle-api/include/ResourceContainerBundleAPI.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/bundle-api/include/ResourceContainerBundleAPI.h
rename to service/resource-encapsulation/src/resourceContainer/bundle-api/include/ResourceContainerBundleAPI.h

diff --git a/service/resource-manipulation/src/resourceContainer/bundle-api/include/SoftSensorResource.h b/service/resource-encapsulation/src/resourceContainer/bundle-api/include/SoftSensorResource.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/bundle-api/include/SoftSensorResource.h
rename to service/resource-encapsulation/src/resourceContainer/bundle-api/include/SoftSensorResource.h

diff --git a/service/resource-manipulation/src/resourceContainer/bundle-java-api/pom.xml b/service/resource-encapsulation/src/resourceContainer/bundle-java-api/pom.xml
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/bundle-java-api/pom.xml
rename to service/resource-encapsulation/src/resourceContainer/bundle-java-api/pom.xml

diff --git a/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java b/service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java
rename to service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java

diff --git a/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java b/service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java
rename to service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java

diff --git a/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java b/service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java
rename to service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java

diff --git a/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java b/service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java
rename to service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java

diff --git a/service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java b/service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java
rename to service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java

diff --git a/service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml b/service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml
rename to service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml

diff --git a/service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java b/service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java
rename to service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java

diff --git a/service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java b/service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java
rename to service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java

diff --git a/service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java b/service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java
rename to service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java

diff --git a/service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/include/HueConnector.h b/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueConnector.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/include/HueConnector.h
rename to service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueConnector.h

diff --git a/service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/include/HueLight.h b/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueLight.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/include/HueLight.h
rename to service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueLight.h

diff --git a/service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h b/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h
rename to service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h

diff --git a/service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp b/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp
rename to service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp b/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp
rename to service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp b/service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp
rename to service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/examples/ResourceContainerConfig.xml b/service/resource-encapsulation/src/resourceContainer/examples/ResourceContainerConfig.xml
similarity index 93%
rename from service/resource-manipulation/src/resourceContainer/examples/ResourceContainerConfig.xml
rename to service/resource-encapsulation/src/resourceContainer/examples/ResourceContainerConfig.xml
index 4d88e4a..2afa664 100644 (file)
--- a/service/resource-manipulation/src/resourceContainer/examples/ResourceContainerConfig.xml
+++ b/service/resource-encapsulation/src/resourceContainer/examples/ResourceContainerConfig.xml
@@ -59,7 +59,7 @@
     </bundle>
     <!--<bundle>
         <id>oic.bundle.hueJavaSample</id>
-        <path>../../../../../../../../service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/target/hue-0.1-jar-with-dependencies.jar</path>
+        <path>../../../../../../../../service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/target/hue-0.1-jar-with-dependencies.jar</path>
         <libraryPath>.</libraryPath>
         <uri>/hueJava</uri>
         <activator>org.iotivity.bundle.hue.HueBundleActivator</activator>

diff --git a/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensor.h b/service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensor.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensor.h
rename to service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensor.h

diff --git a/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensorResource.h b/service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensorResource.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensorResource.h
rename to service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/DiscomfortIndexSensorResource.h

diff --git a/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/SoftSensorBundleActivator.h b/service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/SoftSensorBundleActivator.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/SoftSensorBundleActivator.h
rename to service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/SoftSensorBundleActivator.h

diff --git a/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/SysTimer.h b/service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/SysTimer.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/SysTimer.h
rename to service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/include/SysTimer.h

diff --git a/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensor.cpp b/service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensor.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensor.cpp
rename to service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensor.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensorResource.cpp b/service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensorResource.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensorResource.cpp
rename to service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/DiscomfortIndexSensorResource.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SoftSensorBundleActivator.cpp b/service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SoftSensorBundleActivator.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SoftSensorBundleActivator.cpp
rename to service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SoftSensorBundleActivator.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SysTimer.cpp b/service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SysTimer.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SysTimer.cpp
rename to service/resource-encapsulation/src/resourceContainer/examples/SoftSensorSampleBundle/src/SysTimer.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/include/BundleInfoInternal.h b/service/resource-encapsulation/src/resourceContainer/include/BundleInfoInternal.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/include/BundleInfoInternal.h
rename to service/resource-encapsulation/src/resourceContainer/include/BundleInfoInternal.h

diff --git a/service/resource-manipulation/src/resourceContainer/include/Configuration.h b/service/resource-encapsulation/src/resourceContainer/include/Configuration.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/include/Configuration.h
rename to service/resource-encapsulation/src/resourceContainer/include/Configuration.h

diff --git a/service/resource-manipulation/src/resourceContainer/include/JavaBundleResource.h b/service/resource-encapsulation/src/resourceContainer/include/JavaBundleResource.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/include/JavaBundleResource.h
rename to service/resource-encapsulation/src/resourceContainer/include/JavaBundleResource.h

diff --git a/service/resource-manipulation/src/resourceContainer/include/ResourceContainerImpl.h b/service/resource-encapsulation/src/resourceContainer/include/ResourceContainerImpl.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/include/ResourceContainerImpl.h
rename to service/resource-encapsulation/src/resourceContainer/include/ResourceContainerImpl.h

diff --git a/service/resource-manipulation/src/resourceContainer/include/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h b/service/resource-encapsulation/src/resourceContainer/include/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/include/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h
rename to service/resource-encapsulation/src/resourceContainer/include/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h

diff --git a/service/resource-manipulation/src/resourceContainer/src/BaseActivator.cpp b/service/resource-encapsulation/src/resourceContainer/src/BaseActivator.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/src/BaseActivator.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/BaseActivator.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/src/BundleActivator.cpp b/service/resource-encapsulation/src/resourceContainer/src/BundleActivator.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/src/BundleActivator.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/BundleActivator.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/src/BundleInfo.cpp b/service/resource-encapsulation/src/resourceContainer/src/BundleInfo.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/src/BundleInfo.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/BundleInfo.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/src/BundleInfoInternal.cpp b/service/resource-encapsulation/src/resourceContainer/src/BundleInfoInternal.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/src/BundleInfoInternal.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/BundleInfoInternal.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/src/BundleResource.cpp b/service/resource-encapsulation/src/resourceContainer/src/BundleResource.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/src/BundleResource.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/BundleResource.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/src/Configuration.cpp b/service/resource-encapsulation/src/resourceContainer/src/Configuration.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/src/Configuration.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/Configuration.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/src/ContainerSample.cpp b/service/resource-encapsulation/src/resourceContainer/src/ContainerSample.cpp
similarity index 98%
rename from service/resource-manipulation/src/resourceContainer/src/ContainerSample.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/ContainerSample.cpp
index dff6250..49c61f8 100644 (file)
--- a/service/resource-manipulation/src/resourceContainer/src/ContainerSample.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/src/ContainerSample.cpp
@@ -120,7 +120,7 @@ int main()
     bundleParams["libraryPath"] = ".";
     bundleParams["activator"] = "org.iotivity.bundle.hue.HueBundleActivator";
     container->addBundle("oic.bundle.hueJavaSample", "/hueJava",
-                         "../../../../../../../../service/resource-manipulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/target/hue-0.1-jar-with-dependencies.jar",
+                         "../../../../../../../../service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/target/hue-0.1-jar-with-dependencies.jar",
                          bundleParams);
 
     bundles = container->listBundles();

diff --git a/service/resource-manipulation/src/resourceContainer/src/ContainerSampleClient.cpp b/service/resource-encapsulation/src/resourceContainer/src/ContainerSampleClient.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/src/ContainerSampleClient.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/ContainerSampleClient.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/src/JavaBundleResource.cpp b/service/resource-encapsulation/src/resourceContainer/src/JavaBundleResource.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/src/JavaBundleResource.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/JavaBundleResource.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/src/ProtocolBridgeConnector.cpp b/service/resource-encapsulation/src/resourceContainer/src/ProtocolBridgeConnector.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/src/ProtocolBridgeConnector.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/ProtocolBridgeConnector.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/src/ProtocolBridgeResource.cpp b/service/resource-encapsulation/src/resourceContainer/src/ProtocolBridgeResource.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/src/ProtocolBridgeResource.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/ProtocolBridgeResource.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/src/ResourceContainer.cpp b/service/resource-encapsulation/src/resourceContainer/src/ResourceContainer.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/src/ResourceContainer.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/ResourceContainer.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/src/ResourceContainerBundleAPI.cpp b/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerBundleAPI.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/src/ResourceContainerBundleAPI.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/ResourceContainerBundleAPI.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/src/ResourceContainerImpl.cpp b/service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/src/ResourceContainerImpl.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/src/SoftSensorResource.cpp b/service/resource-encapsulation/src/resourceContainer/src/SoftSensorResource.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/src/SoftSensorResource.cpp
rename to service/resource-encapsulation/src/resourceContainer/src/SoftSensorResource.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerInvalidConfig.xml b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerInvalidConfig.xml
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerInvalidConfig.xml
rename to service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerInvalidConfig.xml

diff --git a/service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerTest.cpp b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerTest.cpp
rename to service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml
rename to service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml

diff --git a/service/resource-manipulation/src/resourceContainer/unittests/SConscript b/service/resource-encapsulation/src/resourceContainer/unittests/SConscript
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/unittests/SConscript
rename to service/resource-encapsulation/src/resourceContainer/unittests/SConscript

diff --git a/service/resource-manipulation/src/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h b/service/resource-encapsulation/src/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h
rename to service/resource-encapsulation/src/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h

diff --git a/service/resource-manipulation/src/resourceContainer/unittests/TestBundle/src/TestBundleActivator.cpp b/service/resource-encapsulation/src/resourceContainer/unittests/TestBundle/src/TestBundleActivator.cpp
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/unittests/TestBundle/src/TestBundleActivator.cpp
rename to service/resource-encapsulation/src/resourceContainer/unittests/TestBundle/src/TestBundleActivator.cpp

diff --git a/service/resource-manipulation/src/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar b/service/resource-encapsulation/src/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar
similarity index 100%
rename from service/resource-manipulation/src/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar
rename to service/resource-encapsulation/src/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar

diff --git a/service/resource-manipulation/src/serverBuilder/SConscript b/service/resource-encapsulation/src/serverBuilder/SConscript
similarity index 100%
rename from service/resource-manipulation/src/serverBuilder/SConscript
rename to service/resource-encapsulation/src/serverBuilder/SConscript

diff --git a/service/resource-manipulation/src/serverBuilder/include/RequestHandler.h b/service/resource-encapsulation/src/serverBuilder/include/RequestHandler.h
similarity index 100%
rename from service/resource-manipulation/src/serverBuilder/include/RequestHandler.h
rename to service/resource-encapsulation/src/serverBuilder/include/RequestHandler.h

diff --git a/service/resource-manipulation/src/serverBuilder/src/RCSRequest.cpp b/service/resource-encapsulation/src/serverBuilder/src/RCSRequest.cpp
similarity index 100%
rename from service/resource-manipulation/src/serverBuilder/src/RCSRequest.cpp
rename to service/resource-encapsulation/src/serverBuilder/src/RCSRequest.cpp

diff --git a/service/resource-manipulation/src/serverBuilder/src/RCSResponse.cpp b/service/resource-encapsulation/src/serverBuilder/src/RCSResponse.cpp
similarity index 100%
rename from service/resource-manipulation/src/serverBuilder/src/RCSResponse.cpp
rename to service/resource-encapsulation/src/serverBuilder/src/RCSResponse.cpp

diff --git a/service/resource-manipulation/src/serverBuilder/src/RequestHandler.cpp b/service/resource-encapsulation/src/serverBuilder/src/RequestHandler.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/serverBuilder/src/RequestHandler.cpp
rename to service/resource-encapsulation/src/serverBuilder/src/RequestHandler.cpp

diff --git a/service/resource-manipulation/src/serverBuilder/src/ResourceObject.cpp b/service/resource-encapsulation/src/serverBuilder/src/ResourceObject.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/serverBuilder/src/ResourceObject.cpp
rename to service/resource-encapsulation/src/serverBuilder/src/ResourceObject.cpp

diff --git a/service/resource-manipulation/src/serverBuilder/unittests/RCSResponseTest.cpp b/service/resource-encapsulation/src/serverBuilder/unittests/RCSResponseTest.cpp
similarity index 100%
rename from service/resource-manipulation/src/serverBuilder/unittests/RCSResponseTest.cpp
rename to service/resource-encapsulation/src/serverBuilder/unittests/RCSResponseTest.cpp

diff --git a/service/resource-manipulation/src/serverBuilder/unittests/RequestHandlerTest.cpp b/service/resource-encapsulation/src/serverBuilder/unittests/RequestHandlerTest.cpp
similarity index 100%
rename from service/resource-manipulation/src/serverBuilder/unittests/RequestHandlerTest.cpp
rename to service/resource-encapsulation/src/serverBuilder/unittests/RequestHandlerTest.cpp

diff --git a/service/resource-manipulation/src/serverBuilder/unittests/ResourceObjectTest.cpp b/service/resource-encapsulation/src/serverBuilder/unittests/ResourceObjectTest.cpp
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from service/resource-manipulation/src/serverBuilder/unittests/ResourceObjectTest.cpp
rename to service/resource-encapsulation/src/serverBuilder/unittests/ResourceObjectTest.cpp

diff --git a/service/resource-manipulation/unittests/ResourceClient_Test.cpp b/service/resource-encapsulation/unittests/ResourceClient_Test.cpp
similarity index 100%
rename from service/resource-manipulation/unittests/ResourceClient_Test.cpp
rename to service/resource-encapsulation/unittests/ResourceClient_Test.cpp

diff --git a/service/resource-manipulation/unittests/SConscript b/service/resource-encapsulation/unittests/SConscript
similarity index 100%
rename from service/resource-manipulation/unittests/SConscript
rename to service/resource-encapsulation/unittests/SConscript