Author: mturk
Date: Mon Mar 15 07:00:01 2010
New Revision: 923087
URL: http://svn.apache.org/viewvc?rev=923087&view=rev
Log:
Update help and docs with the latest parameters.
Modified:
commons/proper/daemon/trunk/RELEASE-NOTES.txt
commons/proper/daemon/trunk/src/native/unix/native/help.c
commons/proper/daemon/trunk/src/site/xdoc/jsvc.xml
Modified: commons/proper/daemon/trunk/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/RELEASE-NOTES.txt?rev=923087&r1=923086&r2=923087&view=diff
==============================================================================
--- commons/proper/daemon/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/trunk/RELEASE-NOTES.txt Mon Mar 15 07:00:01 2010
@@ -18,6 +18,8 @@ NEW FEATURES:
* DAEMON-138: Add --PidFile option to allow storing running process id. (1.0.3)
* DAEMON-137: Add --LogJniMessages allowing to configure JNI verbose message
logging. By default those messages were always logged. (1.0.3)
+* DAEMON-140: Add missing Java6 parameters -ea, da, -esa, -dsa, -showversion
+ and their long name synonyms. (1.0.3)
* Add -wait and -stop parameters. (1.0.1).
The -wait parameter is experimental: that a is loop testing for a
Modified: commons/proper/daemon/trunk/src/native/unix/native/help.c
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/help.c?rev=923087&r1=923086&r2=923087&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/help.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/help.c Mon Mar 15
07:00:01 2010
@@ -25,6 +25,8 @@ void help(home_data *data)
printf("\n");
printf("Where options include:\n");
printf("\n");
+ printf(" -help | --help | -?\n");
+ printf(" show this help page (implies -nodetach)\n");
printf(" -jvm <JVM name>\n");
printf(" use a specific Java Virtual Machine. Available JVMs:\n");
printf(" ");
@@ -42,8 +44,9 @@ void help(home_data *data)
printf(" -version\n");
printf(" show the current Java environment version (to check\n");
printf(" correctness of -home and -jvm. Implies -nodetach)\n");
- printf(" -help / -?\n");
- printf(" show this help page (implies -nodetach)\n");
+ printf(" -showversion\n");
+ printf(" show the current Java environment version (to check\n");
+ printf(" correctness of -home and -jvm) and continue execution.\n");
printf(" -nodetach\n");
printf(" don't detach from parent process and become a daemon\n");
printf(" -debug\n");
@@ -67,6 +70,22 @@ void help(home_data *data)
printf(" set a Java system property\n");
printf(" -X<option>\n");
printf(" set Virtual Machine specific option\n");
+ printf(" -ea[:<packagename>...|:<classname>]\n");
+ printf(" -enableassertions[:<packagename>...|:<classname>]\n");
+ printf(" enable assertions\n");
+ printf(" -da[:<packagename>...|:<classname>]\n");
+ printf(" -disableassertions[:<packagename>...|:<classname>]\n");
+ printf(" disable assertions\n");
+ printf(" -esa | -enablesystemassertions\n");
+ printf(" enable system assertions\n");
+ printf(" -dsa | -disablesystemassertions\n");
+ printf(" disable system assertions\n");
+ printf(" -agentlib:<libname>[=<options>]\n");
+ printf(" load native agent library <libname>, e.g.
-agentlib:hprof\n");
+ printf(" -agentpath:<pathname>[=<options>]\n");
+ printf(" load native agent library by full pathname\n");
+ printf(" -javaagent:<jarpath>[=<options>]\n");
+ printf(" load Java programming language agent, see
java.lang.instrument\n");
printf(" -procname <procname>\n");
printf(" use the specified process name (works only for Linux)\n");
printf(" -wait <waittime>\n");
Modified: commons/proper/daemon/trunk/src/site/xdoc/jsvc.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/site/xdoc/jsvc.xml?rev=923087&r1=923086&r2=923087&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/site/xdoc/jsvc.xml (original)
+++ commons/proper/daemon/trunk/src/site/xdoc/jsvc.xml Mon Mar 15 07:00:01 2010
@@ -111,6 +111,8 @@ Usage: jsvc [-options] class [args...]
Where options include:
+ -help | --help | -?
+ show this help page (implies -nodetach)
-jvm <JVM name>
use a specific Java Virtual Machine. Available JVMs:
'client' 'server'
@@ -122,8 +124,9 @@ Where options include:
-version
show the current Java environment version (to check
correctness of -home and -jvm. Implies -nodetach)
- -help / -?
- show this help page (implies -nodetach)
+ -showversion
+ show the current Java environment version (to check
+ correctness of -home and -jvm) and continue execution.
-nodetach
don't detach from parent process and become a daemon
-debug
@@ -136,7 +139,7 @@ Where options include:
enable verbose output
-outfile </full/path/to/file>
Location for output from stdout (defaults to /dev/null)
- Use the value '&2' to simulate '1>&2'
+ Use the value '&2' to simulate '1>∓2'
-errfile </full/path/to/file>
Location for output from stderr (defaults to /dev/null)
Use the value '&1' to simulate '2>&1'
@@ -147,13 +150,31 @@ Where options include:
set a Java system property
-X<option>
set Virtual Machine specific option
- -procname <process name>
- Allows the process name to be configured on Linux
+ -ea[:<packagename>...|:<classname>]
+ -enableassertions[:<packagename>...|:<classname>]
+ enable assertions
+ -da[:<packagename>...|:<classname>]
+ -disableassertions[:<packagename>...|:<classname>]
+ disable assertions
+ -esa | -enablesystemassertions
+ enable system assertions
+ -dsa | -disablesystemassertions
+ disable system assertions
+ -agentlib:<libname>[=<options>]
+ load native agent library <libname>, e.g. -agentlib:hprof
+ -agentpath:<pathname>[=<options>]
+ load native agent library by full pathname
+ -javaagent:<jarpath>[=<options>]
+ load Java programming language agent, see java.lang.instrument
+ -procname <procname>
+ use the specified process name (works only for Linux)
-wait <waittime>
wait waittime seconds for the service to start
waittime should multiple of 10 (min=10)
-stop
stop the service using the file given in the -pidfile option
+ -keepstdin
+ does not redirect stdin to /dev/null
</source>
</p>
