inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-05-26 17:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed refresh URL tomcat port default

Browse Source
This commit is contained in:
Martin Bergljung 2016-06-27 15:09:07 +01:00
parent d2c6335869
commit e9fa82da5c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRefreshWebappMojo.java
View File

@ -17,6 +17,7 @@
*/ */
package org.alfresco.maven.plugin; package org.alfresco.maven.plugin;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.net.telnet.TelnetClient; import org.apache.commons.net.telnet.TelnetClient;
import org.apache.http.HttpHost; import org.apache.http.HttpHost;
import org.apache.http.HttpStatus; import org.apache.http.HttpStatus;
@ -128,9 +129,13 @@ public abstract class AbstractRefreshWebappMojo extends AbstractMojo {
@Override @Override
public void execute() throws MojoExecutionException { 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 // Do a ping to see if the server is up, if not, log and just exit
if (!ping()) { if (!ping()) {
getLog().warn("Connection failed to " + refreshHost + ":" + refreshPort + ", " + getAbortedMsg()); getLog().warn("Connection failed to " + this.refreshHost + ":" + this.refreshPort + ", " + getAbortedMsg());
return; return;
} }
@ -263,7 +268,7 @@ public abstract class AbstractRefreshWebappMojo extends AbstractMojo {
private URL buildFinalUrl(String specificRefreshUrlPath) { private URL buildFinalUrl(String specificRefreshUrlPath) {
try { try {
return new URL("http://" + refreshHost + ":" + refreshPort + specificRefreshUrlPath); return new URL("http://" + this.refreshHost + ":" + this.refreshPort + specificRefreshUrlPath);
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;

2
plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java
View File

@ -150,7 +150,7 @@ public class RunMojo extends AbstractMojo {
@Parameter(property = "alfresco.api.explorer.artifactId", defaultValue = "api-explorer") @Parameter(property = "alfresco.api.explorer.artifactId", defaultValue = "api-explorer")
protected String alfrescoApiExplorerArtifactId; protected String alfrescoApiExplorerArtifactId;
@Parameter(property = "alfresco.platform.version", defaultValue = "5.1.f") @Parameter(property = "alfresco.platform.version", defaultValue = "5.1.g")
protected String alfrescoRepoVersion; protected String alfrescoRepoVersion;
@Parameter(property = "alfresco.share.version", defaultValue = "5.1.f") @Parameter(property = "alfresco.share.version", defaultValue = "5.1.f")