Merge pull request #1194 from cescoffier/broken-config-argument-in-re…

…deploy Broken config argument in redeploy
eclipse-vertx · Nov 16, 2015 · 22e9d50 · 22e9d50
2 parents 1fce2b1 + bee73b4
commit 22e9d50
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 80 deletions.
diff --git a/src/main/asciidoc/dataobjects.adoc b/src/main/asciidoc/dataobjects.adoc
@@ -437,6 +437,20 @@ Set the store as a buffer
 +++
 |===
 
+[[TrustOptions]]
+== TrustOptions
+
+++++
+ Certification authority configuration options.
+++++
+'''
+
+[cols=">25%,^25%,50%"]
+[frame="topbot"]
+|===
+^|Name | Type ^| Description
+|===
+
 [[Option]]
 == Option
 
@@ -507,20 +521,6 @@ Sets whether or not this option can receive a value.
 +++
 |===
 
-[[TrustOptions]]
-== TrustOptions
-
-++++
- Certification authority configuration options.
-++++
-'''
-
-[cols=">25%,^25%,50%"]
-[frame="topbot"]
-|===
-^|Name | Type ^| Description
-|===
-
 [[NetServerOptions]]
 == NetServerOptions
 
@@ -799,20 +799,6 @@ Set whether the verticle(s) should be deployed as a worker verticle
 +++
 |===
 
-[[KeyCertOptions]]
-== KeyCertOptions
-
-++++
- Key/cert configuration options.
-++++
-'''
-
-[cols=">25%,^25%,50%"]
-[frame="topbot"]
-|===
-^|Name | Type ^| Description
-|===
-
 [[PemKeyCertOptions]]
 == PemKeyCertOptions
 
@@ -883,6 +869,20 @@ Set the key a a buffer
 +++
 |===
 
+[[KeyCertOptions]]
+== KeyCertOptions
+
+++++
+ Key/cert configuration options.
+++++
+'''
+
+[cols=">25%,^25%,50%"]
+[frame="topbot"]
+|===
+^|Name | Type ^| Description
+|===
+
 [[HttpServerOptions]]
 == HttpServerOptions
 
@@ -1010,56 +1010,6 @@ Set the websocket subprotocols supported by the server.
 +++
 |===
 
-[[DatagramSocketOptions]]
-== DatagramSocketOptions
-
-++++
- Options used to configure a datagram socket.
-++++
-'''
-
-[cols=">25%,^25%,50%"]
-[frame="topbot"]
-|===
-^|Name | Type ^| Description
-|[[broadcast]]`broadcast`|`Boolean`|
-+++
-Set if the socket can receive broadcast packets
-+++
-|[[ipV6]]`ipV6`|`Boolean`|
-+++
-Set if IP v6 should be used
-+++
-|[[loopbackModeDisabled]]`loopbackModeDisabled`|`Boolean`|
-+++
-Set if loopback mode is disabled
-+++
-|[[multicastNetworkInterface]]`multicastNetworkInterface`|`String`|
-+++
-Set the multicast network interface address
-+++
-|[[multicastTimeToLive]]`multicastTimeToLive`|`Number (int)`|
-+++
-Set the multicast ttl value
-+++
-|[[receiveBufferSize]]`receiveBufferSize`|`Number (int)`|
-+++
-Set the TCP receive buffer size
-+++
-|[[reuseAddress]]`reuseAddress`|`Boolean`|
-+++
-Set the value of reuse address
-+++
-|[[sendBufferSize]]`sendBufferSize`|`Number (int)`|
-+++
-Set the TCP send buffer size
-+++
-|[[trafficClass]]`trafficClass`|`Number (int)`|
-+++
-Set the value of traffic class
-+++
-|===
-
 [[HttpClientOptions]]
 == HttpClientOptions
 
@@ -1195,6 +1145,56 @@ Set whether hostname verification is enabled
 +++
 |===
 
+[[DatagramSocketOptions]]
+== DatagramSocketOptions
+
+++++
+ Options used to configure a datagram socket.
+++++
+'''
+
+[cols=">25%,^25%,50%"]
+[frame="topbot"]
+|===
+^|Name | Type ^| Description
+|[[broadcast]]`broadcast`|`Boolean`|
++++
+Set if the socket can receive broadcast packets
++++
+|[[ipV6]]`ipV6`|`Boolean`|
++++
+Set if IP v6 should be used
++++
+|[[loopbackModeDisabled]]`loopbackModeDisabled`|`Boolean`|
++++
+Set if loopback mode is disabled
++++
+|[[multicastNetworkInterface]]`multicastNetworkInterface`|`String`|
++++
+Set the multicast network interface address
++++
+|[[multicastTimeToLive]]`multicastTimeToLive`|`Number (int)`|
++++
+Set the multicast ttl value
++++
+|[[receiveBufferSize]]`receiveBufferSize`|`Number (int)`|
++++
+Set the TCP receive buffer size
++++
+|[[reuseAddress]]`reuseAddress`|`Boolean`|
++++
+Set the value of reuse address
++++
+|[[sendBufferSize]]`sendBufferSize`|`Number (int)`|
++++
+Set the TCP send buffer size
++++
+|[[trafficClass]]`trafficClass`|`Number (int)`|
++++
+Set the value of traffic class
++++
+|===
+
 [[PemTrustOptions]]
 == PemTrustOptions
 

diff --git a/src/main/java/io/vertx/core/impl/launcher/commands/ExecUtils.java b/src/main/java/io/vertx/core/impl/launcher/commands/ExecUtils.java
@@ -72,7 +72,7 @@ public static String quoteArgument(final String argument) {
   }
 
   /**
-   * Adds an argument to the given list. It automatially add quotes to the argument if necessary.
+   * Adds an argument to the given list. It automatically adds quotes to the argument if necessary.
    *
    * @param args the list of arguments
    * @param argument the argument to add

diff --git a/src/main/java/io/vertx/core/impl/launcher/commands/RunCommand.java b/src/main/java/io/vertx/core/impl/launcher/commands/RunCommand.java
@@ -312,7 +312,7 @@ protected void startAsBackgroundApplication(Handler<Void> onCompletion) {
       args.add("--classpath=" + classpath.stream().collect(Collectors.joining(File.pathSeparator)));
     }
     if (config != null) {
-      args.add("--config=" + config);
+      args.add("--conf=" + config);
     }
     if (instances != 1) {
       args.add("--instances=" + instances);