#899 extracted workspace runner plugin

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/CCodeGenerator.java

@@ -15,7 +15,7 @@ package org.yakindu.sct.generator.c;
 import org.yakindu.sct.domain.generic.modules.GenericSequencerModule;
 import org.yakindu.sct.generator.c.features.ICFeatureConstants;
 import org.yakindu.sct.generator.c.types.CTypeSystemAccess;
-import org.yakindu.sct.generator.core.impl.GenericJavaBasedGenerator;
+import org.yakindu.sct.generator.core.impl.AbstractSExecModelGenerator;
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
 import org.yakindu.sct.model.sexec.naming.INamingService;
@@ -37,26 +37,26 @@ import com.google.inject.util.Modules;
  * @author axel terfloth
  * 
  */
-public class CCodeGenerator extends GenericJavaBasedGenerator {
+public class CCodeGenerator extends AbstractSExecModelGenerator {
 
 	public static String GENERATOR_ID = "yakindu::c";
-	
+
 	@Inject
 	private CGenerator delegate;
-	
+
 	@Inject
 	private IGenArtifactConfigurations artifactConfigs;
-	
+
 	@Override
 	protected void prepareGenerator(GeneratorEntry entry) {
 		super.prepareGenerator(entry);
 		initGenArtifactConfigurations();
 	}
-	
+
 	protected void initGenArtifactConfigurations() {
 		artifactConfigs.setFileSystemAccess(sctFsa);
 	}
-	
+
 	@Override
 	public void runGenerator(Statechart statechart, GeneratorEntry entry) {
 		ExecutionFlow flow = createExecutionFlow(statechart, entry);
@@ -76,7 +76,7 @@ public class CCodeGenerator extends GenericJavaBasedGenerator {
 				binder.bind(GeneratorEntry.class).toInstance(entry);
 				binder.bind(INamingService.class).to(CNamingService.class);
 				binder.bind(ICodegenTypeSystemAccess.class).to(CTypeSystemAccess.class);
-				
+
 				binder.bind(IGenArtifactConfigurations.class).to(GenArtifactConfigurations.class);
 				// default binding to ensure consistency of already used API
 				binder.bind(IGenArtifactConfigurations.class)

plugins/org.yakindu.sct.generator.core/plugin.xml

@@ -11,35 +11,5 @@
             defaultProvider="org.yakindu.sct.generator.core.library.impl.CoreLibraryDefaultFeatureValueProvider"
             uri="platform:/plugin/org.yakindu.sct.generator.core/library/CoreFeatureTypeLibrary.xmi">
       </FeatureLibrary>
-      <FeatureLibrary
-            library_id="org.yakindu.generator.core.features.generic"
-            defaultProvider="org.yakindu.sct.generator.core.library.impl.GenericJavaLibraryDefaultValueProvider"
-            uri="platform:/plugin/org.yakindu.sct.generator.core/library/GenericJavaFeatureTypeLibrary.xmi">
-   	  </FeatureLibrary>   	  
- </extension>
- <extension
-       point="org.yakindu.sct.generator.core.generator">
-   <SCTGenerator
-         class="org.yakindu.sct.generator.core.impl.GenericJavaBasedGenerator"
-         contentType="statechart"
-         description="Generate Code using Xpand Templates"
-         elementRefType="org.yakindu.sct.model.sgraph.Statechart"
-         icon="icons/sct.png"
-         id="yakindu::generic"
-         name="Custom Xtend2/Java-based Generator">
-      <FeatureLibrary
-            library_id="org.yakindu.generator.core.features">
-      </FeatureLibrary>
-      <FeatureLibrary
-            library_id="org.yakindu.generator.core.features.generic">
-      </FeatureLibrary>
-    </SCTGenerator>
  </extension>
-    <extension
-         point="org.yakindu.sct.generator.core.extensions">
-      <ExtensionGeneratorMapping
-            fileExtension="sct"
-            generatorId="yakindu::generic">
-      </ExtensionGeneratorMapping>
-   </extension>
 </plugin>

plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/AbstractWorkspaceGenerator.java

@@ -1,66 +0,0 @@
-/**
- * Copyright (c) 2011 committers of YAKINDU and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     committers of YAKINDU - initial API and implementation
- */
-package org.yakindu.sct.generator.core;
-
-import java.io.File;
-
-import org.eclipse.emf.common.util.URI;
-import org.yakindu.sct.generator.core.impl.AbstractSExecModelGenerator;
-import org.yakindu.sct.model.sgen.GeneratorEntry;
-
-/**
- * Base class for generators that are executed inside the workspace
- * 
- * @author holger willebrandt - Initial contribution and API
- * @author Johannes Dicks - refactored because of EFS decoupling
- */ 
-@Deprecated
-public abstract class AbstractWorkspaceGenerator extends AbstractSExecModelGenerator {
-	
-	/**
-	 * 
-	 * @param entry
-	 * @deprecated Will be removed in future. Refreshing the project is moved to concrete file system access implementations 
-	 */
-	@Deprecated
-	public final void refreshTargetProject(GeneratorEntry entry) {
-		/**
-		 * This functionality will be provided by concrete file system accesses from now.
-		 */
-	}
-
-	public final File getTargetProject(GeneratorEntry entry) {
-		URI uri = sctFsa.getURI(coreFeatureHelper.getTargetProjectValue(entry).getStringValue());
-		return new File(uri.toFileString());
-	}
-
-	public final File getTargetFolder(GeneratorEntry entry) {
-		URI uri = sctFsa.getURI(coreFeatureHelper.getRelativeTargetFolder(entry));
-		return new File(uri.toFileString());
-	}
-	
-	public final File getLibraryTargetFolder(GeneratorEntry entry) {
-		URI uri = sctFsa.getURI(coreFeatureHelper.getRelativeLibraryFolder(entry));
-		return new File(uri.toFileString());
-	}
-	
-	public final File getApiTargetFolder(GeneratorEntry entry) {
-		URI uri = sctFsa.getURI(coreFeatureHelper.getRelativeApiFolder(entry));
-		return new File(uri.toFileString());
-	}
-	
-	public final void writeToConsole(String line){
-		log.writeToConsole(line);
-	}
-	public final void writeToConsole(Throwable e){
-		log.writeToConsole(e);
-	}
-}

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/CppCodeGenerator.java

@@ -13,7 +13,7 @@ package org.yakindu.sct.generator.cpp;
 import org.yakindu.sct.generator.c.GenArtifactConfigurations;
 import org.yakindu.sct.generator.c.IGenArtifactConfigurations;
 import org.yakindu.sct.generator.c.types.CTypeSystemAccess;
-import org.yakindu.sct.generator.core.impl.GenericJavaBasedGenerator;
+import org.yakindu.sct.generator.core.impl.AbstractSExecModelGenerator;
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
 import org.yakindu.sct.model.sexec.naming.INamingService;
@@ -31,24 +31,24 @@ import com.google.inject.util.Modules;
  * @author Markus Mühlbrandt - Initial contribution and API
  * 
  */
-public class CppCodeGenerator extends GenericJavaBasedGenerator {
+public class CppCodeGenerator extends AbstractSExecModelGenerator {
 
 	@Inject
 	private CppGenerator delegate;
-	
+
 	@Inject
 	private IGenArtifactConfigurations artifactConfigs;
-	
+
 	@Override
 	protected void prepareGenerator(GeneratorEntry entry) {
 		super.prepareGenerator(entry);
 		initGenArtifactConfigurations();
 	}
-	
+
 	protected void initGenArtifactConfigurations() {
 		artifactConfigs.setFileSystemAccess(sctFsa);
 	}
-	
+
 	@Override
 	public void runGenerator(Statechart statechart, GeneratorEntry entry) {
 		ExecutionFlow flow = createExecutionFlow(statechart, entry);
@@ -66,7 +66,7 @@ public class CppCodeGenerator extends GenericJavaBasedGenerator {
 				binder.bind(ICodegenTypeSystemAccess.class).to(CTypeSystemAccess.class);
 				binder.bind(INamingService.class).to(CppNamingService.class);
 				binder.bind(GeneratorEntry.class).toInstance(entry);
-				
+
 				binder.bind(IGenArtifactConfigurations.class).to(GenArtifactConfigurations.class);
 				// default binding to ensure consistency of already used API
 				binder.bind(IGenArtifactConfigurations.class)

plugins/org.yakindu.sct.generator.csharp/src/org/yakindu/sct/generator/csharp/CSharpCodeGenerator.java

@@ -9,7 +9,7 @@
  */
 package org.yakindu.sct.generator.csharp;
 
-import org.yakindu.sct.generator.core.impl.GenericJavaBasedGenerator;
+import org.yakindu.sct.generator.core.impl.AbstractSExecModelGenerator;
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess;
 import org.yakindu.sct.generator.csharp.types.CSharpTypeSystemAccess;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
@@ -22,12 +22,11 @@ import com.google.inject.Inject;
 import com.google.inject.Module;
 import com.google.inject.util.Modules;
 
-public class CSharpCodeGenerator extends GenericJavaBasedGenerator {
+public class CSharpCodeGenerator extends AbstractSExecModelGenerator {
 
 	@Inject
 	CSharpGenerator delegate;
-	
-	
+
 	@Override
 	public void runGenerator(Statechart statechart, GeneratorEntry entry) {
 		ExecutionFlow flow = createExecutionFlow(statechart, entry);
@@ -37,18 +36,16 @@ public class CSharpCodeGenerator extends GenericJavaBasedGenerator {
 		delegate.generate(flow, entry, sctFsa.getIFileSystemAccess());
 	}
 
-	
 	@Override
 	public Module getOverridesModule(final GeneratorEntry entry) {
 		Module module = super.getOverridesModule(entry);
 		return Modules.override(module).with(new Module() {
 			public void configure(Binder binder) {
-				binder.bind(ICodegenTypeSystemAccess.class)
-				.to(CSharpTypeSystemAccess.class);
+				binder.bind(ICodegenTypeSystemAccess.class).to(CSharpTypeSystemAccess.class);
 				binder.bind(INamingService.class).to(CSharpNamingService.class);
 				binder.bind(GeneratorEntry.class).toInstance(entry);
 			}
 		});
 	}
-	
+
 }

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/AbstractJavaCodeGenerator.java

@@ -10,13 +10,15 @@
  */
 package org.yakindu.sct.generator.java;
 
-import org.yakindu.sct.generator.core.impl.GenericJavaBasedGenerator;
+import static org.yakindu.sct.generator.core.library.ICoreLibraryConstants.OUTLET_FEATURE;
+import static org.yakindu.sct.generator.core.library.ICoreLibraryConstants.OUTLET_FEATURE_TARGET_FOLDER;
+
+import org.yakindu.sct.generator.core.impl.AbstractSExecModelGenerator;
 import org.yakindu.sct.model.sgen.FeatureConfiguration;
 import org.yakindu.sct.model.sgen.GeneratorEntry;
 import org.yakindu.sct.model.sgraph.Statechart;
-import static org.yakindu.sct.generator.core.library.ICoreLibraryConstants.*;
 
-abstract public class AbstractJavaCodeGenerator extends GenericJavaBasedGenerator {
+abstract public class AbstractJavaCodeGenerator extends AbstractSExecModelGenerator {
 
 	abstract public void generate(Statechart statechart, GeneratorEntry entry);
 

plugins/org.yakindu.sct.generator.runner/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

plugins/org.yakindu.sct.generator.runner/.gitignore

@@ -0,0 +1 @@
+/bin/

plugins/org.yakindu.sct.generator.runner/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.yakindu.sct.generator.runner</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

plugins/org.yakindu.sct.generator.runner/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7

plugins/org.yakindu.sct.generator.runner/META-INF/MANIFEST.MF

@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: YAKINDU Workspace Generator Runner
+Bundle-SymbolicName: org.yakindu.sct.generator.runner;singleton:=true
+Bundle-Version: 2.7.1.qualifier
+Bundle-Activator: org.yakindu.sct.generator.runner.RunnerActivator
+Bundle-Vendor: statecharts.org
+Require-Bundle: org.eclipse.core.runtime,
+ org.yakindu.sct.generator.core,
+ org.yakindu.sct.generator.genmodel,
+ org.yakindu.sct.commons,
+ org.eclipse.jdt.core
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy

plugins/org.yakindu.sct.generator.runner/build.properties

@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml

plugins/org.yakindu.sct.generator.runner/plugin.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+         point="org.yakindu.sct.generator.core.featuretypes">
+      <FeatureLibrary
+            library_id="org.yakindu.generator.core.features.generic"
+            defaultProvider="org.yakindu.sct.generator.runner.lib.GenericJavaLibraryDefaultValueProvider"
+            uri="platform:/plugin/org.yakindu.sct.generator.runner/library/GenericJavaFeatureTypeLibrary.xmi">
+   	  </FeatureLibrary>   	  
+ </extension>
+ <extension
+       point="org.yakindu.sct.generator.core.generator">
+   <SCTGenerator
+         class="org.yakindu.sct.generator.runner.GenericJavaBasedGenerator"
+         contentType="statechart"
+         description="Generate Code using a runtime code generator"
+         elementRefType="org.yakindu.sct.model.sgraph.Statechart"
+         icon="icons/sct.png"
+         id="yakindu::generic"
+         name="Custom Xtend2/Java-based Generator">
+      <FeatureLibrary
+            library_id="org.yakindu.generator.core.features">
+      </FeatureLibrary>
+      <FeatureLibrary
+            library_id="org.yakindu.generator.core.features.generic">
+      </FeatureLibrary>
+    </SCTGenerator>
+ </extension>
+    <extension
+         point="org.yakindu.sct.generator.core.extensions">
+      <ExtensionGeneratorMapping
+            fileExtension="sct"
+            generatorId="yakindu::generic">
+      </ExtensionGeneratorMapping>
+   </extension>
+</plugin>

plugins/org.yakindu.sct.generator.runner/pom.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.yakindu.sct</groupId>
+		<artifactId>org.yakindu.sct.releng</artifactId>
+		<version>2.7.1-SNAPSHOT</version>
+		<relativePath>../../releng/org.yakindu.sct.releng/pom.xml</relativePath>
+	</parent>
+	<artifactId>org.yakindu.sct.generator.runner</artifactId>
+	<groupId>org.yakindu.sct.plugins</groupId>
+	<packaging>eclipse-plugin</packaging>
+</project>

plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/impl/GenericJavaBasedGenerator.java

@@ -8,12 +8,12 @@
  * 	committers of YAKINDU - initial API and implementation
  * 
  */
-package org.yakindu.sct.generator.core.impl;
+package org.yakindu.sct.generator.runner;
 
-import static org.yakindu.sct.generator.core.features.impl.IGenericJavaFeatureConstants.CONFIGURATION_MODULE;
-import static org.yakindu.sct.generator.core.features.impl.IGenericJavaFeatureConstants.GENERATOR_CLASS;
-import static org.yakindu.sct.generator.core.features.impl.IGenericJavaFeatureConstants.GENERATOR_PROJECT;
-import static org.yakindu.sct.generator.core.features.impl.IGenericJavaFeatureConstants.TEMPLATE_FEATURE;
+import static org.yakindu.sct.generator.runner.lib.IGenericJavaFeatureConstants.CONFIGURATION_MODULE;
+import static org.yakindu.sct.generator.runner.lib.IGenericJavaFeatureConstants.GENERATOR_CLASS;
+import static org.yakindu.sct.generator.runner.lib.IGenericJavaFeatureConstants.GENERATOR_PROJECT;
+import static org.yakindu.sct.generator.runner.lib.IGenericJavaFeatureConstants.TEMPLATE_FEATURE;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -21,6 +21,9 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.xtext.util.Strings;
 import org.yakindu.sct.commons.WorkspaceClassLoaderFactory;
+import org.yakindu.sct.generator.core.impl.AbstractSExecModelGenerator;
+import org.yakindu.sct.generator.core.impl.IExecutionFlowGenerator;
+import org.yakindu.sct.generator.core.impl.ISGraphGenerator;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
 import org.yakindu.sct.model.sgen.FeatureConfiguration;
 import org.yakindu.sct.model.sgen.FeatureParameterValue;

plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/RunnerActivator.java

@@ -0,0 +1,30 @@
+package org.yakindu.sct.generator.runner;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class RunnerActivator implements BundleActivator {
+
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext bundleContext) throws Exception {
+		RunnerActivator.context = bundleContext;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext bundleContext) throws Exception {
+		RunnerActivator.context = null;
+	}
+
+}

plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/library/impl/GenericJavaLibraryDefaultValueProvider.java

@@ -8,11 +8,11 @@
  * 	committers of YAKINDU - initial API and implementation
  * 
  */
-package org.yakindu.sct.generator.core.library.impl;
+package org.yakindu.sct.generator.runner.lib;
 
-import static org.yakindu.sct.generator.core.features.impl.IGenericJavaFeatureConstants.GENERATOR_CLASS;
-import static org.yakindu.sct.generator.core.features.impl.IGenericJavaFeatureConstants.GENERATOR_PROJECT;
-import static org.yakindu.sct.generator.core.features.impl.IGenericJavaFeatureConstants.LIBRARY_NAME;
+import static org.yakindu.sct.generator.runner.lib.IGenericJavaFeatureConstants.GENERATOR_CLASS;
+import static org.yakindu.sct.generator.runner.lib.IGenericJavaFeatureConstants.GENERATOR_PROJECT;
+import static org.yakindu.sct.generator.runner.lib.IGenericJavaFeatureConstants.LIBRARY_NAME;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;

plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/features/impl/IGenericJavaFeatureConstants.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     committers of YAKINDU - initial API and implementation
  */
-package org.yakindu.sct.generator.core.features.impl;
+package org.yakindu.sct.generator.runner.lib;
 
 public interface IGenericJavaFeatureConstants {
 	public static final String LIBRARY_NAME = "Java";

plugins/org.yakindu.sct.generator.xpand/plugin.xml

@@ -5,14 +5,14 @@
          point="org.yakindu.sct.generator.core.featuretypes">
       <FeatureLibrary
             library_id="org.yakindu.generator.core.features.xpand"
-            defaultProvider="org.yakindu.sct.generator.core.features.impl.XpandLibraryDefaultFeatureValueProvider"
+            defaultProvider="org.yakindu.sct.generator.xpand.features.XpandLibraryDefaultFeatureValueProvider"
             uri="platform:/plugin/org.yakindu.sct.generator.core/library/XpandFeatureTypeLibrary.xmi">
       </FeatureLibrary>
  </extension>
  <extension
        point="org.yakindu.sct.generator.core.generator">
     <SCTGenerator
-          class="org.yakindu.sct.generator.xpand.GenericXPandCodeGenerator"
+          class="org.yakindu.sct.generator.xpand.GenericXpandCodeGenerator"
           contentType="statechart"
           description="Generate Code using Xpand Templates"
           elementRefType="org.yakindu.sct.model.sgraph.Statechart"

plugins/org.yakindu.sct.generator.xpand/src/org/yakindu/sct/generator/xpand/GenericXPandCodeGenerator.java

@@ -29,7 +29,7 @@ import org.yakindu.sct.model.sgen.GeneratorEntry;
 /**
  * @author holger willebrandt - Initial contribution and API
  */
-public class GenericXPandCodeGenerator extends AbstractXpandBasedCodeGenerator {
+public class GenericXpandCodeGenerator extends AbstractXpandBasedCodeGenerator {
 
 	private String templatePath;