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

refined option names after feedback 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@589 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2009-07-27 05:29:39 +00:00
parent 9ad7377e13
commit a65431c1c5
4 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.txt
View File

@ -49,7 +49,7 @@ To run with specific configuration file(s)
To see the available options
java -jar start.jar --info
java -jar start.jar --help
To run with JSP support

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

@ -55,8 +55,8 @@ public class Main
{
private boolean _showUsage = false;
private boolean _dumpVersions = false;
private boolean _listModes = false;
private boolean _execPrint = false;
private boolean _listOptions = false;
private boolean _dryRun = false;
private boolean _secure = false;
private boolean _fromDaemon = false;
private List<String> _activeOptions = new ArrayList<String>();
@ -110,15 +110,15 @@ public class Main
continue;
}
if ("--list-modes".equals(arg))
if ("--list-modes".equals(arg) || "--list-options".equals(arg))
{
_listModes = true;
_listOptions = true;
continue;
}
if ("--exec-print".equals(arg))
if ("--exec-print".equals(arg)||"--dry-run".equals(arg))
{
_execPrint = true;
_dryRun = true;
continue;
}
@ -526,17 +526,17 @@ public class Main
return;
}
// Show all modes with version information
if (_listModes)
// Show all options with version information
if (_listOptions)
{
showAllModesWithVersions(classpath);
showAllOptionsWithVersions(classpath);
return;
}
// Show Command Line to execute Jetty
if (_execPrint)
if (_dryRun)
{
showExecPrint(classpath,xmls);
showDryRun(classpath,xmls);
return;
}
@ -603,7 +603,7 @@ public class Main
}
}
private void showExecPrint(Classpath classpath, List<String> xmls)
private void showDryRun(Classpath classpath, List<String> xmls)
{
StringBuffer cmd = new StringBuffer();
@ -653,7 +653,7 @@ public class Main
return exe;
}
private void showAllModesWithVersions(Classpath classpath)
private void showAllOptionsWithVersions(Classpath classpath)
{
Set<String> sectionIds = _config.getSectionIds();
@ -668,15 +668,15 @@ public class Main
msg.append("is ");
}
msg.append(String.valueOf(sectionIds.size()));
msg.append(" OPTION mode");
msg.append(" OPTION");
if (sectionIds.size() > 1)
{
msg.append("s");
}
msg.append(" available to use.");
System.out.println(msg);
System.out.println("Each mode is listed along with associated available classpath entries, in the order that they would appear from that mode.");
System.out.println("Note: If using multiple modes (eg: 'Server,servlet,webapp,jms,jmx') "
System.out.println("Each option is listed along with associated available classpath entries, in the order that they would appear from that mode.");
System.out.println("Note: If using multiple options (eg: 'Server,servlet,webapp,jms,jmx') "
+ "then overlapping entries will not be repeated in the eventual classpath.");
System.out.println();
System.out.printf("${jetty.home} = %s%n",_jettyHome);
@ -686,15 +686,15 @@ public class Main
{
if (Config.DEFAULT_SECTION.equals(sectionId))
{
System.out.println("GLOBAL Mode (Prepended Entries)");
System.out.println("GLOBAL option (Prepended Entries)");
}
else if ("*".equals(sectionId))
{
System.out.println("GLOBAL Mode (Appended Entries) (*)");
System.out.println("GLOBAL option (Appended Entries) (*)");
}
else
{
System.out.printf("Mode [%s]",sectionId);
System.out.printf("Option [%s]",sectionId);
if (Character.isUpperCase(sectionId.charAt(0)))
{
System.out.print(" (Aggregate)");
@ -707,7 +707,7 @@ public class Main
if (sectionCP.isEmpty())
{
System.out.println("Empty mode, no classpath entries active.");
System.out.println("Empty option, no classpath entries active.");
System.out.println();
continue;
}
@ -742,7 +742,7 @@ public class Main
System.out.println("Version Information on " + classpath.count() + " entr" + ((classpath.count() > 1)?"ies":"y") + " in the classpath.");
System.out.println("Note: order presented here is how they would appear on the classpath.");
System.out.println(" changes to the OPTIONS=[mode,mode,...] command line option will be reflected here.");
System.out.println(" changes to the OPTIONS=[option,option,...] command line option will be reflected here.");
int i = 0;
for (File element : classpath.getElements())

2
jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
View File

@ -58,7 +58,7 @@
${path}.path property path
# add a property defined library directory
${lib}/** exists ${jetty.lib}
${lib}/** exists ${lib}
# Try different settings of jetty.home until the jetty.jar is found.
jetty.home=. ! exists $(jetty.home)/start.jar

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

@ -12,10 +12,9 @@ Advanced Options:
* Security Policies
* Secure Logging
* Audit Logging
--exec-print Print the command line that the start.jar uses to start
jetty, then exit.
(useful in shell scripts)
--list-modes List available classpath mode options, then exit.
--dry-run Print the command line that the start.jar generates,
then exit.
--list-options List available options, then exit.
(see OPTION property in section below)
Properties:
@ -41,10 +40,15 @@ NOTE: Not all properties are listed here.
The passphrase defined to stop the server.
Requried along with STOP.PORT if you want to use the --stop option above.
DEBUG=true
Enable debug level log messages on the default logging implementation.
Enable debug on the start mechanism. ( Note this is not equivalent
to enabling debug on the logging mechanism of the started server).
(default: false)
OPTIONS=[mode,mode,...]
Classpath Options to use. Eg: All, Server, jmx, webapp, plus, etc...
OPTIONS=[option,option,...]
Classpath Options to use. By convention, option names starting with capitals
will include associated options (eg Server includes jetty-server, jetty-webapp,
jetty-deploy, etc). An option starting with a lowercase letter includes
just the direct dependencies of the option (eg jsp includes just jetty-jsp
module and it's dependencies).
(default: "default,*")
@OPTIONS@