diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index fffb04f..a957797 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,7 +3,7 @@ org.eclipse.tycho.extras tycho-pomless - 1.4.0 + 2.4.0 diff --git a/epsilon-runtime-execution/pom.xml b/epsilon-runtime-execution/pom.xml index f22b682..aa3df1e 100644 --- a/epsilon-runtime-execution/pom.xml +++ b/epsilon-runtime-execution/pom.xml @@ -5,8 +5,7 @@ hu.blackbelt.epsilon epsilon-runtime-parent - 1.3.0-SNAPSHOT - ../ + 1.4.0-SNAPSHOT epsilon-runtime-execution diff --git a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/EmfUtils.java b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/EmfUtils.java index 2ad1e62..d6f8c4e 100644 --- a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/EmfUtils.java +++ b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/EmfUtils.java @@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; import org.eclipse.epsilon.emc.emf.CachedResourceSet; +import org.eclipse.epsilon.emc.emf.EmfModelResourceSet; import org.eclipse.epsilon.eol.exceptions.models.EolModelLoadingException; import org.eclipse.epsilon.eol.models.IModel; import org.eclipse.uml2.uml.UMLPackage; diff --git a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EclExecutionContext.java b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EclExecutionContext.java index ac1a9ca..57be7db 100644 --- a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EclExecutionContext.java +++ b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EclExecutionContext.java @@ -5,6 +5,8 @@ import lombok.Getter; import lombok.NonNull; import org.eclipse.epsilon.ecl.EclModule; +import org.eclipse.epsilon.ecl.concurrent.EclModuleParallel; +import org.eclipse.epsilon.ecl.concurrent.EclModuleParallelAnnotation; import org.eclipse.epsilon.ecl.trace.MatchTrace; import org.eclipse.epsilon.eol.IEolModule; @@ -22,16 +24,21 @@ public class EclExecutionContext extends EolExecutionContext { @NonNull private String useMatchTrace; - @Builder.Default - private EclModule eclModule = new EclModule(); + private final EclModule eclModule; @Builder(builderMethodName = "eclExecutionContextBuilder") - public EclExecutionContext(URI source, List parameters, String useMatchTrace, String exportMatchTrace, EclModule eclModule) { - super(source, parameters); + public EclExecutionContext(URI source, List parameters, String useMatchTrace, String exportMatchTrace, EclModule eclModule, Boolean parallel) { + super(source, parameters, false, parallel); this.useMatchTrace = useMatchTrace; this.exportMatchTrace = exportMatchTrace; if (eclModule != null) { this.eclModule = eclModule; + } else if (parallel != null && parallel) { + // TODO: Not supported yet, newer version have to be released + // this.eclModule = new EclModuleParallelAnnotation(); + this.eclModule = new EclModule(); + } else { + this.eclModule = new EclModule(); } } diff --git a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EglExecutionContext.java b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EglExecutionContext.java index 70dd323..c1fe8b0 100644 --- a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EglExecutionContext.java +++ b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EglExecutionContext.java @@ -31,8 +31,8 @@ public class EglExecutionContext extends EolExecutionContext { private ContentTypeRepository defaultContentTypeRepository; @Builder(builderMethodName = "eglExecutionContextBuilder") - public EglExecutionContext(URI source, List parameters, String outputRoot) { - super(source, parameters); + public EglExecutionContext(URI source, List parameters, String outputRoot, Boolean parallel) { + super(source, parameters, false, parallel); try { defaultContentTypeRepository = new DefaultContentTypeRepository( UriResolver.calculateURI(this.getClass(), DEFAULT_CONFIG_XML).toURL().openStream()); diff --git a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EgxExecutionContext.java b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EgxExecutionContext.java index 803a462..4a40194 100644 --- a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EgxExecutionContext.java +++ b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EgxExecutionContext.java @@ -3,6 +3,7 @@ import hu.blackbelt.epsilon.runtime.execution.exceptions.ScriptExecutionException; import lombok.Builder; import org.eclipse.epsilon.egl.EgxModule; +import org.eclipse.epsilon.egl.concurrent.EgxModuleParallelAnnotation; import org.eclipse.epsilon.eol.IEolModule; import java.net.URI; @@ -12,14 +13,13 @@ public class EgxExecutionContext extends EglExecutionContext { @Builder(builderMethodName = "egxExecutionContextBuilder") - public EgxExecutionContext(URI source, List parameters, String outputRoot) { - super(source, parameters, outputRoot); + public EgxExecutionContext(URI source, List parameters, String outputRoot, Boolean parallel) { + super(source, parameters, outputRoot, parallel); } @Override public IEolModule getModule(Map context) throws ScriptExecutionException { - EgxModule module = new EgxModule(getTemplateFactory(context)); - return module; + return new EgxModule(getTemplateFactory(context)); } } diff --git a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EmlExecutionContext.java b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EmlExecutionContext.java index 4ddee40..5e0e612 100644 --- a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EmlExecutionContext.java +++ b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EmlExecutionContext.java @@ -18,14 +18,16 @@ public class EmlExecutionContext extends EtlExecutionContext { @NonNull private String useMatchTrace; - private EmlModule emlModule = new EmlModule(); + private final EmlModule emlModule; @Builder(builderMethodName = "emlExecutionContextBuilder") - public EmlExecutionContext(URI source, List parameters, String useMatchTrace, String exportTransformationTrace, EmlModule emlModule) { - super(source, parameters, exportTransformationTrace, null); + public EmlExecutionContext(URI source, List parameters, String useMatchTrace, String exportTransformationTrace, EmlModule emlModule, Boolean parallel) { + super(source, parameters, exportTransformationTrace, null, false, parallel); this.useMatchTrace = useMatchTrace; if (emlModule != null) { this.emlModule = emlModule; + } else { + this.emlModule = new EmlModule(); } } diff --git a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EolExecutionContext.java b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EolExecutionContext.java index 95fa828..b0d00e7 100644 --- a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EolExecutionContext.java +++ b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EolExecutionContext.java @@ -6,6 +6,7 @@ import lombok.NonNull; import org.eclipse.epsilon.eol.EolModule; import org.eclipse.epsilon.eol.IEolModule; +import org.eclipse.epsilon.eol.concurrent.EolModuleParallel; import java.net.URI; import java.util.List; @@ -20,13 +21,21 @@ public class EolExecutionContext { @NonNull private List parameters; - @Builder.Default - private EolModule module = new EolModule(); //new EolModuleParallel(); + private final EolModule module; @Builder(builderMethodName = "eolExecutionContextBuilder") - public EolExecutionContext(URI source, List parameters) { + public EolExecutionContext(URI source, List parameters, Boolean createModule, Boolean parallel) { this.source = source; this.parameters = parameters; + if (createModule == null || createModule) { + if (parallel != null && parallel) { + module = new EolModuleParallel(); + } else { + module = new EolModule(); + } + } else { + module = null; + } } public IEolModule getModule(Map context) throws ScriptExecutionException { diff --git a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EtlExecutionContext.java b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EtlExecutionContext.java index ec6d13d..6e5467d 100644 --- a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EtlExecutionContext.java +++ b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EtlExecutionContext.java @@ -18,14 +18,22 @@ public class EtlExecutionContext extends EolExecutionContext { @NonNull private String exportTransformationTrace; - EtlModule etlModule = new EtlModule(); // new EtlModuleParallel(); + final EtlModule etlModule; @Builder(builderMethodName = "etlExecutionContextBuilder") - public EtlExecutionContext(URI source, List parameters, String exportTransformationTrace, EtlModule etlModule) { - super(source, parameters); + public EtlExecutionContext(URI source, List parameters, String exportTransformationTrace, EtlModule etlModule, Boolean createModule, Boolean parallel) { + super(source, parameters, false, parallel); this.exportTransformationTrace = exportTransformationTrace; - if (etlModule != null) { - this.etlModule = etlModule; + if (createModule == null || createModule) { + if (etlModule != null) { + this.etlModule = etlModule; + } else if (parallel != null && parallel) { + this.etlModule = new EtlModuleParallel(); + } else { + this.etlModule = new EtlModule(); + } + } else { + this.etlModule = null; } } diff --git a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EvlExecutionContext.java b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EvlExecutionContext.java index b41e3b3..a921da0 100644 --- a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EvlExecutionContext.java +++ b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EvlExecutionContext.java @@ -22,8 +22,8 @@ public class EvlExecutionContext extends EolExecutionContext { @Builder.Default - private EvlModule module = new EvlModuleParallelElements(); - + private EvlModule module = new EvlModule(); + private Collection expectedErrors; private Collection expectedWarnings; @@ -34,8 +34,9 @@ public class EvlExecutionContext extends EolExecutionContext { @Builder(builderMethodName = "evlExecutionContextBuilder") public EvlExecutionContext(URI source, List parameters, - Collection expectedErrors, Collection expectedWarnings, EvlModule module) { - super(source, parameters); + Collection expectedErrors, Collection expectedWarnings, EvlModule module, + Boolean parallel) { + super(source, parameters, false, parallel); if (expectedErrors != null) { this.expectedErrors = Collections.unmodifiableCollection(expectedErrors); } @@ -44,6 +45,8 @@ public EvlExecutionContext(URI source, List parameters, } if (module != null) { this.module = module; + } else if (parallel != null && parallel) { + this.module = new EvlModuleParallelElements(); } } diff --git a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/model/emf/WrappedEmfModelContext.java b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/model/emf/WrappedEmfModelContext.java index 8777589..c21dd48 100644 --- a/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/model/emf/WrappedEmfModelContext.java +++ b/epsilon-runtime-execution/src/main/java/hu/blackbelt/epsilon/runtime/execution/model/emf/WrappedEmfModelContext.java @@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.resource.URIHandler; import org.eclipse.epsilon.common.util.StringProperties; import org.eclipse.epsilon.emc.emf.EmfModel; +import org.eclipse.epsilon.emc.emf.EmfModelResourceSet; import org.eclipse.epsilon.eol.exceptions.models.EolModelLoadingException; import org.eclipse.epsilon.eol.models.IModel; import org.eclipse.epsilon.eol.models.ModelReference; diff --git a/epsilon-runtime-osgi/pom.xml b/epsilon-runtime-osgi/pom.xml index 79795ba..ae94d5a 100644 --- a/epsilon-runtime-osgi/pom.xml +++ b/epsilon-runtime-osgi/pom.xml @@ -5,8 +5,7 @@ hu.blackbelt.epsilon epsilon-runtime-parent - 1.3.0-SNAPSHOT - ../ + 1.4.0-SNAPSHOT epsilon-runtime-osgi diff --git a/epsilon-runtime-utils/pom.xml b/epsilon-runtime-utils/pom.xml index b11ec7e..de3d88c 100644 --- a/epsilon-runtime-utils/pom.xml +++ b/epsilon-runtime-utils/pom.xml @@ -5,8 +5,7 @@ hu.blackbelt.epsilon epsilon-runtime-parent - 1.3.0-SNAPSHOT - ../ + 1.4.0-SNAPSHOT epsilon-runtime-utils bundle diff --git a/features/pom.xml b/features/pom.xml index a23bf7f..12d18c4 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -5,8 +5,7 @@ hu.blackbelt.epsilon epsilon-runtime-parent - 1.3.0-SNAPSHOT - ../ + 1.4.0-SNAPSHOT features feature diff --git a/kar/pom.xml b/kar/pom.xml index c9e1f38..d16feb0 100644 --- a/kar/pom.xml +++ b/kar/pom.xml @@ -5,8 +5,7 @@ hu.blackbelt.epsilon epsilon-runtime-parent - 1.3.0-SNAPSHOT - ../ + 1.4.0-SNAPSHOT kar kar diff --git a/pom.xml b/pom.xml index a85e047..614cecf 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ hu.blackbelt.epsilon epsilon-runtime-parent pom - 1.3.0-SNAPSHOT + 1.4.0-SNAPSHOT epsilon-runtime Eclipse Epsilon runtime for OSGi/Maven. It wraps the script calling and meta model regitration @@ -13,6 +13,7 @@ GitHub Issues + false org.osgi.framework;version="[1.8,2.0)", !lombok, @@ -26,7 +27,7 @@ 2.11.0 2.16.0 - 2.2.0 + 2.3.0 4.2.1 3.3.1 1.0.11 @@ -34,15 +35,16 @@ 1.0.2 1.61.2 1.0.1 - 1.0.5 + 1.0.6 1.0.1 - 1.0.5 - 1.0.2 + 1.0.6 + 1.0.4 1.0.0 scm:git:git://github.com/BlackBeltTechnology/epsilon-runtime.git + scm:git:ssh://${git.username}@github.com:BlackBeltTechnology/epsilon-runtime.git @@ -116,6 +118,7 @@ default-install + ${deployOnly} @@ -545,10 +548,12 @@ judong-nexus-distribution + ${env.JUDONG_MAVEN_UPSTREAM_SNAPSHOT} judong-nexus-distribution + ${env.JUDONG_MAVEN_UPSTREAM_RELEASE} @@ -635,4 +640,4 @@ - \ No newline at end of file +