Changeset 371

Timestamp:

2008-06-17 09:15:24 (5 years ago)

Author:

bruno

Message:

Generate script plugin:

• Generate kauri-dev-debug script variants, these listen for a java debugger on port 5005
• Make it possible to disable generation of -dev scripts, for the kauri-deploy-repo this was confusing at it is only supported in the dist
• Fixed double script generation (defunct isRelease argument)

Location:

trunk

Files:

• core/kauri-runtime/pom.xml (modified) (1 diff)
• tools/kauri-genscript-plugin/src/main/groovy/org/kauriproject/tools/genscriptplugin/GenerateScriptMojo.groovy (modified) (6 diffs)
• tools/kauri-genscript-plugin/src/main/resources/org/kauriproject/tools/genscriptplugin/unix-dev-template.sh (modified) (1 diff)
• tools/kauri-genscript-plugin/src/main/resources/org/kauriproject/tools/genscriptplugin/windows-dev-template.bat (modified) (1 diff)

trunk/core/kauri-runtime/pom.xml

@@ -172 +172 @@
           <scriptName>kauri</scriptName>
           <scriptTitle>Kauri Runtime startup script</scriptTitle>
+          <debugOptions>-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005</debugOptions>
         </configuration>
         <executions>

trunk/tools/kauri-genscript-plugin/src/main/groovy/org/kauriproject/tools/genscriptplugin/GenerateScriptMojo.groovy

@@ -40 +40 @@
       * @parameter
       */
+    private boolean devScriptEnabled = true
+
+    /**
+      * @parameter
+      */
+    private String debugOptions = ""
+
+    /**
+      * @parameter
+      */
     private String scriptTitle = "Application startup script"
 
@@ -70 +80 @@
         }
         artifacts.add(project.getArtifact());
-        createUnixScript(true)
-        createUnixScript(false)
-        createWindowsScript(true)
-        createWindowsScript(false)
+        createUnixScript()
+        createWindowsScript()
     }
 
-    void createUnixScript(boolean isRelease) {
+    void createUnixScript() {
         def classpath = ""
         artifacts.eachWithIndex(
@@ -90 +98 @@
                 mainClass : mainClass,
                 localRepositoryLocation : localRepositoryLocation,
-                scriptTitle : scriptTitle
+                scriptTitle : scriptTitle,
+                debugOptions : ""
         ]
 
-        processTemplate("unix-dev-template.sh", scriptData, new File(buildOutputDirectory, devScriptName + ".sh"));
         processTemplate("unix-release-template.sh", scriptData, new File(buildOutputDirectory, scriptName + ".sh"));
+
+        if (devScriptEnabled) {
+            processTemplate("unix-dev-template.sh", scriptData, new File(buildOutputDirectory, devScriptName + ".sh"));
+
+            if (debugOptions != "") {
+                scriptData.debugOptions = debugOptions;
+                processTemplate("unix-dev-template.sh", scriptData, new File(buildOutputDirectory, devScriptName + "-debug.sh"));
+            }
+        }
     }
 
@@ -105 +122 @@
                         String replacement =  scriptData[match[1]]
                         if (replacement == null)
-                            throw new Exception("Missing replacement text for key " + match[1])
+                            throw new Exception("Generate-script plugin: Missing replacement text for key " + match[1])
                         return java.util.regex.Matcher.quoteReplacement(replacement)
                     })
@@ -116 +133 @@
     }
 
-    void createWindowsScript(boolean isRelease) {
+    void createWindowsScript() {
         def classpath = ""
         for (entry in artifacts) {
@@ -126 +143 @@
                 mainClass : mainClass,
                 localRepositoryLocation : localRepositoryLocation,
-                scriptTitle : scriptTitle
+                scriptTitle : scriptTitle,
+                debugOptions: ""
         ]
 
-        processTemplate("windows-dev-template.bat", scriptData, new File(buildOutputDirectory, devScriptName + ".bat"));
         processTemplate("windows-release-template.bat", scriptData, new File(buildOutputDirectory, scriptName + ".bat"));
+
+        if (devScriptEnabled) {
+            processTemplate("windows-dev-template.bat", scriptData, new File(buildOutputDirectory, devScriptName + ".bat"));
+
+            if (debugOptions != "") {
+                scriptData.debugOptions = debugOptions;
+                processTemplate("windows-dev-template.bat", scriptData, new File(buildOutputDirectory, devScriptName + "-debug.bat"));
+            }
+        }
     }
 }

trunk/tools/kauri-genscript-plugin/src/main/resources/org/kauriproject/tools/genscriptplugin/unix-dev-template.sh

@@ -30 +30 @@
 KAURI_LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog -Dorg.apache.commons.logging.simplelog.defaultlog=error"
 
-"$JAVA_HOME/bin/java" $KAURI_JAVA_OPTIONS $KAURI_LOG_OPTS @@@@mainClass@@@@ "$@"
+KAURI_DEBUG_OPTS="@@@@debugOptions@@@@"
+
+"$JAVA_HOME/bin/java" $KAURI_DEBUG_OPTS $KAURI_JAVA_OPTIONS $KAURI_LOG_OPTS @@@@mainClass@@@@ "$@"

trunk/tools/kauri-genscript-plugin/src/main/resources/org/kauriproject/tools/genscriptplugin/windows-dev-template.bat

@@ -23 +23 @@
 set KAURI_LOG_OPTS=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog -Dorg.apache.commons.logging.simplelog.defaultlog=error
 
-"%JAVA_HOME%/bin/java" %KAURI_JAVA_OPTIONS% %KAURI_LOG_OPTS% @@@@mainClass@@@@ %*
+set KAURI_DEBUG_OPTS=@@@@debugOptions@@@@
+
+"%JAVA_HOME%/bin/java" %KAURI_DEBUG_OPTS% %KAURI_JAVA_OPTIONS% %KAURI_LOG_OPTS% @@@@mainClass@@@@ %*
 goto end