From 5e4a95efe99f9afb729a1066a5d196f6b9a0440f Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Tue, 12 Sep 2017 16:17:58 +0300
Subject: [PATCH] Removed Eclipse Marketplace Client from Simantics Desktop
 product

MPC is not needed and neither is org.eclipse.userstorage after removing
MPC.

Also removed JDK8-deprecated and otherwise unnecessary arguments from
simantics-desktop.product.

refs #7484

Change-Id: I13976228cea62f65a69472b511c7af92330e9f33
---
 .../META-INF/MANIFEST.MF                      |   3 -
 .../org.simantics.desktop.feature/feature.xml |  25 ----
 .../simantics-desktop.product                 | 132 +++++++++---------
 3 files changed, 64 insertions(+), 96 deletions(-)

diff --git a/bundles/org.simantics.desktop.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.desktop.ui/META-INF/MANIFEST.MF
index 27e7007ed..4edec126f 100644
--- a/bundles/org.simantics.desktop.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.desktop.ui/META-INF/MANIFEST.MF
@@ -6,9 +6,6 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.desktop.ui.internal.Activator
 Bundle-Vendor: Semantum Oy
 Require-Bundle: org.simantics.workbench;bundle-version="1.5.1",
- org.eclipse.epp.mpc.core;bundle-version="1.6.0",
- org.eclipse.epp.mpc.help.ui;bundle-version="1.6.0",
- org.eclipse.epp.mpc.ui;bundle-version="1.6.0",
  org.eclipse.ui.browser;bundle-version="3.3.100",
  org.simantics.platform.ui.ontology;bundle-version="1.0.0",
  org.simantics.spreadsheet.ontology;bundle-version="1.2.0",
diff --git a/features/org.simantics.desktop.feature/feature.xml b/features/org.simantics.desktop.feature/feature.xml
index 64bb03b6f..ae1c2ddae 100644
--- a/features/org.simantics.desktop.feature/feature.xml
+++ b/features/org.simantics.desktop.feature/feature.xml
@@ -49,10 +49,6 @@
          id="org.eclipse.equinox.p2.discovery.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.userstorage"
-         version="0.0.0"/>
-
    <plugin
          id="org.simantics.desktop.ui"
          download-size="0"
@@ -74,25 +70,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.epp.mpc.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epp.mpc.help.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.epp.mpc.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
index a8daea6cd..dac533f7d 100644
--- a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
+++ b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
@@ -1,77 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="Simantics Desktop" uid="Simantics-Desktop" id="org.simantics.desktop.product.desktopProduct" application="org.simantics.workbench.application" version="1.31.0" useFeatures="true" includeLaunchers="true">
-
-   <aboutInfo>
-      <image path="/org.simantics.desktop.ui/icons/simantics256.png"/>
-      <text>
-         The desktop environment for Simantics products.
-      </text>
-   </aboutInfo>
-
-   <configIni use="">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>--launcher.XXMaxPermSize
-192m
--fixerrors
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="Simantics Desktop" uid="Simantics-Desktop" id="org.simantics.desktop.product.desktopProduct" application="org.simantics.workbench.application" version="1.31.0" useFeatures="true" includeLaunchers="true">
+
+   <aboutInfo>
+      <image path="/org.simantics.desktop.ui/icons/simantics256.png"/>
+      <text>
+         The desktop environment for Simantics products.
+      </text>
+   </aboutInfo>
+
+   <configIni use="">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>-fixerrors
 -data
 @noDefault
 -cssTheme
-org.eclipse.e4.ui.css.theme.e4_classic
-      </programArgs>
+org.eclipse.e4.ui.css.theme.e4_classic
+      </programArgs>
       <vmArgs>-ea
 -Xmx500M
 -Xshare:off
--XX:MaxPermSize=192m
 -Dorg.simantics.workbench.application.showFastViewBars=false
 -Dorg.simantics.workbench.application.showPerspectiveBar=false
 -Dorg.simantics.workbench.application.excludePerspectiveFromTitle=true
--Djava.util.Arrays.useLegacyMergeSort=true
--Declipse.workaround.bug467000=true
-      </vmArgs>
-      <vmArgsWin>-Dorg.osgi.framework.os.name=win32
-      </vmArgsWin>
-   </launcherArgs>
-
-   <windowImages i32="/org.simantics.desktop.ui/icons/simantics32.png"/>
-
-   <launcher name="Simantics-Desktop">
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
-   </vm>
-
-   <license>
-        <url>http://www.eclipse.org/legal/epl-v10.html</url>
-   </license>
-
-   <plugins>
-   </plugins>
-
-   <features>
-      <feature id="org.simantics.desktop.product.feature" version="1.0.0.qualifier"/>
- </features>
-
-   <configurations>
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="5" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-   </configurations>
-
-   <preferencesInfo>
-      <targetfile overwrite="false"/>
-   </preferencesInfo>
-
-   <cssInfo>
-   </cssInfo>
-
-</product>
+-Declipse.workaround.bug467000=true
+      </vmArgs>
+      <vmArgsWin>-Dorg.osgi.framework.os.name=win32
+      </vmArgsWin>
+   </launcherArgs>
+
+   <windowImages i32="/org.simantics.desktop.ui/icons/simantics32.png"/>
+
+   <launcher name="Simantics-Desktop">
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
+   </vm>
+
+   <license>
+        <url>http://www.eclipse.org/legal/epl-v10.html</url>
+   </license>
+
+   <plugins>
+   </plugins>
+
+   <features>
+      <feature id="org.simantics.desktop.product.feature" version="1.0.0.qualifier"/>
+   </features>
+
+   <configurations>
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="5" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+   </configurations>
+
+   <preferencesInfo>
+      <targetfile overwrite="false"/>
+   </preferencesInfo>
+
+   <cssInfo>
+   </cssInfo>
+
+</product>
-- 
2.47.1