From de74eca1f1098f1d7acdde8a17e9bcb3b30fa3c7 Mon Sep 17 00:00:00 2001
From: Simon Harrer <simon.harrer@gmail.com>
Date: Tue, 29 Sep 2015 13:31:06 +0200
Subject: [PATCH] PetalsEsbInstaller should be independent of PetalsEsbEngine
 to not have circular dependencies.

---
 .../engines/petalsesb/PetalsEsb41Engine.java     |  3 ++-
 .../bpel/engines/petalsesb/PetalsEsbEngine.java  |  4 +++-
 .../engines/petalsesb/PetalsEsbInstaller.java    | 16 ++++++++--------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/groovy/betsy/bpel/engines/petalsesb/PetalsEsb41Engine.java b/src/main/groovy/betsy/bpel/engines/petalsesb/PetalsEsb41Engine.java
index e47510ac..89682c90 100644
--- a/src/main/groovy/betsy/bpel/engines/petalsesb/PetalsEsb41Engine.java
+++ b/src/main/groovy/betsy/bpel/engines/petalsesb/PetalsEsb41Engine.java
@@ -43,7 +43,7 @@ public void shutdown() {
 
     @Override
     public void install() {
-        PetalsEsbInstaller installer = new PetalsEsbInstaller(this);
+        PetalsEsbInstaller installer = new PetalsEsbInstaller();
         installer.setServerDir(getServerPath());
         installer.setFileName("petals-esb-distrib-4.1.0.zip");
         installer.setTargetEsbInstallDir(getServerPath().resolve("petals-esb-4.1/install"));
@@ -51,6 +51,7 @@ public void install() {
         installer.setSoapComponentPath(getServerPath().resolve("petals-esb-distrib-4.1.0/esb-components/petals-bc-soap-4.2.0.zip"));
         installer.setSourceFile(getServerPath().resolve("petals-esb-distrib-4.1.0/esb/petals-esb-4.1.zip"));
         installer.setCliFile(getServerPath().resolve("petals-esb-distrib-4.1.0/esb/petals-cli-2.0.0.zip"));
+        installer.setPetalsBinFolder(getPetalsBinFolder());
         installer.install();
     }
 
diff --git a/src/main/groovy/betsy/bpel/engines/petalsesb/PetalsEsbEngine.java b/src/main/groovy/betsy/bpel/engines/petalsesb/PetalsEsbEngine.java
index 08d4f150..dcd1eecd 100644
--- a/src/main/groovy/betsy/bpel/engines/petalsesb/PetalsEsbEngine.java
+++ b/src/main/groovy/betsy/bpel/engines/petalsesb/PetalsEsbEngine.java
@@ -114,13 +114,15 @@ public void shutdown() {
 
     @Override
     public void install() {
-        PetalsEsbInstaller installer = new PetalsEsbInstaller(this);
+        PetalsEsbInstaller installer = new PetalsEsbInstaller();
         installer.setServerDir(getServerPath());
         installer.setFileName("petals-esb-distrib-4.0.zip");
         installer.setTargetEsbInstallDir(getServerPath().resolve("petals-esb-4.0/install"));
         installer.setBpelComponentPath(getServerPath().resolve("petals-esb-distrib-4.0/esb-components/petals-se-bpel-1.1.0.zip"));
         installer.setSoapComponentPath(getServerPath().resolve("petals-esb-distrib-4.0/esb-components/petals-bc-soap-4.1.0.zip"));
         installer.setSourceFile(getServerPath().resolve("petals-esb-distrib-4.0/esb/petals-esb-4.0.zip"));
+        installer.setCliFile(getServerPath().resolve("petals-esb-distrib-4.0/esb/petals-cli-1.0.0.zip"));
+        installer.setPetalsBinFolder(getPetalsBinFolder());
         installer.install();
     }
 
diff --git a/src/main/groovy/betsy/bpel/engines/petalsesb/PetalsEsbInstaller.java b/src/main/groovy/betsy/bpel/engines/petalsesb/PetalsEsbInstaller.java
index 4d3ca451..056b8b95 100644
--- a/src/main/groovy/betsy/bpel/engines/petalsesb/PetalsEsbInstaller.java
+++ b/src/main/groovy/betsy/bpel/engines/petalsesb/PetalsEsbInstaller.java
@@ -17,13 +17,9 @@ public class PetalsEsbInstaller {
     private Path bpelComponentPath;
     private Path soapComponentPath;
     private Path sourceFile;
-    private PetalsEsbEngine engine;
+    private Path petalsBinFolder;
     private Path cliFile;
 
-    public PetalsEsbInstaller(PetalsEsbEngine engine){
-        this.engine = engine;
-    }
-
     public void install() {
         FileTasks.deleteDirectory(serverDir);
         FileTasks.mkdirs(serverDir);
@@ -41,9 +37,13 @@ public void install() {
         FileTasks.copyFileIntoFolder(bpelComponentPath, targetEsbInstallDir);
         FileTasks.copyFileIntoFolder(soapComponentPath, targetEsbInstallDir);
 
-        FileTasks.createFile(engine.getPetalsBinFolder().resolve("start-petals.sh"), "export JAVA_HOME=$JAVA7_HOME\ncd \"" + engine.getPetalsBinFolder().toAbsolutePath() + "\" && ./petals-esb.sh >/dev/null 2>&1 &");
-        ConsoleTasks.executeOnUnix(ConsoleTasks.CliCommand.build(engine.getPetalsBinFolder(), "chmod").values("+x", "start-petals.sh"));
-        ConsoleTasks.executeOnUnix(ConsoleTasks.CliCommand.build(engine.getPetalsBinFolder(), "chmod").values("+x", "petals-esb.sh"));
+        FileTasks.createFile(petalsBinFolder.resolve("start-petals.sh"), "export JAVA_HOME=$JAVA7_HOME\ncd \"" + petalsBinFolder.toAbsolutePath() + "\" && ./petals-esb.sh >/dev/null 2>&1 &");
+        ConsoleTasks.executeOnUnix(ConsoleTasks.CliCommand.build(petalsBinFolder, "chmod").values("+x", "start-petals.sh"));
+        ConsoleTasks.executeOnUnix(ConsoleTasks.CliCommand.build(petalsBinFolder, "chmod").values("+x", "petals-esb.sh"));
+    }
+
+    public void setPetalsBinFolder(Path petalsBinFolder) {
+        this.petalsBinFolder = petalsBinFolder;
     }
 
     public void setServerDir(Path serverDir) {