From: Miro Richard Eklund <miro.eklund@semantum.fi>
Date: Mon, 14 Aug 2017 12:06:40 +0000 (+0300)
Subject: Removed unnecessary oxygen-specific feature
X-Git-Tag: v1.31.0~246^2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=c701c5e663f327ae421929c67a8bd07990e900a9;p=simantics%2Fplatform.git

Removed unnecessary oxygen-specific feature

org.simantics.desktop.product.oxygen.feature is no longer needed, as
every plugin it includes is already included by other features in the
base "org.simantics.desktop.product.feature".

Amend: Updated pom.xml

(refs #7358)

Change-Id: I25ebe7153cd5ca683908311d04b38eb73a5b6c02
---

diff --git a/features/org.simantics.desktop.product.oxygen.feature/.project b/features/org.simantics.desktop.product.oxygen.feature/.project
deleted file mode 100644
index cbecb48b2..000000000
--- a/features/org.simantics.desktop.product.oxygen.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.simantics.desktop.product.oxygen.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.simantics.desktop.product.oxygen.feature/build.properties b/features/org.simantics.desktop.product.oxygen.feature/build.properties
deleted file mode 100644
index 64f93a9f0..000000000
--- a/features/org.simantics.desktop.product.oxygen.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.simantics.desktop.product.oxygen.feature/feature.xml b/features/org.simantics.desktop.product.oxygen.feature/feature.xml
deleted file mode 100644
index f467a77ac..000000000
--- a/features/org.simantics.desktop.product.oxygen.feature/feature.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.simantics.desktop.product.oxygen.feature"
-      label="Feature"
-      version="1.0.0.qualifier">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <plugin
-         id="org.eclipse.userstorage"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.userstorage.oauth"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.userstorage.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.lucene.misc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.lucene.analyzers-common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.lucene.analyzers-smartcn"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.wikitext"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.wikitext.mediawiki"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.annotation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.intro.quicklinks"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.mylyn.wikitext.osgi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jsoup"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/pom.xml b/features/pom.xml
index 29e1139de..2ccc30377 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -113,7 +113,6 @@
         <module>org.simantics.db.services.feature</module>
         <module>org.simantics.desktop.feature</module>
         <module>org.simantics.desktop.product.feature</module>
-        <module>org.simantics.desktop.product.oxygen.feature</module>
         <module>org.simantics.document.base.feature</module>
         <module>org.simantics.document.linking.feature</module>
         <module>org.simantics.document.swt.feature</module>
diff --git a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
index 5639c6472..a8daea6cd 100644
--- a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
+++ b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product
@@ -1,27 +1,27 @@
-<?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>
+<?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
 -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
@@ -30,49 +30,48 @@ org.eclipse.e4.ui.css.theme.e4_classic
 -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"/>
-      <feature id="org.simantics.desktop.product.oxygen.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>