Moved resource container API header files to new include folder
authorMarkus Jung <markus.jung@samsung.com>
Wed, 15 Jul 2015 07:24:54 +0000 (16:24 +0900)
committerUze Choi <uzchoi@samsung.com>
Wed, 15 Jul 2015 13:17:22 +0000 (13:17 +0000)
Change-Id: I2a22f3efb5f6e0e010b2543697192efeff1a2e1f
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1662
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
service/resource-manipulation/src/resourceContainer/SConscript
service/resource-manipulation/src/resourceContainer/bundle-api/include/ResourceContainerBundleAPI.h
service/resource-manipulation/src/resourceContainer/include/BundleInfo.h [deleted file]
service/resource-manipulation/src/resourceContainer/include/BundleInfoInternal.h [moved from service/resource-manipulation/src/resourceContainer/include/internal/BundleInfoInternal.h with 100% similarity]
service/resource-manipulation/src/resourceContainer/include/Configuration.h [moved from service/resource-manipulation/src/resourceContainer/include/internal/Configuration.h with 100% similarity]
service/resource-manipulation/src/resourceContainer/include/JavaBundleResource.h [moved from service/resource-manipulation/src/resourceContainer/include/internal/JavaBundleResource.h with 100% similarity]
service/resource-manipulation/src/resourceContainer/include/ResourceContainer.h [deleted file]
service/resource-manipulation/src/resourceContainer/include/ResourceContainerImpl.h [moved from service/resource-manipulation/src/resourceContainer/include/internal/ResourceContainerImpl.h with 100% similarity]
service/resource-manipulation/src/resourceContainer/include/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h [moved from service/resource-manipulation/src/resourceContainer/include/internal/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h with 100% similarity]
service/resource-manipulation/src/resourceContainer/unittests/SConscript

index 7012d59..84c61b1 100644 (file)
@@ -62,8 +62,8 @@ except KeyError:
 resource_container_env.AppendUnique(
        CPPPATH = [
                env.get('SRC_DIR')+'/extlibs', 
+               '../../include',
                'include',
-               'include/internal',
                'bundle-api/include',
                'src',
                '../serverBuilder/include',
@@ -123,7 +123,8 @@ ss_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])
 SS_RESOURCE_BUNDLE_DIR = 'examples/SoftSensorSampleBundle/'
 ss_resource_bundle_env.AppendUnique(CPPPATH = [
                SS_RESOURCE_BUNDLE_DIR + 'include',
-               'include/'
+               'include/',
+               '../../include',
                ])              
                
 
diff --git a/service/resource-manipulation/src/resourceContainer/include/BundleInfo.h b/service/resource-manipulation/src/resourceContainer/include/BundleInfo.h
deleted file mode 100644 (file)
index fba9a08..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-//******************************************************************
-//
-// Copyright 2015 Samsung Electronics All Rights Reserved.
-//
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-#ifndef BUNDLEINFO_H_
-#define BUNDLEINFO_H_
-
-#include <string>
-
-using namespace std;
-
-namespace OIC
-{
-    namespace Service
-    {
-        /*
-         * Describes a bundle with resources, that can be loaded dynamically.
-         */
-        class BundleInfo
-        {
-        public:
-            BundleInfo();
-            virtual ~BundleInfo();
-            virtual void setID(string name) = 0;
-            virtual string getID() = 0;
-            virtual void setPath(string path) = 0;
-            virtual string getPath() = 0;
-            virtual void setActivatorName(string activator) = 0;
-            virtual string getActivatorName() = 0;
-            virtual void setLibraryPath(string libpath) = 0;
-            virtual string getLibraryPath() = 0;
-            virtual void setVersion(string version) = 0;
-            virtual string getVersion() = 0;
-            static BundleInfo* build();
-        protected:
-            string m_ID, m_path, m_version;
-        };
-    }
-}
-
-#endif /* BUNDLEINFO_H_ */
diff --git a/service/resource-manipulation/src/resourceContainer/include/ResourceContainer.h b/service/resource-manipulation/src/resourceContainer/include/ResourceContainer.h
deleted file mode 100644 (file)
index 5636d39..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-//******************************************************************
-//
-// Copyright 2015 Samsung Electronics All Rights Reserved.
-//
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-#ifndef RESOURCECONTAINER_H_
-#define RESOURCECONTAINER_H_
-
-#include <iostream>
-#include <string>
-#include <vector>
-#include <map>
-#include <list>
-
-#include "BundleInfo.h"
-
-using namespace std;
-
-namespace OIC
-{
-    namespace Service
-    {
-        class ResourceContainer
-        {
-        public:
-            ResourceContainer();
-            virtual ~ResourceContainer();
-            //virtual void initializeResourceContainer() = 0;
-            virtual void startContainer(string configFile) = 0;
-            virtual void stopContainer() = 0;
-
-            // list of bundle ids
-            virtual std::list<BundleInfo*> listBundles() = 0;
-            virtual void startBundle(string bundleId) = 0;
-            virtual void stopBundle(string bundleId) = 0;
-
-            // dynamic configuration
-            virtual void addBundle(string bundleId, string bundleUri, string bundlePath, std::map<string, string> params) =0;
-            virtual void removeBundle(string bundleId) = 0;
-
-            virtual void addResourceConfig(string bundleId, string resourceUri, std::map<string, string> params)  = 0;
-            virtual void removeResourceConfig(string bundleId, string resourceUri)  = 0;
-
-            virtual std::list<string> listBundleResources(string bundleId) = 0;
-
-            static ResourceContainer *getInstance();
-        };
-    }
-}
-
-#endif /* RESOURCECONTAINER_H_ */
index f20b732..8afa17d 100644 (file)
@@ -83,6 +83,7 @@ container_gtest_env.AppendUnique(
        CPPPATH = [
                env.get('SRC_DIR')+'/extlibs', 
                '../include',
+               '../../../include',
                '../include/internal',
                '../bundle-api/include',
                '../../serverBuilder/include',