commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1133502 - in /commons/proper/daemon/trunk: RELEASE-NOTES.txt src/native/unix/man/jsvc.1.xml src/native/unix/native/arguments.c src/native/unix/native/help.c src/site/xdoc/jsvc.xml
Date Wed, 08 Jun 2011 18:31:29 GMT
Author: mturk
Date: Wed Jun  8 18:31:29 2011
New Revision: 1133502

URL: http://svn.apache.org/viewvc?rev=1133502&view=rev
Log:
DAEMON-208 Add -server and -client -jvm synonyms

Modified:
    commons/proper/daemon/trunk/RELEASE-NOTES.txt
    commons/proper/daemon/trunk/src/native/unix/man/jsvc.1.xml
    commons/proper/daemon/trunk/src/native/unix/native/arguments.c
    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=1133502&r1=1133501&r2=1133502&view=diff
==============================================================================
--- commons/proper/daemon/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/trunk/RELEASE-NOTES.txt Wed Jun  8 18:31:29 2011
@@ -31,6 +31,7 @@ Commons DAEMON 1.0.3 requires a minimum 
 
 NEW FEATURES:
 
+* DAEMON-208: Add -server and -client -jvm <name> synonyms (1.0.6)
 * DAEMON-205: Add support for building on ARM processors (1.0.6)
 * DAEMON-204: Add DaemonSignal interface that allows catching SIGUSR2
               signals and creating custom callbacks (1.0.6)

Modified: commons/proper/daemon/trunk/src/native/unix/man/jsvc.1.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/man/jsvc.1.xml?rev=1133502&r1=1133501&r2=1133502&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/man/jsvc.1.xml (original)
+++ commons/proper/daemon/trunk/src/native/unix/man/jsvc.1.xml Wed Jun  8 18:31:29 2011
@@ -21,9 +21,9 @@
   <refmeta>
     <refentrytitle>JSVC</refentrytitle>
     <manvolnum>1</manvolnum>
-    <refmiscinfo class='date'>October 2010</refmiscinfo>
-    <refmiscinfo class='source'>Jsvc version 1.0.4</refmiscinfo>
-    <refmiscinfo class='manual'>Apache Commons project</refmiscinfo>
+    <refmiscinfo class='date'>June 2011</refmiscinfo>
+    <refmiscinfo class='source'>Jsvc version 1.0.6</refmiscinfo>
+    <refmiscinfo class='manual'>Apache Commons Daemon project</refmiscinfo>
   </refmeta>
   <refnamediv id='name'>
     <refname>jsvc</refname>
@@ -34,6 +34,8 @@
     <cmdsynopsis>
       <command>jsvc</command>
       <arg choice='opt'>-jvm <replaceable>JVM name</replaceable></arg>
+      <arg choice='opt'>-client <replaceable>client JVM</replaceable></arg>
+      <arg choice='opt'>-server <replaceable>server JVM</replaceable></arg>
       <arg choice='opt'>-classpath <replaceable>path</replaceable></arg>
       <arg choice='opt'>-cp <replaceable>path</replaceable></arg>
       <arg choice='opt'>-java-home <replaceable>directory</replaceable></arg>
@@ -72,6 +74,18 @@
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term><option>-client</option> client JVM</term>
+        <listitem>
+          <para>use a client Java Virtual Machine.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-server</option> server JVM</term>
+        <listitem>
+          <para>use a server Java Virtual Machine.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term><option>-cp/ -classpath</option> directory and zip/jar
           files</term>
         <listitem>
@@ -185,8 +199,8 @@
 
   <refsect1 id='author'><title>AUTHOR</title>
     <para>JSVC is part of the Apache Commons Daemon project. Authors are
-      Jean-Frederic Clere, Remy Maucherat, Yoav Shapira, Bill Barker. JSVC is
-      under the Apache License Version 2.0.</para>
+      Jean-Frederic Clere, Remy Maucherat, Yoav Shapira, Bill Barker, Mladen Turk. JSVC is
+      released under the Apache License Version 2.0.</para>
   </refsect1>
 
 </refentry>

Modified: commons/proper/daemon/trunk/src/native/unix/native/arguments.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/arguments.c?rev=1133502&r1=1133501&r2=1133502&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/arguments.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/arguments.c Wed Jun  8 18:31:29 2011
@@ -211,6 +211,12 @@ static arg_data *parse(int argc, char *a
                 return NULL;
             }
         }
+        else if (!strcmp(argv[x], "-client")) {
+            args->name = strdup("client");
+        }
+        else if (!strcmp(argv[x], "-server")) {
+            args->name = strdup("server");
+        }
         else if (!strcmp(argv[x], "-home") ||
                  !strcmp(argv[x], "-java-home")) {
             args->home = optional(argc, argv, x++);

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=1133502&r1=1133501&r2=1133502&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/help.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/help.c Wed Jun  8 18:31:29 2011
@@ -34,7 +34,10 @@ void help(home_data *data)
         printf(" '%s'", PRINT_NULL(data->jvms[x]->name));
     }
     printf("\n");
-
+    printf("    -client\n");
+    printf("        use a client Java Virtual Machine.\n");
+    printf("    -server\n");
+    printf("        use a server Java Virtual Machine.\n");
     printf("    -cp | -classpath <directories and zip/jar files>\n");
     printf("        set search path for service classes and resouces\n");
     printf("    -java-home | -home <directory>\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=1133502&r1=1133501&r2=1133502&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/site/xdoc/jsvc.xml (original)
+++ commons/proper/daemon/trunk/src/site/xdoc/jsvc.xml Wed Jun  8 18:31:29 2011
@@ -120,6 +120,10 @@ Where options include:
     -jvm &lt;JVM name&gt;
         use a specific Java Virtual Machine. Available JVMs:
             'client' 'server'
+    -client
+        use a client Java Virtual Machine.
+    -server
+        use a server Java Virtual Machine.
     -cp / -classpath &lt;directories and zip/jar files&gt;
         set search path for service classes and resouces
     -home &lt;directory&gt;



Mime
View raw message