Merge pull request #64 from BlackBeltTechnology/feature/JNG-2524_Upda…

…teEpsilon Feature/jng 2524 update epsilon
BlackBeltTechnology · Sep 13, 2021 · 89231f4 · 89231f4
2 parents 3136444 + 4259c2b
commit 89231f4
Show file tree

Hide file tree

Showing 16 changed files with 73 additions and 42 deletions.
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -3,7 +3,7 @@
     <extension>
         <groupId>org.eclipse.tycho.extras</groupId>
         <artifactId>tycho-pomless</artifactId>
-        <version>1.4.0</version>
+        <version>2.4.0</version>
     </extension>
 
     <extension>

diff --git a/epsilon-runtime-execution/pom.xml b/epsilon-runtime-execution/pom.xml
@@ -5,8 +5,7 @@
     <parent>
         <groupId>hu.blackbelt.epsilon</groupId>
         <artifactId>epsilon-runtime-parent</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>epsilon-runtime-execution</artifactId>

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
@@ -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/...on/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EclExecutionContext.java b/...on/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<ProgramParameter> parameters, String useMatchTrace, String exportMatchTrace, EclModule eclModule) {
-        super(source, parameters);
+    public EclExecutionContext(URI source, List<ProgramParameter> 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/...on/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EglExecutionContext.java b/...on/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<ProgramParameter> parameters, String outputRoot) {
-        super(source, parameters);
+    public EglExecutionContext(URI source, List<ProgramParameter> 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/...on/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EgxExecutionContext.java b/...on/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<ProgramParameter> parameters, String outputRoot) {
-        super(source, parameters, outputRoot);
+    public EgxExecutionContext(URI source, List<ProgramParameter> parameters, String outputRoot, Boolean parallel) {
+        super(source, parameters, outputRoot, parallel);
     }
 
     @Override
     public IEolModule getModule(Map<Object, Object> context) throws ScriptExecutionException {
-        EgxModule module = new EgxModule(getTemplateFactory(context));
-        return module;
+        return new EgxModule(getTemplateFactory(context));
     }
 
 }
diff --git a/...on/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EmlExecutionContext.java b/...on/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<ProgramParameter> parameters, String useMatchTrace, String exportTransformationTrace, EmlModule emlModule) {
-        super(source, parameters, exportTransformationTrace, null);
+    public EmlExecutionContext(URI source, List<ProgramParameter> 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/...on/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EolExecutionContext.java b/...on/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<ProgramParameter> parameters;
 
-    @Builder.Default
-    private EolModule module = new EolModule(); //new EolModuleParallel();
+    private final EolModule module;
 
     @Builder(builderMethodName = "eolExecutionContextBuilder")
-    public EolExecutionContext(URI source, List<ProgramParameter> parameters) {
+    public EolExecutionContext(URI source, List<ProgramParameter> 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<Object, Object> context) throws ScriptExecutionException {

diff --git a/...on/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EtlExecutionContext.java b/...on/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<ProgramParameter> parameters, String exportTransformationTrace, EtlModule etlModule) {
-        super(source, parameters);
+    public EtlExecutionContext(URI source, List<ProgramParameter> 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/...on/src/main/java/hu/blackbelt/epsilon/runtime/execution/contexts/EvlExecutionContext.java b/...on/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<String> expectedErrors;
 
     private Collection<String> expectedWarnings;
@@ -34,8 +34,9 @@ public class EvlExecutionContext extends EolExecutionContext {
 
     @Builder(builderMethodName = "evlExecutionContextBuilder")
     public EvlExecutionContext(URI source, List<ProgramParameter> parameters,
-                               Collection<String> expectedErrors, Collection<String> expectedWarnings, EvlModule module) {
-        super(source, parameters);
+                               Collection<String> expectedErrors, Collection<String> 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<ProgramParameter> parameters,
         }
         if (module != null) {
             this.module = module;
+        } else if (parallel != null && parallel) {
+            this.module = new EvlModuleParallelElements();
         }
     }
 

diff --git a/...rc/main/java/hu/blackbelt/epsilon/runtime/execution/model/emf/WrappedEmfModelContext.java b/...rc/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
@@ -5,8 +5,7 @@
     <parent>
         <groupId>hu.blackbelt.epsilon</groupId>
         <artifactId>epsilon-runtime-parent</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>epsilon-runtime-osgi</artifactId>

diff --git a/epsilon-runtime-utils/pom.xml b/epsilon-runtime-utils/pom.xml
@@ -5,8 +5,7 @@
     <parent>
         <groupId>hu.blackbelt.epsilon</groupId>
         <artifactId>epsilon-runtime-parent</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>epsilon-runtime-utils</artifactId>
     <packaging>bundle</packaging>

diff --git a/features/pom.xml b/features/pom.xml
@@ -5,8 +5,7 @@
     <parent>
         <groupId>hu.blackbelt.epsilon</groupId>
         <artifactId>epsilon-runtime-parent</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>features</artifactId>
     <packaging>feature</packaging>

diff --git a/kar/pom.xml b/kar/pom.xml
@@ -5,8 +5,7 @@
     <parent>
         <groupId>hu.blackbelt.epsilon</groupId>
         <artifactId>epsilon-runtime-parent</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>kar</artifactId>
     <packaging>kar</packaging>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <groupId>hu.blackbelt.epsilon</groupId>
     <artifactId>epsilon-runtime-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
 
     <name>epsilon-runtime</name>
     <description>Eclipse Epsilon runtime for OSGi/Maven. It wraps the script calling and meta model regitration</description>
@@ -13,6 +13,7 @@
         <system>GitHub Issues</system>
     </issueManagement>
     <properties>
+        <deployOnly>false</deployOnly>
         <osgi-default-import>
           org.osgi.framework;version="[1.8,2.0)",
           !lombok,
@@ -26,23 +27,24 @@
         <emf-mapping-ecore2xml>2.11.0</emf-mapping-ecore2xml>
         <emf-ecore-xmi-version>2.16.0</emf-ecore-xmi-version>
 
-        <epsilon-version>2.2.0</epsilon-version>
+        <epsilon-version>2.3.0</epsilon-version>
         <karaf-version>4.2.1</karaf-version>
         <cxf-version>3.3.1</cxf-version>
         <osgi-utils-version>1.0.11</osgi-utils-version>
         <google-karaf-features-version>1.0.6</google-karaf-features-version>
         <javax-karaf-features-version>1.0.2</javax-karaf-features-version>
         <bouncycastle-karaf-features-version>1.61.2</bouncycastle-karaf-features-version>
         <eclipse-emf-karaf-features-version>1.0.1</eclipse-emf-karaf-features-version>
-        <eclipse-epsilon-karaf-features-version>1.0.5</eclipse-epsilon-karaf-features-version>
+        <eclipse-epsilon-karaf-features-version>1.0.6</eclipse-epsilon-karaf-features-version>
         <antlr-karaf-features-version>1.0.1</antlr-karaf-features-version>
-        <apache-commons-karaf-features-version>1.0.5</apache-commons-karaf-features-version>
-        <apache-poi-karaf-features-version>1.0.2</apache-poi-karaf-features-version>
+        <apache-commons-karaf-features-version>1.0.6</apache-commons-karaf-features-version>
+        <apache-poi-karaf-features-version>1.0.4</apache-poi-karaf-features-version>
         <apache-httpclient-karaf-features-version>1.0.0</apache-httpclient-karaf-features-version>
     </properties>
 
     <scm>
         <connection>scm:git:git://github.com/BlackBeltTechnology/epsilon-runtime.git</connection>
+        <!--suppress UnresolvedMavenProperty -->
         <developerConnection>
             scm:git:ssh://${git.username}@github.com:BlackBeltTechnology/epsilon-runtime.git
         </developerConnection>
@@ -116,6 +118,7 @@
                         <execution>
                             <id>default-install</id>
                             <configuration>
+                                <!--suppress UnresolvedMavenProperty -->
                                 <skip>${deployOnly}</skip>
                             </configuration>
                         </execution>
@@ -545,10 +548,12 @@
             <distributionManagement>
                 <snapshotRepository>
                     <id>judong-nexus-distribution</id>
+                    <!--suppress UnresolvedMavenProperty -->
                     <url>${env.JUDONG_MAVEN_UPSTREAM_SNAPSHOT}</url>
                 </snapshotRepository>
                 <repository>
                     <id>judong-nexus-distribution</id>
+                    <!--suppress UnresolvedMavenProperty -->
                     <url>${env.JUDONG_MAVEN_UPSTREAM_RELEASE}</url>
                 </repository>
             </distributionManagement>
@@ -635,4 +640,4 @@
             </build>
         </profile>        
     </profiles>
-</project>
+</project>