From e9fa82da5c8863dd0373ab65d48508074fe7b29e Mon Sep 17 00:00:00 2001
From: Martin Bergljung <gravitonian@gmail.com>
Date: Mon, 27 Jun 2016 15:09:07 +0100
Subject: [PATCH] Fixed refresh URL tomcat port default

---
 .../alfresco/maven/plugin/AbstractRefreshWebappMojo.java | 9 +++++++--
 .../src/main/java/org/alfresco/maven/plugin/RunMojo.java | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRefreshWebappMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRefreshWebappMojo.java
index a4ae6dae..fb046621 100644
--- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRefreshWebappMojo.java
+++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRefreshWebappMojo.java
@@ -17,6 +17,7 @@
  */
 package org.alfresco.maven.plugin;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.net.telnet.TelnetClient;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpStatus;
@@ -128,9 +129,13 @@ public abstract class AbstractRefreshWebappMojo extends AbstractMojo {
 
     @Override
     public void execute() throws MojoExecutionException {
+        if (StringUtils.isBlank(this.refreshPort)) {
+            this.refreshPort = "8080";
+        }
+
         // Do a ping to see if the server is up, if not, log and just exit
         if (!ping()) {
-            getLog().warn("Connection failed to " + refreshHost + ":" + refreshPort + ", " + getAbortedMsg());
+            getLog().warn("Connection failed to " + this.refreshHost + ":" + this.refreshPort + ", " + getAbortedMsg());
             return;
         }
 
@@ -263,7 +268,7 @@ public abstract class AbstractRefreshWebappMojo extends AbstractMojo {
 
     private URL buildFinalUrl(String specificRefreshUrlPath) {
         try {
-            return new URL("http://" + refreshHost + ":" + refreshPort + specificRefreshUrlPath);
+            return new URL("http://" + this.refreshHost + ":" + this.refreshPort + specificRefreshUrlPath);
         } catch (MalformedURLException e) {
             e.printStackTrace();
             return null;
diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java
index 35230313..9309cf5a 100644
--- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java
+++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java
@@ -150,7 +150,7 @@ public class RunMojo extends AbstractMojo {
     @Parameter(property = "alfresco.api.explorer.artifactId", defaultValue = "api-explorer")
     protected String alfrescoApiExplorerArtifactId;
 
-    @Parameter(property = "alfresco.platform.version", defaultValue = "5.1.f")
+    @Parameter(property = "alfresco.platform.version", defaultValue = "5.1.g")
     protected String alfrescoRepoVersion;
 
     @Parameter(property = "alfresco.share.version", defaultValue = "5.1.f")