svn commit: r1673190 - in /sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run: LauncherCallable.java ServerConfiguration.java

[cz...@apache.org]

Author: cziegeler
Date: Mon Apr 13 13:53:00 2015
New Revision: 1673190

URL: http://svn.apache.org/r1673190
Log:
Implement control port option

Modified:
    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/ServerConfiguration.java

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=1673190&r1=1673189&r2=1673190&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 Mon Apr 13 13:53:00 2015
@@ -163,6 +163,10 @@ public class LauncherCallable implements
             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());
         }

Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/ServerConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/ServerConfiguration.java?rev=1673190&r1=1673189&r2=1673190&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/ServerConfiguration.java (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/ServerConfiguration.java Mon Apr 13 13:53:00 2015
@@ -37,6 +37,9 @@ public class ServerConfiguration impleme
     /** 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 impleme
         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 impleme
         copy.setOpts(this.getOpts());
         copy.setInstances(1);
         copy.setFolder(this.getFolder());
+        copy.setControlPort(this.getControlPort());
 
         return copy;
     }
@@ -150,7 +162,8 @@ public class ServerConfiguration impleme
     @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 + "]";
     }