mojohaus#42: installDaemon.sh - add all needed scripts

sparsick · Nov 1, 2019 · e37f306 · e37f306
1 parent 65f4654
commit e37f306
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/appassembler-maven-plugin/pom.xml b/appassembler-maven-plugin/pom.xml
@@ -285,6 +285,10 @@
           <include>trayMessage.gv</include>
         </includes>
       </resource>
+      <resource>
+        <directory>target/dependency/yajsw-binaries/yajsw-stable-12.14/templates</directory>
+        <targetPath>org/codehaus/mojo/appassembler/daemon/yajsw/templates</targetPath>
+      </resource>
       <resource>
         <directory>target/dependency/yajsw-binaries/yajsw-stable-12.14/bin</directory>
         <targetPath>org/codehaus/mojo/appassembler/daemon/yajsw/bin</targetPath>

diff --git a/.../codehaus/mojo/appassembler/daemon/yajsw/YetAnotherJavaServiceWrapperDaemonGenerator.java b/.../codehaus/mojo/appassembler/daemon/yajsw/YetAnotherJavaServiceWrapperDaemonGenerator.java
@@ -111,6 +111,7 @@ public class YetAnotherJavaServiceWrapperDaemonGenerator
             add("uninstallDaemon.sh");
             add("setenv.sh");
             add("wrapper.sh");
+            add("installDaemonNoPriv.sh");
         }
     };
 
@@ -121,6 +122,13 @@ public class YetAnotherJavaServiceWrapperDaemonGenerator
         }
     };
 
+    private static List<String> TEMPLATES = new ArrayList<String>()
+    {
+        {
+            add("daemon.vm");
+        }
+    };
+
     @Override
     public void generate( DaemonGenerationRequest request ) throws DaemonGeneratorException
     {
@@ -228,24 +236,30 @@ private void writeScripts(File outputDirectory) throws DaemonGeneratorException
     {
         for (String batScriptName : BAT_SCRIPTS)
         {
-            String batScriptPath = "bat/"+batScriptName;
+            String batScriptPath = "bat/" + batScriptName;
             InputStream batScript = createInputStream(batScriptPath);
             writeFile(new File(outputDirectory, batScriptPath), batScript);
         }
 
         for(String shellScriptName : SHELL_SCRIPTS)
         {
-            String shellScriptPath = "bin/"+shellScriptName;
+            String shellScriptPath = "bin/" + shellScriptName;
             InputStream shellScript = createInputStream(shellScriptPath);
             writeFile(new File(outputDirectory, shellScriptPath), shellScript);
         }
 
         for(String groovyScriptName : GROOVY_SCRIPTS)
         {
-            String groovyScriptPath = "scripts/"+groovyScriptName;
+            String groovyScriptPath = "scripts/" + groovyScriptName;
             InputStream groovyScript = createInputStream(groovyScriptPath);
             writeFile(new File(outputDirectory, groovyScriptPath), groovyScript);
         }
+
+        for(String templateScriptName : TEMPLATES) {
+            String templateScriptPath = "templates/" + templateScriptName;
+            InputStream templateScript = createInputStream(templateScriptPath);
+            writeFile(new File(outputDirectory, templateScriptPath), templateScript);
+        }
     }
 
     private void writeLibraries(File outputDirectory) throws DaemonGeneratorException

diff --git a/...ehaus/mojo/appassembler/daemon/yajsw/YetAnotherJavaServiceWrapperDaemonGeneratorTest.java b/...ehaus/mojo/appassembler/daemon/yajsw/YetAnotherJavaServiceWrapperDaemonGeneratorTest.java
@@ -55,6 +55,7 @@ public void testDefaultYAJSWFilesIfNoGeneratorConfigurationsIsSet()
         assertFileExists(yajswDir, "bin/uninstallDaemon.sh");
         assertFileExists(yajswDir, "bin/setenv.sh");
         assertFileExists(yajswDir, "bin/wrapper.sh");
+        assertFileExists(yajswDir, "bin/installDaemonNoPriv.sh");
         assertFileExists( yajswDir, "wrapper.jar" );
         assertFileExists( yajswDir, "wrapperApp.jar" );
         assertFileExists( yajswDir, "lib/core/commons/commons-cli-1.4.jar" );
@@ -76,6 +77,7 @@ public void testDefaultYAJSWFilesIfNoGeneratorConfigurationsIsSet()
         assertFileExists( yajswDir, "lib/extended/velocity/velocity-1.7.jar");
         assertFileExists( yajswDir, "lib/extended/yajsw/hessian4.jar");
         assertFileExists( yajswDir, "scripts/trayMessage.gv");
+        assertFileExists(yajswDir, "templates/daemon.vm");
     }
 
     private String trimWhitespacePerLine(File wrapper) throws IOException {