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 --module-start-ini and --module-startd-ini

This commit is contained in:
Greg Wilkins 2013-09-13 14:12:09 +10:00
parent 822f5d2a0f
commit bb8d8fb999
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-distribution/pom.xml
View File

@ -474,7 +474,7 @@
<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-ini=http</argument>
<argument>--module-startd-ini=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-ini=http,https</argument>
<argument>--module-startd-ini=http,https</argument>
</arguments>
</configuration>
<goals>

2
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
View File

@ -664,7 +664,7 @@ public class Main
}
// Initialize
for (String module : args.getModuleIni())
for (String module : args.getModuleStartdIni())
{
moduleIni(args,module,true,false);
}

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

@ -76,7 +76,7 @@ public class StartArgs
private Properties properties = new Properties();
private Set<String> systemPropertyKeys = new HashSet<>();
private List<String> jvmArgs = new ArrayList<>();
private List<String> moduleIni = new ArrayList<>();
private List<String> moduleStartdIni = new ArrayList<>();
private List<String> moduleStartIni = new ArrayList<>();
private Map<String,String> propertySource = new HashMap<>();
private String moduleGraphFilename;
@ -444,9 +444,9 @@ public class StartArgs
return moduleGraphFilename;
}
public List<String> getModuleIni()
public List<String> getModuleStartdIni()
{
return moduleIni;
return moduleStartdIni;
}
public List<String> getModuleStartIni()
@ -679,7 +679,6 @@ public class StartArgs
}
// Module Management
if ("--list-modules".equals(arg))
{
listModules = true;
@ -687,13 +686,13 @@ public class StartArgs
return;
}
if (arg.startsWith("--module-ini="))
if (arg.startsWith("--module-startd-ini=")||arg.startsWith("--module-ini="))
{
if (!CMD_LINE_SOURCE.equals(source))
{
throw new UsageException(ERR_BAD_ARG,"%s not allowed in %s",arg,source);
}
moduleIni.addAll(getValues(arg));
moduleStartdIni.addAll(getValues(arg));
run = false;
return;
}

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

@ -68,15 +68,6 @@ Module Management:
Note: this can also be used in the ${jetty.base}/start.ini
or ${jetty.base}/start.d/*.ini files.
--module-ini=<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.
Transitive module dependencies are followed and all
modules that the specified module depends on are also
enabled via their own ini files in the same directory.
Note: not all modules have ini templates.
--module-start-ini=<modulename>
Enable a module by appending lines to the
${jetty.base}/start.ini file.
@ -86,6 +77,16 @@ Module Management:
modules that the specified module depends on are also
enabled in the ${jetty.base}/start.ini using the same
techniques.
Note: not all modules have ini templates.
--module-startd-ini=<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.
Transitive module dependencies are followed and all
modules that the specified module depends on are also
enabled via their own ini files in the same directory.
Note: not all modules have ini templates.
--write-module-graph=<filename>
Create a graphviz *.dot file of the module graph as it