resource-container: remove empty files

move default constructor/destructor to header files and remove empty source files

Change-Id: I5ec63a34926c74fab9742cbf299c978a7e76bd1d
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4331
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/resource-container/SConscript b/service/resource-container/SConscript
index 45382d4..2863655 100644 (file)
--- a/service/resource-container/SConscript
+++ b/service/resource-container/SConscript
@@ -114,11 +114,7 @@ if int(containerJavaSupport):
 ######################################################################
 # Source files and Targets
 ######################################################################
-res_container_src = ['src/BaseActivator.cpp','src/BundleActivator.cpp','src/RCSBundleInfo.cpp',
-    'src/BundleInfoInternal.cpp', 'src/BundleResource.cpp', 'src/Configuration.cpp', 'src/JavaBundleResource.cpp', 'src/ProtocolBridgeResource.cpp',
-    'src/ProtocolBridgeConnector.cpp', 'src/RCSResourceContainer.cpp', 'src/ResourceContainerBundleAPI.cpp', 'src/ResourceContainerImpl.cpp',
-    'src/SoftSensorResource.cpp', 'src/DiscoverResourceUnit.cpp', 'src/RemoteResourceUnit.cpp',
-    ]
+res_container_src = [ Glob('src/*.cpp') ]
 
 res_container_static = resource_container_env.StaticLibrary('rcs_container', res_container_src)
 res_container_shared = resource_container_env.SharedLibrary('rcs_container', res_container_src)

diff --git a/service/resource-container/bundle-api/include/BundleActivator.h b/service/resource-container/bundle-api/include/BundleActivator.h
index ddc79ca..937bcf6 100644 (file)
--- a/service/resource-container/bundle-api/include/BundleActivator.h
+++ b/service/resource-container/bundle-api/include/BundleActivator.h
@@ -43,12 +43,12 @@ namespace OIC
                 /**
                 * Constructor for BundleActivator
                 */
-                BundleActivator();
+                BundleActivator() { };
 
                 /**
                 * Virtual destructor for BundleActivator
                 */
-                virtual ~BundleActivator();
+                virtual ~BundleActivator() { };
 
                 /**
                 * Activate the Bundle to make bundle work and create bundle resources
@@ -60,14 +60,14 @@ namespace OIC
                 * @return void
                 */
                 virtual void activateBundle(ResourceContainerBundleAPI *resourceContainer,
-                                            std::string bundleId);
+                                            std::string bundleId) { };
 
                 /**
                 * Deactivate the Bundle to stop working and destroy bundle resources
                 *
                 * @return void
                 */
-                virtual void deactivateBundle();
+                virtual void deactivateBundle() { };
 
                 /**
                 * Create Bundle Resource instance and register the resource in the container

diff --git a/service/resource-container/bundle-api/include/ProtocolBridgeConnector.h b/service/resource-container/bundle-api/include/ProtocolBridgeConnector.h
index 414d688..a549d2e 100644 (file)
--- a/service/resource-container/bundle-api/include/ProtocolBridgeConnector.h
+++ b/service/resource-container/bundle-api/include/ProtocolBridgeConnector.h
@@ -43,12 +43,12 @@ namespace OIC
                 /**
                 * Constructor for ProtocolBridgeConnector
                 */
-                ProtocolBridgeConnector();
+                ProtocolBridgeConnector() { };
 
                 /**
                 * Virtual destructor for ProtocolBridgeConnector
                 */
-                virtual ~ProtocolBridgeConnector();
+                virtual ~ProtocolBridgeConnector() { };
 
                 /**
                 * Execute the logic needed for connection with different protocol from IoTivity

diff --git a/service/resource-container/bundle-api/include/ProtocolBridgeResource.h b/service/resource-container/bundle-api/include/ProtocolBridgeResource.h
index b8cfc8e..cdfc998 100644 (file)
--- a/service/resource-container/bundle-api/include/ProtocolBridgeResource.h
+++ b/service/resource-container/bundle-api/include/ProtocolBridgeResource.h
@@ -43,12 +43,12 @@ namespace OIC
                 /**
                 * Constructor for ProtocolBridgeResource
                 */
