Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-09-13 13:39:45 +0000
committerGreg Wilkins2013-09-16 01:53:46 +0000
commit8449ccc873a918fe9ee0e5f9ad9028cfa33ed431 (patch)
tree30cf72d0ee81442d4c7060ac0463f75e6d320b61
parenta23e899affd83c9b0e0fe43f70d68f6008cc03bf (diff)
downloadorg.eclipse.jetty.project-8449ccc873a918fe9ee0e5f9ad9028cfa33ed431.tar.gz
org.eclipse.jetty.project-8449ccc873a918fe9ee0e5f9ad9028cfa33ed431.tar.xz
org.eclipse.jetty.project-8449ccc873a918fe9ee0e5f9ad9028cfa33ed431.zip
415826 modules initialised with --add-to-start and --add-to-startd
-rw-r--r--jetty-distribution/pom.xml6
-rw-r--r--jetty-distribution/src/main/resources/start.ini6
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java4
-rw-r--r--jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt6
4 files changed, 11 insertions, 11 deletions
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 5ea192e60e..901b55ccf8 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -473,8 +473,8 @@
<arguments>
<argument>jetty.home=${assembly-directory}</argument>
<argument>jetty.base=${assembly-directory}</argument>
- <argument>--module-start-ini=server,deploy,websocket,jsp,ext,resources</argument>
- <argument>--module-startd-ini=http</argument>
+ <argument>--add-to-start=server,deploy,websocket,jsp,ext,resources</argument>
+ <argument>--add-to-startd=http</argument>
</arguments>
</configuration>
<goals>
@@ -489,7 +489,7 @@
<arguments>
<argument>jetty.home=${assembly-directory}</argument>
<argument>jetty.base=${assembly-directory}/demo-base</argument>
- <argument>--module-startd-ini=http,https</argument>
+ <argument>--add-to-startd-ini=http,https</argument>
</arguments>
</configuration>
<goals>
diff --git a/jetty-distribution/src/main/resources/start.ini b/jetty-distribution/src/main/resources/start.ini
index e760d7a547..59d94becc0 100644
--- a/jetty-distribution/src/main/resources/start.ini
+++ b/jetty-distribution/src/main/resources/start.ini
@@ -21,13 +21,13 @@
# + A JVM option like: -Xmx2000m
# + A System Property like: -Dcom.sun.management.jmxremote
#
-# The --module-start-ini=module option can be used to append
+# The --add-to-start=module option can be used to append
# a configuration template for a module to start.ini
-# The --module-ini=module option can be used to creat
+# The --add-to-startd=module option can be used to create
# a configuration template for a module in start.d/module.ini
# For example configure and run with SPDY use
#
-# java -jar start.jar --module-ini=spdy
+# java -jar start.jar --add-to-startd=spdy
# $EDITOR start.d/spdy.ini
# java -jar start.jar
#
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
index a96f74c259..4bd246f40d 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
@@ -686,7 +686,7 @@ public class StartArgs
return;
}
- if (arg.startsWith("--module-startd-ini=")||arg.startsWith("--module-ini="))
+ if (arg.startsWith("--add-to-startd"))
{
if (!CMD_LINE_SOURCE.equals(source))
{
@@ -697,7 +697,7 @@ public class StartArgs
return;
}
- if (arg.startsWith("--module-start-ini="))
+ if (arg.startsWith("--add-to-start"))
{
if (!CMD_LINE_SOURCE.equals(source))
{
diff --git a/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt b/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
index 63682c320f..83d0d73a3d 100644
--- a/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
+++ b/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
@@ -63,12 +63,12 @@ Module Management:
o The ${jetty.base}/start.ini
o The ${jetty.base}/start.d/*.ini files
- --module=<modulename>
+ --module=<modulename>(,<modulename>)*
Temporarily enable a module from the command line.
Note: this can also be used in the ${jetty.base}/start.ini
or ${jetty.base}/start.d/*.ini files.
- --module-start-ini=<modulename>
+ --add-to-start=<modulename>(,<modulename>)*
Enable a module by appending lines to the
${jetty.base}/start.ini file.
Lines that are added come from the ini template that
@@ -79,7 +79,7 @@ Module Management:
techniques.
Note: not all modules have ini templates.
- --module-startd-ini=<modulename>
+ --add-to-startd=<modulename>(,<modulename>)*
Enable a module via creation of an ini file in the
${jetty.base}/start.d/ directory.
Uses ini template that the module itself maintains.

Back to the top