From ab2146102f6da3fcff328f77be5fe55f7ff05ca1 Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Sun, 14 Jun 2020 15:27:27 +0200
Subject: [PATCH] fix startup

---
 .../scviewer.product                          | 41 +++++--------------
 .../category.xml                              |  3 --
 pom.xml                                       |  6 +--
 3 files changed, 13 insertions(+), 37 deletions(-)

diff --git a/com.minres.scviewer.e4.product/scviewer.product b/com.minres.scviewer.e4.product/scviewer.product
index c8548ff..266b0c7 100644
--- a/com.minres.scviewer.e4.product/scviewer.product
+++ b/com.minres.scviewer.e4.product/scviewer.product
@@ -3,6 +3,7 @@
 
 <product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
+
    <configIni use="default">
    </configIni>
 
@@ -17,6 +18,7 @@
 
    <windowImages/>
 
+
    <launcher name="scviewer">
       <linux icon="icons/SCViewer_512x512.xpm"/>
       <macosx icon="icons/SCViewer.icns"/>
@@ -33,6 +35,7 @@
       </win>
    </launcher>
 
+
    <vm>
       <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
       <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
@@ -48,39 +51,15 @@
 
    <features>
       <feature id="com.minres.scviewer.e4.feature" installMode="root"/>
-      <feature id="com.minres.scviewer.ui.feature" installMode="root"/>
-      <feature id="com.minres.scviewer.database.feature" installMode="root"/>
-      <feature id="org.eclipse.help" installMode="root"/>
-      <feature id="org.eclipse.sdk" installMode="root"/>
-      <feature id="org.eclipse.equinox.p2.core.feature" installMode="root"/>
-      <feature id="org.eclipse.ecf.core.ssl.feature" installMode="root"/>
-      <feature id="org.eclipse.ecf.filetransfer.ssl.feature" installMode="root"/>
-      <feature id="org.eclipse.equinox.serverside.sdk" installMode="root"/>
-      <feature id="org.eclipse.equinox.server.jetty" installMode="root"/>
-      <feature id="org.eclipse.rcp" installMode="root"/>
-      <feature id="org.eclipse.equinox.p2.rcp.feature" installMode="root"/>
-      <feature id="org.eclipse.ecf.filetransfer.feature" installMode="root"/>
-      <feature id="org.eclipse.equinox.server.p2" installMode="root"/>
-      <feature id="org.eclipse.emf.ecore.source" installMode="root"/>
-      <feature id="org.eclipse.equinox.p2.core.feature.source" installMode="root"/>
-      <feature id="org.eclipse.emf.common" installMode="root"/>
-      <feature id="org.eclipse.equinox.compendium.sdk" installMode="root"/>
-      <feature id="org.eclipse.equinox.server.core" installMode="root"/>
-      <feature id="org.eclipse.equinox.executable" installMode="root"/>
-      <feature id="org.eclipse.emf.ecore" installMode="root"/>
-      <feature id="org.eclipse.equinox.p2.user.ui" installMode="root"/>
-      <feature id="org.eclipse.equinox.p2.extras.feature" installMode="root"/>
-      <feature id="org.eclipse.ecf.core.feature" installMode="root"/>
-      <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature" installMode="root"/>
-      <feature id="org.eclipse.equinox.sdk" installMode="root"/>
-      <feature id="org.eclipse.platform" installMode="root"/>
-      <feature id="org.eclipse.equinox.core.sdk" installMode="root"/>
-      <feature id="org.eclipse.e4.rcp" installMode="root"/>
-      <feature id="com.opcoach.e4.preferences.feature" installMode="root"/>
-      <feature id="org.eclipse.equinox.core.feature" installMode="root"/>
-      <feature id="org.codehaus.groovy25.feature" installMode="root"/>
    </features>
 
+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="1" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
+   </configurations>
 
    <preferencesInfo>
       <targetfile overwrite="false"/>
diff --git a/p2repositories/com.minres.scviewer.updateSite/category.xml b/p2repositories/com.minres.scviewer.updateSite/category.xml
index f11caad..a4f42b6 100644
--- a/p2repositories/com.minres.scviewer.updateSite/category.xml
+++ b/p2repositories/com.minres.scviewer.updateSite/category.xml
@@ -3,9 +3,6 @@
    <feature url="features/com.minres.scviewer.feature_1.0.0.qualifier.jar" id="com.minres.scviewer.feature" version="1.0.0.qualifier">
       <category name="com.minres.scviewer"/>
    </feature>
-   <feature url="features/com.minres.scviewer.feature.source_1.0.0.qualifier.jar" id="com.minres.scviewer.feature.source" version="1.0.0.qualifier">
-      <category name="com.minres.scviewer"/>
-   </feature>
    <category-def name="com.minres.scviewer" label="SCViewer">
       <description>
          Viewer for SystemC Verification (SCV) library&apos;s transaction recording
diff --git a/pom.xml b/pom.xml
index bb5207c..3943f88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
 				</executions>
 			</plugin>
 
-			<plugin>
+<!-- 			<plugin>
 				<groupId>org.eclipse.tycho.extras</groupId>
 				<artifactId>tycho-source-feature-plugin</artifactId>
 				<version>${tycho-version}</version>
@@ -72,12 +72,12 @@
 
 				<configuration>
 					<excludes>
-						<!-- provide plug-ins not containing any source code -->
+						provide plug-ins not containing any source code
 						<plugin id="org.codehaus.groovy" />
 					</excludes>
 				</configuration>
 			</plugin>
-
+ -->
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-plugin</artifactId>