Fix JVM args in wrong order. Set the same default JVM opts as grails. Add default system properties authenticator

Author: jameskleeh

shell/grailsw

@@ -7,7 +7,7 @@
 ##############################################################################
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRAILS_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-XX:+TieredCompilation" "-XX:TieredStopAtLevel=1" "-XX:CICompilerCount=3"'
 
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
@@ -148,4 +148,4 @@ function splitJvmOpts() {
 }
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRAILS_OPTS
 
-exec "$JAVACMD" -jar "$JAR_PATH" "${JVM_OPTS[@]}" "$@"
+exec "$JAVACMD" -jar "${JVM_OPTS[@]}" "$JAR_PATH" "$@"

shell/grailsw.bat

@@ -9,7 +9,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRAILS_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-XX:+TieredCompilation" "-XX:TieredStopAtLevel=1" "-XX:CICompilerCount=3"
 
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
@@ -71,7 +71,7 @@ set CMD_LINE_ARGS=%$
 set JAR_PATH=%APP_HOME%/grails-wrapper.jar
 
 @rem Execute Grails
-"%JAVA_EXE%" -jar %JAR_PATH% %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRAILS_OPTS% %CMD_LINE_ARGS%
+"%JAVA_EXE%" -jar %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRAILS_OPTS% %JAR_PATH% %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell

starter/src/main/java/grails/init/Start.java

@@ -1,5 +1,6 @@
 package grails.init;
 
+import grails.proxy.SystemPropertiesAuthenticator;
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -10,6 +11,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.net.Authenticator;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.channels.Channels;
@@ -75,6 +77,8 @@ private static boolean updateJar(String version) {
     }
 
     public static void main(String[] args) {
+        Authenticator.setDefault(new SystemPropertiesAuthenticator());
+
         try {
             String version = getVersion();
 

starter/src/main/java/grails/proxy/SystemPropertiesAuthenticator.java

@@ -0,0 +1,17 @@
+package grails.proxy;
+
+import java.net.Authenticator;
+import java.net.PasswordAuthentication;
+
+public class SystemPropertiesAuthenticator extends Authenticator {
+
+    @Override
+    protected PasswordAuthentication getPasswordAuthentication() {
+        if(getRequestorType() == RequestorType.PROXY) {
+            return new PasswordAuthentication(
+                    System.getProperty("http.proxyUser", ""),
+                    System.getProperty("http.proxyPassword", "").toCharArray());
+        }
+        return null;
+    }
+}