[sre] Fixing the buggy definition of the Janus SRE.

close #768 Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Oct 9, 2017 · c45c02e · c45c02e
1 parent 9d5a1c9
commit c45c02e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/sre/io.janusproject/io.janusproject.eclipse/about.mappings b/sre/io.janusproject/io.janusproject.eclipse/about.mappings
@@ -6,7 +6,7 @@
 # This file may be automatically generated.
 # Do not change it if there no replacement variables below.
 
-0=20171008193655
+0=20171009174538
 1=2014-2017
 2=the original authors or authors
 3=http://www.sarl.io

diff --git a/sre/io.janusproject/io.janusproject.eclipse/plugin.xml b/sre/io.janusproject/io.janusproject.eclipse/plugin.xml
@@ -10,7 +10,7 @@
 
   <extension point="org.eclipse.jdt.core.classpathContainerInitializer">
       <classpathContainerInitializer
-          id="io.janusproject.plugin.launching.JANUS_SUPPORT"
+          id="io.janusproject.eclipse.launching.JANUS_SUPPORT"
           class="io.janusproject.eclipse.buildpath.JanusClasspathContainerInitializer"/>
    </extension>
 
@@ -19,7 +19,7 @@
       <classpathContainerPage
             name="%classpathContainerPage.name"
             class="io.janusproject.eclipse.buildpath.JanusContainerWizardPage"
-            id="io.janusproject.plugin.launching.JANUS_SUPPORT">
+            id="io.janusproject.eclipse.launching.JANUS_SUPPORT">
       </classpathContainerPage>
    </extension>
 

diff --git a/....janusproject/io.janusproject.eclipse/src/io/janusproject/eclipse/JanusEclipsePlugin.java b/....janusproject/io.janusproject.eclipse/src/io/janusproject/eclipse/JanusEclipsePlugin.java
@@ -38,9 +38,13 @@
  */
 public class JanusEclipsePlugin extends AbstractUIPlugin {
 
-	/** Identifier of the plugin.
+	/** Identifier of the plugin for Eclipse integration of Janus.
 	 */
-	public static final String PLUGIN_ID = "io.janusproject.plugin"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "io.janusproject.eclipse"; //$NON-NLS-1$
+
+	/** Identifier of the plugin of Janus itself.
+	 */
+	public static final String JANUS_KERNEL_PLUGIN_ID = "io.janusproject.plugin"; //$NON-NLS-1$
 
 	private static JanusEclipsePlugin instance;
 

diff --git a/...o.janusproject.eclipse/src/io/janusproject/eclipse/buildpath/JanusClasspathContainer.java b/...o.janusproject.eclipse/src/io/janusproject/eclipse/buildpath/JanusClasspathContainer.java
@@ -54,6 +54,8 @@ public class JanusClasspathContainer extends AbstractSARLBasedClasspathContainer
 
 	static {
 		final String[] array1 = new String[] {
+			JanusEclipsePlugin.JANUS_KERNEL_PLUGIN_ID,
+			"com.google.code.gson", //$NON-NLS-1$
 			"com.google.code.gson", //$NON-NLS-1$
 			"com.google.inject", //$NON-NLS-1$
 			"com.hazelcast", //$NON-NLS-1$