X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fjobs%2Fwidget_install%2Ftask_manifest_file.cpp;h=35966593cc628e663e1bed8cd21e67619a14bf40;hb=8e5b6f2a7f22ca80b21438dab5ce754fa8daf2e2;hp=c204226a73f5f97a8e53b7fe173d38f7f1a66f93;hpb=b1c2dfd78d6dfacb40c5aa15a593b9dd5e01d23c;p=framework%2Fweb%2Fwrt-installer.git

diff --git a/src/jobs/widget_install/task_manifest_file.cpp b/src/jobs/widget_install/task_manifest_file.cpp
index c204226..3596659 100644
--- a/src/jobs/widget_install/task_manifest_file.cpp
+++ b/src/jobs/widget_install/task_manifest_file.cpp
@@ -148,10 +148,9 @@ void TaskManifestFile::stepCreateExecFile()
 
 #ifdef MULTIPROCESS_SERVICE_SUPPORT
     //services
-    std::size_t serviceCount =
+    std::size_t appcontrolCount =
         m_context.widgetConfig.configInfo.appControlList.size();
-    serviceCount += m_context.widgetConfig.configInfo.appServiceList.size();
-    for (std::size_t i = 0; i < serviceCount; ++i) {
+    for (std::size_t i = 0; i < appcontrolCount; ++i) {
         std::stringstream postfix;
         postfix << "-__SERVICE_PROCESS__" << i;
         std::string serviceExec = exec;
@@ -576,7 +575,6 @@ void TaskManifestFile::writeManifest(const DPL::String & path)
     setWidgetManifest(manifest);
     setWidgetOtherInfo(uiApp);
 #ifndef MULTIPROCESS_SERVICE_SUPPORT
-    setAppServicesInfo(uiApp);
     setAppControlsInfo(uiApp);
 #endif
     setAppCategory(uiApp);
@@ -615,35 +613,6 @@ void TaskManifestFile::writeManifest(const DPL::String & path)
 
         manifest.addUiApplication(uiApp);
     }
-    //TODO: AppService tag will be removed
-    //services AppService tag
-    WrtDB::ConfigParserData::ServiceInfoList appServiceList =
-        m_context.widgetConfig.configInfo.appServiceList;
-    FOREACH(it, appServiceList) {
-        it->m_index = count;
-        UiApplication uiApp;
-
-        uiApp.setTaskmanage(true);
-        uiApp.setNodisplay(true);
-#ifdef MULTIPROCESS_SERVICE_SUPPORT_INLINE
-        uiApp.setTaskmanage(ConfigParserData::ServiceInfo::Disposition::INLINE != it->m_disposition);
-        uiApp.setMultiple(ConfigParserData::ServiceInfo::Disposition::INLINE == it->m_disposition);
-#endif
-
-        std::stringstream postfix;
-        postfix << "-__SERVICE_PROCESS__" << count++;
-
-        setWidgetExecPath(uiApp, postfix.str());
-        setWidgetName(manifest, uiApp);
-        setWidgetIds(manifest, uiApp, postfix.str());
-        setWidgetIcons(uiApp);
-        setAppServiceInfo(uiApp, *it);
-        setAppCategory(uiApp);
-        setAccount(manifest);
-        setPrivilege(manifest);
-
-        manifest.addUiApplication(uiApp);
-    }
 #endif
     manifest.generate(path);
     LogDebug("Manifest file serialized");
@@ -857,22 +826,6 @@ void TaskManifestFile::setWidgetOtherInfo(UiApplication & uiApp)
     //that were in desktop file
 }
 
-void TaskManifestFile::setAppServicesInfo(UiApplication & uiApp)
-{
-    WrtDB::ConfigParserData::ServiceInfoList appServiceList =
-        m_context.widgetConfig.configInfo.appServiceList;
-
-    if (appServiceList.empty()) {
-        LogInfo("Widget doesn't contain application service");
-        return;
-    }
-
-    // x-tizen-svc=http://tizen.org/appcontrol/operation/pick|NULL|image;
-    FOREACH(it, appServiceList) {
-        setAppServiceInfo(uiApp, *it);
-     }
- }
-
 void TaskManifestFile::setAppControlsInfo(UiApplication & uiApp)
 {
     WrtDB::ConfigParserData::AppControlInfoList appControlList =
@@ -889,22 +842,6 @@ void TaskManifestFile::setAppControlsInfo(UiApplication & uiApp)
     }
 }
 
-void TaskManifestFile::setAppServiceInfo(UiApplication & uiApp,
-                                         const ConfigParserData::ServiceInfo & service)
-{
-    AppControl appControl;
-    if (!service.m_operation.empty()) {
-        appControl.addOperation(service.m_operation); //TODO: encapsulation?
-    }
-    if (!service.m_scheme.empty()) {
-        appControl.addUri(service.m_scheme);
-    }
-    if (!service.m_mime.empty()) {
-        appControl.addMime(service.m_mime);
-    }
-    uiApp.addAppControl(appControl);
-}
-
 void TaskManifestFile::setAppControlInfo(UiApplication & uiApp,
                                          const WrtDB::ConfigParserData::AppControlInfo & service)
 {