Better separation between Headless engine and MEP

Author: pjeanjean

framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine/src/org/eclipse/gemoc/executionframework/engine/commons/sequential/HeadlessJavaEngineSequentialRunConfiguration.java

@@ -0,0 +1,110 @@
+package org.eclipse.gemoc.executionframework.engine.commons.sequential;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.gemoc.xdsmlframework.api.extensions.engine_addon.EngineAddonSpecificationExtension;
+
+public class HeadlessJavaEngineSequentialRunConfiguration implements ISequentialRunConfiguration {
+
+	URI modelURI;
+	String languageName;
+	String modelEntryPoint;
+	String methodEntryPoint; 
+	String initializationMethod;
+	String initializationMethodArgs;
+	public HeadlessJavaEngineSequentialRunConfiguration(URI modelURI, String languageName, String modelEntryPoint,
+			String methodEntryPoint, String initializationMethod, String initializationMethodArgs) {
+		this.modelURI = modelURI;
+		this.languageName =  languageName;
+		this.modelEntryPoint = modelEntryPoint;
+		this.methodEntryPoint = methodEntryPoint;
+		this.initializationMethod = initializationMethod;
+		this.initializationMethodArgs = initializationMethodArgs;
+	}
+
+	@Override
+	public int getAnimationDelay() {
+		return 0;
+	}
+
+	@Override
+	public URI getAnimatorURI() {
+		return null;
+	}
+
+	@Override
+	public boolean getBreakStart() {
+		return false;
+	}
+
+	@Override
+	public String getDebugModelID() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Collection<EngineAddonSpecificationExtension> getEngineAddonExtensions() {
+		return null;
+	}
+
+	@Override
+	public URI getExecutedModelAsMelangeURI() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public URI getExecutedModelURI() {
+		return modelURI;
+	}
+
+	@Override
+	public String getLanguageName() {
+		return this.languageName;
+	}
+
+	@Override
+	public String getMelangeQuery() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getExecutionEntryPoint() {
+		return this.methodEntryPoint;
+	}
+
+	@Override
+	public String getModelEntryPoint() {
+		return this.modelEntryPoint;
+	}
+
+	@Override
+	public String getModelInitializationMethod() {
+		return this.initializationMethod;
+	}
+
+	@Override
+	public String getModelInitializationArguments() {
+		return this.initializationMethodArgs;
+	}
+	
+	
+	public String getAttribute(String attributeName, String defaultValue) {
+		// there is no addon in this mode, so return the default value
+		return defaultValue;
+	}
+
+	public Integer getAttribute(String attributeName, Integer defaultValue) {
+		// there is no addon in this mode, so return the default value
+		return defaultValue;
+	}
+
+	public Boolean getAttribute(String attributeName, Boolean defaultValue) {
+		// there is no addon in this mode, so return the default value
+		return defaultValue;
+	}
+
+}

framework/execution_framework/pomfirst/org.eclipse.gemoc.executionframework.mep/pom.xml

@@ -46,16 +46,6 @@
 			<artifactId>org.eclipse.emf.edit</artifactId>
 			<version>2.16.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.gemoc.commons</groupId>
-			<artifactId>org.eclipse.gemoc.commons.eclipse.pde</artifactId>
-			<version>3.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.gemoc.commons</groupId>
-			<artifactId>org.eclipse.gemoc.commons.eclipse.messagingsystem.api</artifactId>
-			<version>3.0.0-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.lsp4j</groupId>
 			<artifactId>org.eclipse.lsp4j.jsonrpc</artifactId>
@@ -67,26 +57,6 @@
     		<artifactId>org.eclipse.emf.edit</artifactId>
     		<version>2.16.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.gemoc.commons</groupId>
-			<artifactId>org.eclipse.gemoc.commons.eclipse.pde</artifactId>
-			<version>3.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.gemoc.commons</groupId>
-			<artifactId>org.eclipse.gemoc.commons.eclipse.messagingsystem.api</artifactId>
-			<version>3.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.gemoc.pomfirst</groupId>
-			<artifactId>org.eclipse.gemoc.xdsmlframework.api</artifactId>
-			<version>4.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.gemoc.pomfirst</groupId>
-			<artifactId>org.eclipse.gemoc.xdsmlframework.commons</artifactId>
-			<version>4.0.0-SNAPSHOT</version>
-		</dependency>
 
 	</dependencies>
 

framework/execution_framework/pomfirst/org.eclipse.gemoc.executionframework.mep/src/main/java/org/eclipse/gemoc/executionframework/mep/launch/GemocMEPServerImpl.java

@@ -241,7 +241,10 @@ public void run() {
 						LOG.error(e.getMessage(), e);
 					}
 				}
-				
+				String languageName = "";
+				if(args.containsKey(MEPLaunchParameterKey.language.name())) {
+					languageName = (String) args.get(MEPLaunchParameterKey.language.name());
+				}				
 				String methodEntryPoint = "";
 				if(args.containsKey(MEPLaunchParameterKey.methodEntryPoint.name())) {
 					methodEntryPoint = (String) args.get(MEPLaunchParameterKey.methodEntryPoint.name());
@@ -262,6 +265,7 @@ public void run() {
 
 				launcherParameters = new MEPLauncherParameters();
 				launcherParameters.resourceModel = res;
+				launcherParameters.languageName = languageName;
 				launcherParameters.modelEntryPoint = modelEntryPoint; 
 				launcherParameters.methodEntryPoint = methodEntryPoint;
 				launcherParameters.initializationMethod = initializationMethod;

framework/execution_framework/pomfirst/org.eclipse.gemoc.executionframework.mep/src/main/java/org/eclipse/gemoc/executionframework/mep/launch/MEPLauncherParameters.java

@@ -4,6 +4,7 @@
 
 public class MEPLauncherParameters {
 
+	public String languageName = "";
 	public Resource resourceModel = null;
 	public String modelEntryPoint = "";
 	public String methodEntryPoint = "";