Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

415826 modules initialised with --add-to-start and --add-to-startd

This commit is contained in:
Greg Wilkins 2013-09-13 23:39:45 +10:00
parent a23e899aff
commit 8449ccc873
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-distribution/pom.xml
View File

@ -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>

6
jetty-distribution/src/main/resources/start.ini
View File

@ -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
#

4
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -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))
{

6
jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
View File

@ -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.