Modified: commons/proper/daemon/trunk/src/site/xdoc/binaries.xml URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/site/xdoc/binaries.xml?rev=1771804&r1=1771803&r2=1771804&view=diff ============================================================================== --- commons/proper/daemon/trunk/src/site/xdoc/binaries.xml (original) +++ commons/proper/daemon/trunk/src/site/xdoc/binaries.xml Mon Nov 28 20:18:04 2016 @@ -29,32 +29,11 @@ In the directory <a href="http://www.apache.org/dist/commons/daemon/binaries/";>binaries</a> you will find subdirectories containing archives -corresponding to your operating system. If your machine is not in the list, -please mail us and we will try to make it available, or you can try to build it on your own. -The non-Windows files are compressed tar files. They are named <code>commons-daemon-m.n.p-bin-os-hw.tar.gz</code>. -For example: In the directory <code>linux</code> we have <code>commons-daemon-1.1.0-bin-linux-i686.tar.gz</code> -That is a file suitable for a Linux system running on Intel hardware. -Windows builds are provided as a zip file. +corresponding to your operating system. Only the Windows builds are provided as a zip file. </p> </section> <section name="How do I get the executable?"> -<subsection name="jsvc"> -<p> -Do the following: -<ul> - <li>Find the tar.gz file corresponding to your configuration.</li> - <li>Download it.</li> - <li>Uncompress the tar file and extract the contents (better with gnu tar). - There should be an executable file called <code>jsvc</code> and some text files</li> - <li>Copy the executable to the location where you want to run it.</li> - <li>Write a suitable shell script - (see in <code>src/samples</code> and <code>src/native/unix/native/Tomcat.sh</code>) - to get your Java application started as a daemon. - </li> -</ul> -</p> -</subsection> <subsection name="procrun"> <p> The Windows archive (e.g. commons-daemon-1.1.0-bin-windows.zip) contains 2 different executables: @@ -67,8 +46,8 @@ The <code>prunsrv.exe</code> executable The version in the top-level directory is for 32-bit (x86) architectures. The lower level directories are for 64-bit systems: <ul> -<li>amd64 - AMD 64-bit</li> -<li>ia64 - Intel 64-bit</li> +<li>amd64 - AMD/EMT 64-bit</li> +<li>ia64 - Intel Itanium 64-bit</li> </ul> The Windows application <code>prunsrv.exe</code> is used to install an application as a service. Once installed, <code>prunmgr.exe</code> can be used to monitor and reconfigure the service.
Modified: commons/proper/daemon/trunk/src/site/xdoc/download_daemon.xml URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/site/xdoc/download_daemon.xml?rev=1771804&r1=1771803&r2=1771804&view=diff ============================================================================== --- commons/proper/daemon/trunk/src/site/xdoc/download_daemon.xml (original) +++ commons/proper/daemon/trunk/src/site/xdoc/download_daemon.xml Mon Nov 28 20:18:04 2016 @@ -151,4 +151,3 @@ limitations under the License. </section> </body> </document> - 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=1771804&r1=1771803&r2=1771804&view=diff ============================================================================== --- commons/proper/daemon/trunk/src/site/xdoc/jsvc.xml (original) +++ commons/proper/daemon/trunk/src/site/xdoc/jsvc.xml Mon Nov 28 20:18:04 2016 @@ -145,6 +145,8 @@ Where options include: user used to run the daemon (defaults to current user) -verbose[:class|gc|jni] enable verbose output + -cwd </full/path> + set working directory to given location (defaults to /) -outfile </full/path/to/file> Location for output from stdout (defaults to /dev/null) Use the value '&2' to simulate '1>&2' Modified: commons/proper/daemon/trunk/src/site/xdoc/procrun.xml URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/site/xdoc/procrun.xml?rev=1771804&r1=1771803&r2=1771804&view=diff ============================================================================== --- commons/proper/daemon/trunk/src/site/xdoc/procrun.xml (original) +++ commons/proper/daemon/trunk/src/site/xdoc/procrun.xml Mon Nov 28 20:18:04 2016 @@ -199,9 +199,11 @@ </subsection> <subsection name="Command line parameters"> <p> - Each command parameter is prefixed with <b>--</b>. - If an environment variable exists with the same name as command line parameter but - prefixed with <code>PR_</code> it will take precedence. + Each command parameter is prefixed with <b>--</b> (or <b>++</b>, see below). + <br/> + If an environment variable exists with the same name as a command line parameter but + prefixed with <code>PR_</code> it will <b>override</b> the equivalent command line parameter. + <br/> For example: <source>set PR_CLASSPATH=xx.jar</source> </p> @@ -230,7 +232,60 @@ JvmOptions: Only multi-valued parameters support this; they are indicated in the table below by <b><code>++</code></b>. <br></br> If <b><code>++</code></b> is used for a parameter that does not support multiple values, -then it is treated the same as <b>--</b>. No error is reported. +then it is treated the same as <b><code>--</code></b>. No error is reported. +<br/> +Configuration is overwritten in case <b><code>--</code></b> is used. +For example: +<source> +--JvmOptions=-Dthree=3 ++JvmOptions=-Dfour=4 +</source> +will always overwrite the JvmOptions. The resulting configuration will be: +<source> +Startup: +auto + +JvmOptions: +-Dthree=3 +-Dfour=4 +</source> +However if on <b><code>++</code></b> is used the values will be appended. For example calling the +following after the first example +<source> +++JvmOptions=-Dthree=3 ++JvmOptions=-Dfour=2 +</source> +will result in the following values being used: +<source> +Startup: +auto + +JvmOptions: +-Done=1 +-Dtwo=2 +-Dthree=3 +-Dfour=4 +</source> +<br/> +In case you intermix the <b><code>++</code></b> and <b><code>--</code></b> options, the +last <b><code>--</code></b> parameter will cause option reset. For example: +<source> +--Startup=manual --Startup=auto --JvmOptions=-Done=1 ++JvmOptions=-Dtwo=2 --JvmOptions=-Dthree=3 ++JvmOptions=-Dfour=2 +</source> +will result in the following values being used: +<source> +Startup: +auto + +JvmOptions: +-Dthree=3 +-Dfour=4 +</source> +</p> +<p> +When updating a service (//US or update command), using <b><code>--</code></b> +will replace any existing parameter with the new setting. +<br/> +For multi-valued parameters, using the <b><code>++</code></b> option qualifier +will add the new value(s) to any existing value(s). </p> <p> <table>
