You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/04/15 03:19:27 UTC
svn commit: r1673601 - in
/sling/trunk/tooling/maven/slingstart-maven-plugin: ./
src/main/java/org/apache/sling/maven/slingstart/launcher/
src/main/java/org/apache/sling/maven/slingstart/run/
Author: cziegeler
Date: Wed Apr 15 01:19:27 2015
New Revision: 1673601
URL: http://svn.apache.org/r1673601
Log:
SLING-4620 : Slingstart plugin start goal exits even if launchpad.keep.running is set to true
Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/launcher/Main.java
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java
Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml?rev=1673601&r1=1673600&r2=1673601&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/pom.xml Wed Apr 15 01:19:27 2015
@@ -31,7 +31,7 @@
</description>
<properties>
- <sling.java.version>6</sling.java.version>
+ <sling.java.version>7</sling.java.version>
<maven.version>3.0.5</maven.version>
</properties>
Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/launcher/Main.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/launcher/Main.java?rev=1673601&r1=1673600&r2=1673601&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/launcher/Main.java (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/launcher/Main.java Wed Apr 15 01:19:27 2015
@@ -21,6 +21,7 @@ import java.lang.management.ManagementFa
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.Arrays;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -76,6 +77,7 @@ public class Main {
System.out.println("Slingstart application: " + this.appJar);
System.out.println("Main class: " + MAIN_CLASS_DEF);
System.out.println("Listener Port: " + String.valueOf(this.listenerPort));
+ System.out.println("Arguments: " + Arrays.toString(this.startupArgs));
System.out.println(DELIM);
}
Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java?rev=1673601&r1=1673600&r2=1673601&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java Wed Apr 15 01:19:27 2015
@@ -23,6 +23,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
+import java.lang.ProcessBuilder.Redirect;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.ArrayList;
@@ -164,18 +165,19 @@ public class LauncherCallable implements
}
if ( this.configuration.getControlPort() != null ) {
- args.add("-c");
+ args.add("-j");
args.add(this.configuration.getControlPort());
}
- if ( this.configuration.getRunmode() != null ) {
+ if ( this.configuration.getRunmode() != null && this.configuration.getRunmode().length() > 0 ) {
args.add("-Dsling.run.modes=" + this.configuration.getRunmode());
}
+ args.add("start");
builder.command(args.toArray(new String[args.size()]));
builder.directory(this.configuration.getFolder());
builder.redirectErrorStream(true);
-// builder.redirectOutput(Redirect.INHERIT);
-// builder.redirectError(Redirect.INHERIT);
+ builder.redirectOutput(Redirect.INHERIT);
+ builder.redirectError(Redirect.INHERIT);
logger.info("Starting Launchpad " + this.configuration.getId() + "...");
logger.debug("Launchpad cmd: " + builder.command());
Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java?rev=1673601&r1=1673600&r2=1673601&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/StartMojo.java Wed Apr 15 01:19:27 2015
@@ -342,6 +342,10 @@ public class StartMojo extends AbstractM
launchpadConfiguration.setPort(String.valueOf(PortHelper.getNextAvailablePort()));
}
+ if ( launchpadConfiguration.getControlPort() == null ) {
+ launchpadConfiguration.setControlPort(String.valueOf(PortHelper.getNextAvailablePort()));
+ }
+
// set the id of the launchpad
if ( launchpadConfiguration.getId() == null || launchpadConfiguration.getId().trim().length() == 0 ) {
String runMode = launchpadConfiguration.getRunmode();