Remove unused standard feature code

[Issue#] N/A
[Problem] Crash is occurred during touch preference API
[Cause] Plugin is loaded two time
[Solution] Remove unused standard feature code
[SCMRequest] N/A

Change-Id: I779d133985080a11efc60903e1ac5a3db42a5d7f

diff --git a/packaging/wrt-plugins-common.spec b/packaging/wrt-plugins-common.spec
index 438d720..7390c79 100644 (file)
--- a/packaging/wrt-plugins-common.spec
+++ b/packaging/wrt-plugins-common.spec
@@ -70,7 +70,6 @@ touch /opt/share/widget/plugin-installation-required
 %{_libdir}/*.so
 %{_libdir}/*.so.*
 %{_libdir}/wrt-plugins/w3c-widget-interface/libwrt-plugins-w3c-widget-interface.so
-%attr(644,root,root) %{_libdir}/wrt-plugins/standard-features-list
 %attr(644,root,root) /usr/share/wrt-plugins-common/widget_interface_db.sql
 %attr(755,root,root) %{_bindir}/wrt-popup-ace-runtime
 %attr(755,root,root) %{_bindir}/wrt-popup-wrt-runtime

diff --git a/src/plugin-loading/js_page_session.cpp b/src/plugin-loading/js_page_session.cpp
index 2fe19cd..bc9d44f 100644 (file)
--- a/src/plugin-loading/js_page_session.cpp
+++ b/src/plugin-loading/js_page_session.cpp
@@ -101,8 +101,8 @@ class JSPageSession::Impl
     PluginPtr loadLibrary(PluginModelPtr& pluginModel);
 
     void loadInjectedJavaScript();
-    void installStandardFeatures();
-    void installRootPlugins();
+    void installStandardFunctions();
+     void installRootPlugins();
     void installRequestedFeatures();
 
     //returns true if success or false if failed
@@ -167,28 +167,17 @@ JSPageSession::Impl::~Impl()
     LogDebug("Deinitializing plugin Logic...");
 }
 
-void JSPageSession::Impl::installStandardFeatures()
-{
-    LogInfo("Installing standard widget features...");
+ void JSPageSession::Impl::installStandardFunctions()
+ {
+    LogInfo("Installing standard functions...");
 
     //add standard functions
-    FOREACH(it, JsFunctionManagerSingleton::Instance().getFunctions())
-    {
+    FOREACH(it, JsFunctionManagerSingleton::Instance().getFunctions()) {
         m_objectExplorer->registerObject(*it, NULL);
     }
 
-    //add standard objects
-    LogDebug("Installing standard extensions...");
-
-    auto standardPlugins = m_pluginsSupport->getStandardPlugins();
-    FOREACH(it, standardPlugins)
-    {
-        //loadFeatureToSession(*it);
-        installPlugin(*it);
-    }
-
-    LogInfo("Standard widget features installed.");
-}
+     LogInfo("Standard functions installed.");
+ }
 
 void JSPageSession::Impl::installRootPlugins()
 {
@@ -516,7 +505,7 @@ void JSPageSession::Impl::startSession(int widgetHandle,
     m_context = context;
 
     // Register standard features
-    installStandardFeatures();
+    installStandardFunctions();
 
     WidgetDAOReadOnly dao(m_widgetHandle);
     WidgetType appType = dao.getWidgetType();

diff --git a/src/plugin-loading/plugin_container_support.cpp b/src/plugin-loading/plugin_container_support.cpp
index a9cf516..41effcf 100644 (file)
--- a/src/plugin-loading/plugin_container_support.cpp
+++ b/src/plugin-loading/plugin_container_support.cpp
@@ -27,20 +27,13 @@
 #include <dpl/wrt-dao-ro/feature_dao_read_only.h>
 #include <dpl/wrt-dao-ro/global_config.h>
 
-namespace {
-const char *STANDARD_FEATURES_LIST_FILE = "standard-features-list";
-}
-
-using namespace WrtDB;
+ using namespace WrtDB;
 
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
 
 PluginContainerSupport::PluginContainerSupport() : m_initialized(false)
 {
-    // Reading standard features list from file
-    readStandardFeaturesList();
-
-    // Reading root plugins list from so files
+     // Reading root plugins list from so files
     readRootPluginsList();
 }
 
@@ -51,10 +44,7 @@ PluginContainerSupport::~PluginContainerSupport()
 
     // Remove all feature models
     m_featureModels.clear();
-
-    // Clear standard features list
-    m_standardFeatureList.clear();
-}
+ }
 
 void PluginContainerSupport::Initialize(int widgetHandle)
 {
@@ -87,7 +77,7 @@ std::list<std::string> PluginContainerSupport::getAllowedFeatures(
 
 void PluginContainerSupport::readAllowedPlugins(int widgetHandle)
 {
-    std::list<std::string> allowedFeatures(m_standardFeatureList);
+    std::list<std::string> allowedFeatures;
     auto requested = getAllowedFeatures(widgetHandle);
     FOREACH(f, requested)
     {
@@ -177,39 +167,7 @@ void PluginContainerSupport::registerPluginModel(DbPluginHandle handle)
     m_pluginModels.insert(model);
 }
 
-void PluginContainerSupport::readStandardFeaturesList()
-{
-    LogDebug("Reading standard features list from file...");
-
-    std::string path = GlobalConfig::GetDevicePluginPath();
-    path += "/";
-    path += STANDARD_FEATURES_LIST_FILE;
-
-    std::ifstream standardFeatureFile;
-    standardFeatureFile.open(path.c_str(), std::ifstream::in);
-
-    if (!standardFeatureFile.is_open()) {
-        LogError("Reading standard features list from file FAILED.");
-        return;
-    }
-
-    char buffer[1024];
-
-    while (!standardFeatureFile.eof()) {
-        standardFeatureFile.getline(buffer, sizeof(buffer));
-
-        if (buffer[0] == '\0') {
-            break;
-        }
-
-        LogDebug("Standard Feature: <" << buffer << ">");
-        m_standardFeatureList.push_back(std::string(buffer));
-    }
-
-    standardFeatureFile.close();
-}
-
-void PluginContainerSupport::readRootPluginsList()
+ void PluginContainerSupport::readRootPluginsList()
 {
     LogDebug("Reading root plugins list from so files...");
 
@@ -277,49 +235,7 @@ PluginContainerSupport::getPluginModel(const FeatureModelPtr &feature) const
     return getPluginModelById(feature->PHandle.Get());
 }
 
-PluginContainerSupport::FeaturesList
-PluginContainerSupport::getStandardFeatures() const
-{
-    //TODO use move
-    FeaturesList standardFeatures;
-
-    FOREACH(it, m_standardFeatureList)
-    {
-        FeatureModelPtr feature = getFeatureModel(*it);
-        if (!feature) {
-            LogWarning("Feature does not exist in DB " << *it);
-            continue;
-        }
-
-        //TODO maybe it should be sorted
-        standardFeatures.push_back(feature);
-    }
-
-    return standardFeatures;
-}
-
-PluginContainerSupport::PluginsList
-PluginContainerSupport::getStandardPlugins() const
-{
-    PluginsList plugins;
-
-    auto features = getStandardFeatures();
-
-    FOREACH(it, features)
-    {
-        auto plugin = getPluginModel(*it);
-        if (!plugin) {
-            LogError("PluginModel not found");
-            continue;
-        }
-
-        plugins.push_back(plugin);
-    }
-
-    return plugins;
-}
-
-PluginContainerSupport::PluginsList
+ PluginContainerSupport::PluginsList
 PluginContainerSupport::getRootPlugins() const
 {
     PluginsList plugins;

diff --git a/src/plugin-loading/plugin_container_support.h b/src/plugin-loading/plugin_container_support.h
index c5df084..1f0b2aa 100644 (file)
--- a/src/plugin-loading/plugin_container_support.h
+++ b/src/plugin-loading/plugin_container_support.h
@@ -46,8 +46,6 @@ class PluginContainerSupport
     // Main plugin list. Always equal to DB plugin list
     typedef std::set<PluginModelPtr> PluginModelsContainer;
 
-    StandardFeatureList m_standardFeatureList;
-
     WrtDB::PluginHandleList m_rootPluginsList;
 
     PluginModelsContainer m_pluginModels;
@@ -58,8 +56,7 @@ class PluginContainerSupport
 
   private:
     // Reading
-    void readStandardFeaturesList();
-    void readRootPluginsList();
+     void readRootPluginsList();
 
     // Plugin models
     typedef std::multimap<WrtDB::FeatureHandle, std::string> DeviceCapList;
@@ -84,8 +81,6 @@ class PluginContainerSupport
     std::list<std::string> getAllowedFeatures(int widgetHandle) const;
     void readAllowedPlugins(int widgetHandle);
     void readRootPlugins(int widgetHandle);
-    FeaturesList getStandardFeatures() const;
-    PluginsList  getStandardPlugins() const;
     PluginsList  getRootPlugins() const;
     PluginsList  getPluginsList() const;
 

diff --git a/src/standards/CMakeLists.txt b/src/standards/CMakeLists.txt
index 6bab9bf..83ff664 100644 (file)
--- a/src/standards/CMakeLists.txt
+++ b/src/standards/CMakeLists.txt
@@ -12,8 +12,5 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
-set(STANDARD_FILE_DESTINATION /usr/lib/wrt-plugins)
 
 add_subdirectory(W3C)
-
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/standard-features-list DESTINATION ${STANDARD_FILE_DESTINATION})

diff --git a/src/standards/W3C/Widget/CMakeLists.txt b/src/standards/W3C/Widget/CMakeLists.txt
index e6ab932..70ef116 100755 (executable)
--- a/src/standards/W3C/Widget/CMakeLists.txt
+++ b/src/standards/W3C/Widget/CMakeLists.txt
@@ -44,4 +44,4 @@ target_link_libraries(${TARGET_NAME}
   wrt-plugins-storageevent
 )
 
-INSTALL(TARGETS ${TARGET_NAME} LIBRARY DESTINATION ${STANDARD_FILE_DESTINATION}/w3c-widget-interface)
+INSTALL(TARGETS ${TARGET_NAME} LIBRARY DESTINATION /usr/lib/wrt-plugins/w3c-widget-interface)

diff --git a/src/standards/standard-features-list b/src/standards/standard-features-list
deleted file mode 100644 (file)
index 4ef06c8..0000000
--- a/src/standards/standard-features-list
+++ /dev/null
@@ -1 +0,0 @@
-http://w3cWidgetInterface.com/w3c-widget-interface