Merge branch '2.2.x' into 2.3.x

Conflicts:
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/fork/ForkedGrailsProcess.groovy
	grails-plugin-tomcat/src/main/groovy/org/grails/plugins/tomcat/InlineExplodedTomcatServer.groovy
	grails-plugin-tomcat/src/main/groovy/org/grails/plugins/tomcat/IsolatedTomcat.java
	grails-plugin-tomcat/src/main/groovy/org/grails/plugins/tomcat/IsolatedWarTomcatServer.groovy
	grails-plugin-tomcat/src/main/groovy/org/grails/plugins/tomcat/TomcatKillSwitch.java
	grails-plugin-tomcat/src/main/groovy/org/grails/plugins/tomcat/TomcatServer.groovy
	grails-plugin-tomcat/src/main/groovy/org/grails/plugins/tomcat/fork/ForkedTomcatServer.groovy
	grails-plugin-url-mappings/src/main/groovy/org/codehaus/groovy/grails/web/mapping/filter/UrlMappingsFilter.java
	scripts/_GrailsTest.groovy

Author: graemerocher

grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/api/BaseSettingsApi.java

@@ -144,12 +144,26 @@ public int getServerPort() {
         return serverPort;
     }
 
+    public void setServerPort(Integer port) {
+        if (port != null) {
+            System.setProperty("server.port", port.toString());
+            System.setProperty("grails.server.port.http", port.toString());
+        }
+    }
+
     public int getServerPortHttps() {
         int serverPortHttps = Integer.valueOf(getPropertyValue("server.port.https", 8443).toString());
         serverPortHttps = Integer.valueOf(getPropertyValue("grails.server.port.https", serverPortHttps).toString());
         return serverPortHttps;
     }
 
+    public void setServerPortHttps(Integer port) {
+        if (port != null) {
+            System.setProperty("server.port.https", port.toString());
+            System.setProperty("grails.server.port.https", port.toString());
+        }
+    }
+
     public String getServerHost() {
         return (String)getPropertyValue("grails.server.host", null);
     }

grails-web/src/main/groovy/org/codehaus/groovy/grails/project/container/GrailsProjectRunner.groovy

@@ -195,7 +195,7 @@ class GrailsProjectRunner extends BaseSettingsApi {
     EmbeddableServer runServer(Map args) {
         try {
             eventListener.triggerEvent("StatusUpdate","Running Grails application")
-            def message = "Server running. Browse to http://${args.host ?: 'localhost'}:${args.httpPort}$serverContextPath"
+
 
             EmbeddableServer server = args["server"]
             if (server.hasProperty('eventListener')) {
@@ -205,6 +205,7 @@ class GrailsProjectRunner extends BaseSettingsApi {
                 server.grailsConfig = config
             }
 
+            def httpsMessage = ""
             profile("start server") {
 
                 try { new ServerSocket(args.httpPort).close() }
@@ -225,12 +226,15 @@ class GrailsProjectRunner extends BaseSettingsApi {
                     server.startSecure args.host, args.httpPort, args.httpsPort
 
                     // Update the message to reflect the fact we are running HTTPS as well.
-                    message += " or https://${args.host ?: 'localhost'}:${args.httpsPort}$serverContextPath"
+                    setServerPortHttps(server.localHttpsPort)
+                    httpsMessage = " or https://${args.host ?: 'localhost'}:${server.localHttpsPort}$serverContextPath"
                 }
                 else {
                     server.start args.host, args.httpPort
                 }
             }
+            setServerPort(server.localHttpPort)
+            def message = "Server running. Browse to http://${args.host ?: 'localhost'}:${server.localHttpPort}$serverContextPath" + httpsMessage
             eventListener.triggerEvent("StatusFinal", message)
 
             boolean isWindows = System.getProperty("os.name").toLowerCase().indexOf("windows") != -1

scripts/StopApp.groovy

@@ -29,7 +29,7 @@ target('default': "Stops a forked Grails application") {
 
     try {
         grailsConsole.updateStatus "Stopping Grails Server..."
-        def url = "http://${serverHost ?: 'localhost'}:${serverPort+1}"
+        def url = "http://${serverHost ?: 'localhost'}:${serverPort-1}"
         grailsConsole.verbose "URL to stop server is $url"
         new URL(url).getText(connectTimeout: 10000, readTimeout: 10000)
         grailsConsole.updateStatus "Server Stopped"