Merge pull request #32 from uniba-dsg/add-engine-ids

Add engine ids
uniba-dsg · Sep 29, 2015 · 4671a09 · 4671a09
2 parents 991b42c + de74eca
commit 4671a09
Show file tree

Hide file tree

Showing 51 changed files with 395 additions and 256 deletions.
diff --git a/README.md b/README.md
@@ -58,11 +58,13 @@ Options:
  -f,--use-custom-test-folder <arg>   Use a custom test folder (folder name defaults to "test")
 
 GROUPS for <ENGINES> and <PROCESSES> are in CAPITAL LETTERS.
-<ENGINES>: [ALL, LOCALS, VMS, RECENT, ode, bpelg, openesb, petalsesb,
-orchestra, active-bpel, openesb23, openesb231, petalsesb41, ode136,
-ode-in-memory, ode136-in-memory, bpelg-in-memory, wso2_v3_1_0,
-wso2_v3_0_0, wso2_v2_1_2, ode_v, bpelg_v, openesb_v, petalsesb_v,
-orchestra_v, active_bpel_v]
+<ENGINES>: [ALL, LOCALS, VMS, RECENT, ode__1_3_5, ode__1_3_6,
+ode__1_3_5__in-memory, ode__1_3_6__in-memory, openesb__2_2, openesb__2_3,
+openesb__2_3_1, openesb__3_0_1, orchestra__4_9, active-bpel__5_0_2,
+petalsesb__4_0, petalsesb__4_1, bpelg__5_3, bpelg__5_3__in-memory,
+wso2__3_2_0, wso2__3_1_0, wso2__3_0_0, wso2__2_1_2, ode__1_3_5__virtual,
+bpelg__5_3__virtual, openesb__2_2__virtual, petalsesb__4_0__virtual,
+orchestra__4_9__virtual, active-bpel__5_0_2__virtual]
 <PROCESSES>: [ALL, BASIC_ACTIVITIES_WAIT, BASIC_ACTIVITIES_THROW,
 BASIC_ACTIVITIES_RECEIVE, BASIC_ACTIVITIES_INVOKE,
 BASIC_ACTIVITIES_ASSIGN, BASIC_ACTIVITIES, SCOPES_EVENT_HANDLERS,
@@ -104,8 +106,9 @@ Options:
  -o,--open-results-in-browser   Opens results in default browser
 
 GROUPS for <ENGINES> and <PROCESSES> are in CAPITAL LETTERS.
-<ENGINES>: [ALL, camunda, camunda710, camunda720, camunda730, activiti,
-activiti5170, jbpm, jbpm610, jbpm620]
+<ENGINES>: [ALL, camunda__7_0_0, camunda__7_1_0, camunda__7_2_0,
+camunda__7_3_0, activiti__5_16_3, activiti__5_17_0, jbpm__6_0_1,
+jbpm__6_1_0, jbpm__6_2_0]
 
 
 <PROCESSES>: [ALL, GATEWAYS, ACTIVITIES, ERRORS, EVENTS, BASICS, DATA,

diff --git a/src/main/groovy/betsy/bpel/UniformProcessEngineManagementAPI.java b/src/main/groovy/betsy/bpel/UniformProcessEngineManagementAPI.java
@@ -4,6 +4,7 @@
 import betsy.bpel.model.BPELProcess;
 import betsy.common.engines.EngineAPI;
 import betsy.common.engines.ProcessLanguage;
+import betsy.common.model.Engine;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -77,7 +78,8 @@ public List<Path> getLogs() {
     }
 
     @Override
-    public String getName() {
-        return engine.getName();
+    public Engine getEngineId() {
+        return engine.getEngineId();
     }
+
 }
diff --git a/src/main/groovy/betsy/bpel/engines/AbstractBPELEngine.java b/src/main/groovy/betsy/bpel/engines/AbstractBPELEngine.java
@@ -4,7 +4,6 @@
 import betsy.common.HasPath;
 import betsy.common.engines.EngineAPI;
 import betsy.common.engines.ProcessLanguage;
-import betsy.common.util.ClasspathHelper;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -16,14 +15,7 @@ public abstract class AbstractBPELEngine implements EngineAPI<BPELProcess>, HasP
     private BPELEnginePackageBuilder packageBuilder = new BPELEnginePackageBuilder();
     private Path parentFolder;
 
-    /**
-     * The path <code>src/main/xslt/$engine</code>
-     *
-     * @return the path <code>src/main/xslt/$engine</code>
-     */
-    public Path getXsltPath() {
-        return ClasspathHelper.getFilesystemPathFromClasspathPath("/bpel/" + getName());
-    }
+    public abstract Path getXsltPath();
 
     /**
      * The path <code>test/$engine</code>

diff --git a/src/main/groovy/betsy/bpel/engines/activebpel/ActiveBpelEngine.java b/src/main/groovy/betsy/bpel/engines/activebpel/ActiveBpelEngine.java
@@ -2,9 +2,12 @@
 
 import betsy.bpel.engines.AbstractLocalBPELEngine;
 import betsy.bpel.model.BPELProcess;
+import betsy.common.engines.ProcessLanguage;
 import betsy.common.engines.tomcat.Tomcat;
+import betsy.common.model.Engine;
 import betsy.common.tasks.FileTasks;
 import betsy.common.tasks.XSLTTasks;
+import betsy.common.util.ClasspathHelper;
 import org.apache.log4j.Logger;
 
 import java.io.File;
@@ -16,8 +19,12 @@
 public class ActiveBpelEngine extends AbstractLocalBPELEngine {
 
     @Override
-    public String getName() {
-        return "active-bpel";
+    public Engine getEngineId() {
+        return new Engine(ProcessLanguage.BPEL, "activebpel", "5.0.2");
+    }
+
+    public Path getXsltPath() {
+        return ClasspathHelper.getFilesystemPathFromClasspathPath("/bpel/active-bpel");
     }
 
     @Override
@@ -81,7 +88,7 @@ public boolean isRunning() {
 
     @Override
     public void install() {
-        new ActiveBpelInstaller().install();
+        new ActiveBpelInstaller(getServerPath()).install();
     }
 
     @Override

diff --git a/src/main/groovy/betsy/bpel/engines/activebpel/ActiveBpelInstaller.java b/src/main/groovy/betsy/bpel/engines/activebpel/ActiveBpelInstaller.java
@@ -13,9 +13,15 @@
 import java.util.Map;
 
 public class ActiveBpelInstaller {
+
+    private final Path serverDir;
+
+    public ActiveBpelInstaller(Path serverDir) {
+        this.serverDir = serverDir;
+    }
+
     public void install() {
         // setup engine folder
-        Path serverDir = Paths.get("server/active-bpel");
         FileTasks.mkdirs(serverDir);
 
         TomcatInstaller installer = TomcatInstaller.v5(serverDir);

diff --git a/src/main/groovy/betsy/bpel/engines/bpelg/BpelgEngine.java b/src/main/groovy/betsy/bpel/engines/bpelg/BpelgEngine.java
@@ -2,18 +2,26 @@
 
 import betsy.bpel.engines.AbstractLocalBPELEngine;
 import betsy.bpel.model.BPELProcess;
+import betsy.common.engines.ProcessLanguage;
 import betsy.common.engines.tomcat.Tomcat;
+import betsy.common.model.Engine;
 import betsy.common.tasks.FileTasks;
 import betsy.common.tasks.XSLTTasks;
+import betsy.common.util.ClasspathHelper;
 
 import java.nio.file.Path;
 import java.util.LinkedList;
 import java.util.List;
 
 public class BpelgEngine extends AbstractLocalBPELEngine {
+
+    public Path getXsltPath() {
+        return ClasspathHelper.getFilesystemPathFromClasspathPath("/bpel/bpelg");
+    }
+
     @Override
-    public String getName() {
-        return "bpelg";
+    public Engine getEngineId() {
+        return new Engine(ProcessLanguage.BPEL, "bpelg", "5.3");
     }
 
     public Path getDeploymentDir() {

diff --git a/src/main/groovy/betsy/bpel/engines/bpelg/BpelgInMemoryEngine.java b/src/main/groovy/betsy/bpel/engines/bpelg/BpelgInMemoryEngine.java
@@ -1,9 +1,20 @@
 package betsy.bpel.engines.bpelg;
 
+import betsy.common.engines.ProcessLanguage;
+import betsy.common.model.Engine;
+import betsy.common.util.ClasspathHelper;
+
+import java.nio.file.Path;
+
 public class BpelgInMemoryEngine extends BpelgEngine {
+
+    public Path getXsltPath() {
+        return ClasspathHelper.getFilesystemPathFromClasspathPath("/bpel/bpelg-in-memory");
+    }
+
     @Override
-    public String getName() {
-        return "bpelg-in-memory";
+    public Engine getEngineId() {
+        return new Engine(ProcessLanguage.BPEL, "bpelg", "5.3", "in-memory");
     }
 
 }
diff --git a/src/main/groovy/betsy/bpel/engines/ode/Ode136Engine.java b/src/main/groovy/betsy/bpel/engines/ode/Ode136Engine.java
@@ -1,13 +1,16 @@
 package betsy.bpel.engines.ode;
 
+import betsy.common.engines.ProcessLanguage;
+import betsy.common.model.Engine;
 import betsy.common.util.ClasspathHelper;
 
 import java.nio.file.Path;
 
 public class Ode136Engine extends OdeEngine {
+
     @Override
-    public String getName() {
-        return "ode136";
+    public Engine getEngineId() {
+        return new Engine(ProcessLanguage.BPEL, "ode", "1.3.6");
     }
 
     public Path getXsltPath() {

diff --git a/src/main/groovy/betsy/bpel/engines/ode/Ode136InMemoryEngine.java b/src/main/groovy/betsy/bpel/engines/ode/Ode136InMemoryEngine.java
@@ -1,13 +1,16 @@
 package betsy.bpel.engines.ode;
 
+import betsy.common.engines.ProcessLanguage;
+import betsy.common.model.Engine;
 import betsy.common.util.ClasspathHelper;
 
 import java.nio.file.Path;
 
 public class Ode136InMemoryEngine extends Ode136Engine {
+
     @Override
-    public String getName() {
-        return "ode136-in-memory";
+    public Engine getEngineId() {
+        return new Engine(ProcessLanguage.BPEL, "ode", "1.3.6", "in-memory");
     }
 
     public Path getXsltPath() {

diff --git a/src/main/groovy/betsy/bpel/engines/ode/OdeEngine.java b/src/main/groovy/betsy/bpel/engines/ode/OdeEngine.java
@@ -2,9 +2,12 @@
 
 import betsy.bpel.engines.AbstractLocalBPELEngine;
 import betsy.bpel.model.BPELProcess;
+import betsy.common.engines.ProcessLanguage;
 import betsy.common.engines.tomcat.Tomcat;
+import betsy.common.model.Engine;
 import betsy.common.tasks.FileTasks;
 import betsy.common.tasks.XSLTTasks;
+import betsy.common.util.ClasspathHelper;
 
 import java.nio.file.Path;
 import java.util.LinkedList;
@@ -15,8 +18,13 @@ public class OdeEngine extends AbstractLocalBPELEngine {
     public static final String TEST_INTERFACE_SERVICE = "TestInterfaceService";
 
     @Override
-    public String getName() {
-        return "ode";
+    public Path getXsltPath() {
+        return ClasspathHelper.getFilesystemPathFromClasspathPath("/bpel/ode");
+    }
+
+    @Override
+    public Engine getEngineId() {
+        return new Engine(ProcessLanguage.BPEL, "ode", "1.3.5");
     }
 
     @Override

diff --git a/src/main/groovy/betsy/bpel/engines/ode/OdeInMemoryEngine.java b/src/main/groovy/betsy/bpel/engines/ode/OdeInMemoryEngine.java
@@ -1,13 +1,16 @@
 package betsy.bpel.engines.ode;
 
+import betsy.common.engines.ProcessLanguage;
+import betsy.common.model.Engine;
 import betsy.common.util.ClasspathHelper;
 
 import java.nio.file.Path;
 
 public class OdeInMemoryEngine extends OdeEngine {
+
     @Override
-    public String getName() {
-        return "ode-in-memory";
+    public Engine getEngineId() {
+        return new Engine(ProcessLanguage.BPEL, "ode", "1.3.5", "in-memory");
     }
 
     @Override

diff --git a/src/main/groovy/betsy/bpel/engines/openesb/OpenEsb231Engine.java b/src/main/groovy/betsy/bpel/engines/openesb/OpenEsb231Engine.java
@@ -1,19 +1,17 @@
 package betsy.bpel.engines.openesb;
 
+import betsy.common.engines.ProcessLanguage;
+import betsy.common.model.Engine;
 import betsy.common.util.ClasspathHelper;
 import betsy.common.util.OperatingSystem;
 
-import java.nio.file.Path;
 import java.nio.file.Paths;
 
 public class OpenEsb231Engine extends OpenEsbEngine {
-    @Override
-    public String getName() {
-        return "openesb231";
-    }
 
-    public Path getXsltPath() {
-        return ClasspathHelper.getFilesystemPathFromClasspathPath("/bpel/openesb");
+    @Override
+    public Engine getEngineId() {
+        return new Engine(ProcessLanguage.BPEL, "openesb", "2.3.1");
     }
 
     @Override

diff --git a/src/main/groovy/betsy/bpel/engines/openesb/OpenEsb23Engine.java b/src/main/groovy/betsy/bpel/engines/openesb/OpenEsb23Engine.java
@@ -1,19 +1,17 @@
 package betsy.bpel.engines.openesb;
 
+import betsy.common.engines.ProcessLanguage;
+import betsy.common.model.Engine;
 import betsy.common.util.ClasspathHelper;
 import betsy.common.util.OperatingSystem;
 
-import java.nio.file.Path;
 import java.nio.file.Paths;
 
 public class OpenEsb23Engine extends OpenEsbEngine {
-    @Override
-    public String getName() {
-        return "openesb23";
-    }
 
-    public Path getXsltPath() {
-        return ClasspathHelper.getFilesystemPathFromClasspathPath("/bpel/openesb");
+    @Override
+    public Engine getEngineId() {
+        return new Engine(ProcessLanguage.BPEL, "openesb", "2.3");
     }
 
     @Override

diff --git a/src/main/groovy/betsy/bpel/engines/openesb/OpenEsb301StandaloneEngine.java b/src/main/groovy/betsy/bpel/engines/openesb/OpenEsb301StandaloneEngine.java
@@ -3,6 +3,8 @@
 import betsy.bpel.engines.AbstractLocalBPELEngine;
 import betsy.bpel.model.BPELProcess;
 import betsy.common.config.Configuration;
+import betsy.common.engines.ProcessLanguage;
+import betsy.common.model.Engine;
 import betsy.common.tasks.*;
 import betsy.common.util.ClasspathHelper;
 import betsy.common.util.StringUtils;
@@ -188,7 +190,7 @@ public boolean isRunning() {
     }
 
     @Override
-    public String getName() {
-        return "openesb301standalone";
+    public Engine getEngineId() {
+        return new Engine(ProcessLanguage.BPEL, "openesb", "3.0.1");
     }
 }
diff --git a/src/main/groovy/betsy/bpel/engines/openesb/OpenEsbEngine.java b/src/main/groovy/betsy/bpel/engines/openesb/OpenEsbEngine.java
@@ -2,6 +2,8 @@
 
 import betsy.bpel.engines.AbstractLocalBPELEngine;
 import betsy.bpel.model.BPELProcess;
+import betsy.common.engines.ProcessLanguage;
+import betsy.common.model.Engine;
 import betsy.common.tasks.FileTasks;
 import betsy.common.tasks.WaitTasks;
 import betsy.common.tasks.XSLTTasks;
@@ -14,9 +16,13 @@
 
 public class OpenEsbEngine extends AbstractLocalBPELEngine {
 
+    public Path getXsltPath() {
+        return ClasspathHelper.getFilesystemPathFromClasspathPath("/bpel/openesb");
+    }
+
     @Override
-    public String getName() {
-        return "openesb";
+    public Engine getEngineId() {
+        return new Engine(ProcessLanguage.BPEL, "openesb", "2.2");
     }
 
     @Override

diff --git a/src/main/groovy/betsy/bpel/engines/orchestra/OrchestraEngine.java b/src/main/groovy/betsy/bpel/engines/orchestra/OrchestraEngine.java
@@ -2,17 +2,24 @@
 
 import betsy.bpel.engines.AbstractLocalBPELEngine;
 import betsy.bpel.model.BPELProcess;
+import betsy.common.engines.ProcessLanguage;
 import betsy.common.engines.tomcat.Tomcat;
+import betsy.common.model.Engine;
 import betsy.common.tasks.FileTasks;
 
 import java.nio.file.Path;
 import java.util.LinkedList;
 import java.util.List;
 
 public class OrchestraEngine extends AbstractLocalBPELEngine {
+
+    public Path getXsltPath() {
+        throw new IllegalStateException("unused");
+    }
+
     @Override
-    public String getName() {
-        return "orchestra";
+    public Engine getEngineId() {
+        return new Engine(ProcessLanguage.BPEL, "orchestra", "4.9");
     }
 
     public Tomcat getTomcat() {
@@ -21,7 +28,7 @@ public Tomcat getTomcat() {
 
     @Override
     public void install() {
-        new OrchestraInstaller().install();
+        new OrchestraInstaller(getServerPath()).install();
     }
 
     @Override