-                ProtocolBridgeResource();
+                ProtocolBridgeResource() { };
 
                 /**
                 * Virtual destructor for ProtocolBridgeResource
                 */
-                virtual ~ProtocolBridgeResource();
+                virtual ~ProtocolBridgeResource() { };
 
                 /**
                 * Initialize attributes of the resource

diff --git a/service/resource-container/include/RCSBundleInfo.h b/service/resource-container/include/RCSBundleInfo.h
index 31d2902..5b95814 100644 (file)
--- a/service/resource-container/include/RCSBundleInfo.h
+++ b/service/resource-container/include/RCSBundleInfo.h
@@ -82,8 +82,8 @@ namespace OIC
                 */
                 virtual const std::string &getVersion() = 0;
 
-                RCSBundleInfo();
-                virtual ~RCSBundleInfo();
+                RCSBundleInfo() { };
+                virtual ~RCSBundleInfo() { };
             protected:
                 std::string m_ID, m_path, m_version;
 

diff --git a/service/resource-container/src/BundleActivator.cpp b/service/resource-container/src/BundleActivator.cpp
deleted file mode 100644 (file)
index f2f17ea..0000000
--- a/service/resource-container/src/BundleActivator.cpp
+++ /dev/null
@@ -1,53 +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.
-//
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-#include "BundleActivator.h"
-#include "RCSResourceContainer.h"
-
-using namespace OIC::Service;
-
-namespace OIC
-{
-    namespace Service
-    {
-        BundleActivator::BundleActivator()
-        {
-
-        }
-
-        BundleActivator::~BundleActivator()
-        {
-
-        }
-
-        void BundleActivator::activateBundle(ResourceContainerBundleAPI *resourceContainer,
-                std::string bundleId)
-        {
-            (void)(resourceContainer);
-            (void)(bundleId);
-        }
-
-        void BundleActivator::deactivateBundle()
-        {
-
-        }
-    }
-}
-

diff --git a/service/resource-container/src/ProtocolBridgeConnector.cpp b/service/resource-container/src/ProtocolBridgeConnector.cpp
deleted file mode 100644 (file)
index f55d8af..0000000
--- a/service/resource-container/src/ProtocolBridgeConnector.cpp
+++ /dev/null
@@ -1,40 +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.
-//
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-#include "ProtocolBridgeConnector.h"
-
-using namespace OIC::Service;
-
-namespace OIC
-{
-    namespace Service
-    {
-        ProtocolBridgeConnector::ProtocolBridgeConnector()
-        {
-
-        }
-
-        ProtocolBridgeConnector::~ProtocolBridgeConnector()
-        {
-
-        }
-    }
-}
-

diff --git a/service/resource-container/src/ProtocolBridgeResource.cpp b/service/resource-container/src/ProtocolBridgeResource.cpp
deleted file mode 100644 (file)
index 5820cef..0000000
--- a/service/resource-container/src/ProtocolBridgeResource.cpp
+++ /dev/null
@@ -1,41 +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.
-//
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-#include "ProtocolBridgeResource.h"
-
-using namespace OIC::Service;
-
-namespace OIC
-{
-    namespace Service
-    {
-        ProtocolBridgeResource::ProtocolBridgeResource()
-        {
-
-        }
-
-        ProtocolBridgeResource::~ProtocolBridgeResource()
-        {
-
-        }
-    }
-}
-
-

diff --git a/service/resource-container/src/RCSBundleInfo.cpp b/service/resource-container/src/RCSBundleInfo.cpp
deleted file mode 100644 (file)
index d89ab7c..0000000
--- a/service/resource-container/src/RCSBundleInfo.cpp
+++ /dev/null
@@ -1,38 +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.
-//
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-#include "RCSBundleInfo.h"
-#include "BundleInfoInternal.h"
-
-namespace OIC
-{
-    namespace Service
-    {
-        RCSBundleInfo::RCSBundleInfo()
-        {
-
-        }
-
-        RCSBundleInfo::~RCSBundleInfo()
-        {
-
-        }
-    }
-}