[sling-slingstart-maven-plugin] 13/18: Implement control port option

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag slingstart-maven-plugin-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git

commit 5e423ddacdfe72f7e3650fd7e2e49ca852ff1085
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Apr 13 13:53:00 2015 +0000

    Implement control port option
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1673190 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/maven/slingstart/run/LauncherCallable.java      |  4 ++++
 .../sling/maven/slingstart/run/ServerConfiguration.java   | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java b/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java
index 6ac2b13..85fd3fc 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java
@@ -163,6 +163,10 @@ public class LauncherCallable implements Callable<ProcessDescription> {
             args.add(this.configuration.getPort());
         }
 
+        if ( this.configuration.getControlPort() != null ) {
+            args.add("-c");
+            args.add(this.configuration.getControlPort());
+        }
         if ( this.configuration.getRunmode() != null ) {
             args.add("-Dsling.run.modes=" + this.configuration.getRunmode());
         }
diff --git a/src/main/java/org/apache/sling/maven/slingstart/run/ServerConfiguration.java b/src/main/java/org/apache/sling/maven/slingstart/run/ServerConfiguration.java
index 7b8ccd8..8276dfc 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/run/ServerConfiguration.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/run/ServerConfiguration.java
@@ -37,6 +37,9 @@ public class ServerConfiguration implements Serializable {
     /** The port to use. */
     private String port;
 
+    /** The control port to use. */
+    private String controlPort;
+
     /** The context path. */
     private String contextPath;
 
@@ -124,6 +127,14 @@ public class ServerConfiguration implements Serializable {
         this.folder = folder.getAbsoluteFile();
     }
 
+    public String getControlPort() {
+        return controlPort;
+    }
+
+    public void setControlPort(String controlPort) {
+        this.controlPort = controlPort;
+    }
+
     /**
      * Get the server
      * @return The server
@@ -143,6 +154,7 @@ public class ServerConfiguration implements Serializable {
         copy.setOpts(this.getOpts());
         copy.setInstances(1);
         copy.setFolder(this.getFolder());
+        copy.setControlPort(this.getControlPort());
 
         return copy;
     }
@@ -150,7 +162,8 @@ public class ServerConfiguration implements Serializable {
     @Override
     public String toString() {
         return "LaunchpadConfiguration [id=" + id + ", runmode=" + runmode
-                + ", port=" + port + ", contextPath=" + contextPath
+                + ", port=" + port + ", controlPort=" + controlPort
+                + ", contextPath=" + contextPath
                 + ", vmOpts=" + vmOpts + ", opts=" + opts + ", instances="
                 + instances + ", folder=" + folder + "]";
     }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.