Start of adding support for a Windows PowerShell platform 'windows-ps'

adamretter · adamretter · commit 88a7aa1d02d1 · 2019-04-17T13:07:06.000+08:00
diff --git a/appassembler-maven-plugin/src/it/daemonScriptNameTest/verify.groovy b/appassembler-maven-plugin/src/it/daemonScriptNameTest/verify.groovy
@@ -35,13 +35,17 @@ class CheckFolder {
     // Check the existence of the generated unix script
     def unixScriptFile = new File( fileBinFolder, "executable" );
     def windowsScriptFile = new File( fileBinFolder, "executable.bat" );
+    def windowsPsScriptFile = new File( fileBinFolder, "executable.ps" );
 
     if (unixScriptFile.exists()) {
       throw new FileNotFoundException("The file " + unixScriptFile + " does not exist.");
     }
     if (windowsScriptFile.exists()) {
       throw new FileNotFoundException("The file " + windowsScriptFile + " does not exist.");
     }
+    if (windowsPsScriptFile.exists()) {
+      throw new FileNotFoundException("The file " + windowsPsScriptFile + " does not exist.");
+    }
   }
 }
 
diff --git a/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/daemon/script/DefaultScriptGenerator.java b/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/daemon/script/DefaultScriptGenerator.java
@@ -324,7 +324,19 @@ private InputStream getScriptTemplate( String platformName, Daemon daemon )
             }
             else
             {
-                is = getClass().getResourceAsStream( platformName + "BinTemplate" );
+                String scriptTemplatePrefix = platformName;
+                while (true) {
+                    int idx = scriptTemplatePrefix.indexOf('-');
+                    if (idx == -1 || scriptTemplatePrefix.length() < 2) {
+                        break;
+                    }
+
+                    scriptTemplatePrefix = ( scriptTemplatePrefix.substring( 0, idx )
+                            + Character.toUpperCase( scriptTemplatePrefix.charAt( idx + 1 ) )
+                            + scriptTemplatePrefix.substring( idx + 2 ) );
+                }
+
+                is = getClass().getResourceAsStream( scriptTemplatePrefix + "BinTemplate" );
                 if ( is == null )
                 {
                     throw new DaemonGeneratorException( "Unable to load internal template resource: " + platformName
diff --git a/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/daemon/script/Platform.java b/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/daemon/script/Platform.java
@@ -61,6 +61,11 @@ public class Platform
      */
     public static final String WINDOWS_NAME = "windows";
 
+    /**
+     * Windows Powershell Platform name
+     */
+    public static final String WINDOWS_PS_NAME = "windows-ps";
+
     private static final Map<String, Platform> ALL_PLATFORMS;
 
     private static final String DEFAULT_UNIX_BIN_FILE_EXTENSION = "";
@@ -73,15 +78,20 @@ public class Platform
 
     private boolean isWindows;
 
+    private boolean isPowerShell;
+
+    private String commentPrefix;
+
     // -----------------------------------------------------------------------
     // Static
     // -----------------------------------------------------------------------
 
     static
     {
         ALL_PLATFORMS = new HashMap<String, Platform>();
-        addPlatform( new Platform( UNIX_NAME, false, DEFAULT_UNIX_BIN_FILE_EXTENSION ) );
-        addPlatform( new Platform( WINDOWS_NAME, true, DEFAULT_WINDOWS_BIN_FILE_EXTENSION ) );
+        addPlatform( new Platform( UNIX_NAME, false, false, DEFAULT_UNIX_BIN_FILE_EXTENSION, "# " ) );
+        addPlatform( new Platform( WINDOWS_NAME, true, false, DEFAULT_WINDOWS_BIN_FILE_EXTENSION, "@REM " ) );
+        addPlatform( new Platform( WINDOWS_PS_NAME, true, true, ".ps1", "# " ) );
     }
 
     private static Platform addPlatform( Platform platform )
@@ -193,13 +203,17 @@ public static Set<Platform> getPlatformSet( List<String> platformList, Set<Platf
     //
     // -----------------------------------------------------------------------
 
-    private Platform( String name, boolean isWindows, String binFileExtension )
+    private Platform( String name, boolean isWindows, boolean isPowerShell, String binFileExtension, String commentPrefix )
     {
         this.name = name;
 
         this.isWindows = isWindows;
 
+        this.isPowerShell = isPowerShell;
+
         this.binFileExtension = binFileExtension;
+
+        this.commentPrefix = commentPrefix;
     }
 
     // -----------------------------------------------------------------------
@@ -261,7 +275,7 @@ public String getPathSeparator()
      */
     public String getCommentPrefix()
     {
-        return isWindows ? "@REM " : "# ";
+        return commentPrefix ;
     }
 
     public String getNewLine()
@@ -467,9 +481,12 @@ public String getEnvSetup( Daemon daemon, String binFolder )
         {
             if ( isWindows )
             {
-                String envScriptPath = "\"%BASEDIR%\\" + binFolder + "\\" + envSetupFileName + ".bat\"";
-
-                envSetup = "if exist " + envScriptPath + " call " + envScriptPath;
+                if ( isPowerShell ) {
+                    envSetup = "$setupScript = $PSScriptRoot + \"\\" + envSetupFileName + ".ps1\"; if (Test-Path $setupScript ) { &$setupScript }";
+                } else {
+                    String envScriptPath = "\"%BASEDIR%\\" + binFolder + "\\" + envSetupFileName + ".bat\"";
+                    envSetup = "if exist " + envScriptPath + " call " + envScriptPath;
+                }
             }
             else
             {
diff --git a/appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/windowsPsBinTemplate b/appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/windowsPsBinTemplate
@@ -0,0 +1,29 @@
+#LICENSE_HEADER#
+
+$baseDir = split-path -parent split-path -parent $MyInvocation.MyCommand.Definition
+
+#ENV_SETUP#
+
+if (-not (Test-Path env:JAVACMD) -Or ( $env:JAVACMD -eq "" )) {
+    $javaCmd=#JAVA_BINARY#
+} else {
+    $javaCmd=$env:JAVACMD
+}
+
+if (-not (Test-Path env:REPO) -Or ( $env:REPO -eq "" )) {
+    $repo=$env:BASEDIR + "\" + #REPO#
+} else {
+    $repo=$env:REPO
+}
+
+$classPath=#CLASSPATH#
+
+if ((Test-Path env:ENDORSED_DIR) -Or ( $env:ENDORSED_DIR -ne "")) {
+    $classPath = $env:BASEDIR + "\" + $env:ENDORSED_DIR + "\*;" + $classPath;
+}
+
+if ((Test-Path env:CLASSPATH_PREFIX) -Or ( $env:CLASSPATH_PREFIX -ne "")) {
+    $classPath = $env:CLASSPATH_PREFIX + "";" + $classPath;
+}
+
+iex $javaCmd $env:JAVA_OPTS #EXTRA_JVM_ARGUMENTS# -classpath $classPath -Dapp.name="#APP_NAME#" -Dapp.repo="$repo" -Dapp.home="$baseDir" -Dbasedir="$baseDir" #MAINCLASS# #APP_ARGUMENTS#$args
diff --git a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-basedir-test.ps1 b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-basedir-test.ps1
@@ -0,0 +1,47 @@
+# ----------------------------------------------------------------------------
+#  Copyright 2001-2006 The Apache Software Foundation.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+# ----------------------------------------------------------------------------
+#
+#   Copyright (c) 2001-2006 The Apache Software Foundation.  All rights
+#   reserved.
+
+
+$baseDir = split-path -parent split-path -parent $MyInvocation.MyCommand.Definition
+
+$setupScript = $PSScriptRoot + "\setup.ps1"; if (Test-Path $setupScript ) { &$setupScript }
+
+if (-not (Test-Path env:JAVACMD) -Or ( $env:JAVACMD -eq "" )) {
+    $javaCmd=java
+} else {
+    $javaCmd=$env:JAVACMD
+}
+
+if (-not (Test-Path env:REPO) -Or ( $env:REPO -eq "" )) {
+    $repo=$env:BASEDIR + "\" + repo
+} else {
+    $repo=$env:REPO
+}
+
+$classPath=
+
+if ((Test-Path env:ENDORSED_DIR) -Or ( $env:ENDORSED_DIR -ne "")) {
+    $classPath = $env:BASEDIR + "\" + $env:ENDORSED_DIR + "\*;" + $classPath;
+}
+
+if ((Test-Path env:CLASSPATH_PREFIX) -Or ( $env:CLASSPATH_PREFIX -ne "")) {
+    $classPath = $env:CLASSPATH_PREFIX + "";" + $classPath;
+}
+
+iex $javaCmd $env:JAVA_OPTS Yo dude xyz="%BASEDIR%" -classpath $classPath -Dapp.name="basedir-test" -Dapp.repo="$repo" -Dapp.home="$baseDir" -Dbasedir="$baseDir" foo.Bar $args
diff --git a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-repo-test.ps1 b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-repo-test.ps1
@@ -0,0 +1,47 @@
+# ----------------------------------------------------------------------------
+#  Copyright 2001-2006 The Apache Software Foundation.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+# ----------------------------------------------------------------------------
+#
+#   Copyright (c) 2001-2006 The Apache Software Foundation.  All rights
+#   reserved.
+
+
+$baseDir = split-path -parent split-path -parent $MyInvocation.MyCommand.Definition
+
+$setupScript = $PSScriptRoot + "\setup.ps1"; if (Test-Path $setupScript ) { &$setupScript }
+
+if (-not (Test-Path env:JAVACMD) -Or ( $env:JAVACMD -eq "" )) {
+    $javaCmd=java
+} else {
+    $javaCmd=$env:JAVACMD
+}
+
+if (-not (Test-Path env:REPO) -Or ( $env:REPO -eq "" )) {
+    $repo=$env:BASEDIR + "\" + repo
+} else {
+    $repo=$env:REPO
+}
+
+$classPath=
+
+if ((Test-Path env:ENDORSED_DIR) -Or ( $env:ENDORSED_DIR -ne "")) {
+    $classPath = $env:BASEDIR + "\" + $env:ENDORSED_DIR + "\*;" + $classPath;
+}
+
+if ((Test-Path env:CLASSPATH_PREFIX) -Or ( $env:CLASSPATH_PREFIX -ne "")) {
+    $classPath = $env:CLASSPATH_PREFIX + "";" + $classPath;
+}
+
+iex $javaCmd $env:JAVA_OPTS Yo dude xyz="%REPO%" -classpath $classPath -Dapp.name="repo-test" -Dapp.repo="$repo" -Dapp.home="$baseDir" -Dbasedir="$baseDir" foo.Bar $args
diff --git a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/background/expected-false-showConsoleWindow-test.ps1 b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/background/expected-false-showConsoleWindow-test.ps1
@@ -0,0 +1,47 @@
+# ----------------------------------------------------------------------------
+#  Copyright 2001-2006 The Apache Software Foundation.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+# ----------------------------------------------------------------------------
+#
+#   Copyright (c) 2001-2006 The Apache Software Foundation.  All rights
+#   reserved.
+
+
+$baseDir = split-path -parent split-path -parent $MyInvocation.MyCommand.Definition
+
+$setupScript = $PSScriptRoot + "\setup.ps1"; if (Test-Path $setupScript ) { &$setupScript }
+
+if (-not (Test-Path env:JAVACMD) -Or ( $env:JAVACMD -eq "" )) {
+    $javaCmd=start /min javaw
+} else {
+    $javaCmd=$env:JAVACMD
+}
+
+if (-not (Test-Path env:REPO) -Or ( $env:REPO -eq "" )) {
+    $repo=$env:BASEDIR + "\" + repo
+} else {
+    $repo=$env:REPO
+}
+
+$classPath=
+
+if ((Test-Path env:ENDORSED_DIR) -Or ( $env:ENDORSED_DIR -ne "")) {
+    $classPath = $env:BASEDIR + "\" + $env:ENDORSED_DIR + "\*;" + $classPath;
+}
+
+if ((Test-Path env:CLASSPATH_PREFIX) -Or ( $env:CLASSPATH_PREFIX -ne "")) {
+    $classPath = $env:CLASSPATH_PREFIX + "";" + $classPath;
+}
+
+iex $javaCmd $env:JAVA_OPTS Yo dude -classpath $classPath -Dapp.name="test" -Dapp.repo="$repo" -Dapp.home="$baseDir" -Dbasedir="$baseDir" foo.Bar $args
diff --git a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test-endorsed-lib.ps1 b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test-endorsed-lib.ps1
@@ -0,0 +1,47 @@
+# ----------------------------------------------------------------------------
+#  Copyright 2001-2006 The Apache Software Foundation.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+# ----------------------------------------------------------------------------
+#
+#   Copyright (c) 2001-2006 The Apache Software Foundation.  All rights
+#   reserved.
+
+
+$baseDir = split-path -parent split-path -parent $MyInvocation.MyCommand.Definition
+
+$setupScript = $PSScriptRoot + "\setup.ps1"; if (Test-Path $setupScript ) { &$setupScript }
+
+if (-not (Test-Path env:JAVACMD) -Or ( $env:JAVACMD -eq "" )) {
+    $javaCmd=java
+} else {
+    $javaCmd=$env:JAVACMD
+}
+
+if (-not (Test-Path env:REPO) -Or ( $env:REPO -eq "" )) {
+    $repo=$env:BASEDIR + "\" + repo
+} else {
+    $repo=$env:REPO
+}
+
+$classPath=
+
+if ((Test-Path env:ENDORSED_DIR) -Or ( $env:ENDORSED_DIR -ne "")) {
+    $classPath = $env:BASEDIR + "\" + $env:ENDORSED_DIR + "\*;" + $classPath;
+}
+
+if ((Test-Path env:CLASSPATH_PREFIX) -Or ( $env:CLASSPATH_PREFIX -ne "")) {
+    $classPath = $env:CLASSPATH_PREFIX + "";" + $classPath;
+}
+
+iex $javaCmd $env:JAVA_OPTS Yo dude -classpath $classPath -Dapp.name="test-endorsed-lib" -Dapp.repo="$repo" -Dapp.home="$baseDir" -Dbasedir="$baseDir" foo.Bar $args
diff --git a/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test.ps1 b/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test.ps1
@@ -0,0 +1,47 @@
+# ----------------------------------------------------------------------------
+#  Copyright 2001-2006 The Apache Software Foundation.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+# ----------------------------------------------------------------------------
+#
+#   Copyright (c) 2001-2006 The Apache Software Foundation.  All rights
+#   reserved.
+
+
+$baseDir = split-path -parent split-path -parent $MyInvocation.MyCommand.Definition
+
+$setupScript = $PSScriptRoot + "\setup.ps1"; if (Test-Path $setupScript ) { &$setupScript }
+
+if (-not (Test-Path env:JAVACMD) -Or ( $env:JAVACMD -eq "" )) {
+    $javaCmd=java
+} else {
+    $javaCmd=$env:JAVACMD
+}
+
+if (-not (Test-Path env:REPO) -Or ( $env:REPO -eq "" )) {
+    $repo=$env:BASEDIR + "\" + repo
+} else {
+    $repo=$env:REPO
+}
+
+$classPath=
+
+if ((Test-Path env:ENDORSED_DIR) -Or ( $env:ENDORSED_DIR -ne "")) {
+    $classPath = $env:BASEDIR + "\" + $env:ENDORSED_DIR + "\*;" + $classPath;
+}
+
+if ((Test-Path env:CLASSPATH_PREFIX) -Or ( $env:CLASSPATH_PREFIX -ne "")) {
+    $classPath = $env:CLASSPATH_PREFIX + "";" + $classPath;
+}
+
+iex $javaCmd $env:JAVA_OPTS Yo dude -classpath $classPath -Dapp.name="test" -Dapp.repo="$repo" -Dapp.home="$baseDir" -Dbasedir="$baseDir" foo.Bar $args

Original file line number	Diff line number	Diff line change
`@@ -35,13 +35,17 @@ class CheckFolder {`
`35`	`35`	`// Check the existence of the generated unix script`
`36`	`36`	`def unixScriptFile = new File( fileBinFolder, "executable" );`
`37`	`37`	`def windowsScriptFile = new File( fileBinFolder, "executable.bat" );`
	`38`	`+ def windowsPsScriptFile = new File( fileBinFolder, "executable.ps" );`
`38`	`39`
`39`	`40`	`if (unixScriptFile.exists()) {`
`40`	`41`	`throw new FileNotFoundException("The file " + unixScriptFile + " does not exist.");`
`41`	`42`	`}`
`42`	`43`	`if (windowsScriptFile.exists()) {`
`43`	`44`	`throw new FileNotFoundException("The file " + windowsScriptFile + " does not exist.");`
`44`	`45`	`}`
	`46`	`+ if (windowsPsScriptFile.exists()) {`
	`47`	`+ throw new FileNotFoundException("The file " + windowsPsScriptFile + " does not exist.");`
	`48`	`+ }`
`45`	`49`	`}`
`46`	`50`	`}`
`47`	`51`