avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/platform/xdocs/merlin/kernel cli.xml navigation.xml
Date Wed, 10 Dec 2003 09:10:01 GMT
mcconnell    2003/12/10 01:10:01

  Modified:    merlin   INSTALLATION.TXT
               merlin/kernel/impl/conf merlin.properties
               merlin/platform/xdocs/merlin/kernel cli.xml navigation.xml
  Log:
  Add documetation on merlin kernel properties, updates to the CLI documetation and updates
to the install notes.
  
  Revision  Changes    Path
  1.4       +1 -0      avalon/merlin/INSTALLATION.TXT
  
  Index: INSTALLATION.TXT
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/INSTALLATION.TXT,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- INSTALLATION.TXT	10 Dec 2003 08:25:32 -0000	1.3
  +++ INSTALLATION.TXT	10 Dec 2003 09:10:01 -0000	1.4
  @@ -15,6 +15,7 @@
       /system
       README.TXT
       LICENSE.TXT
  +    INSTALLATION.TXT
     /plugins
       avalon-meta-plugin-1.2.jar
       merlin-plugin-3.2-dev.jar
  
  
  
  1.4       +2 -2      avalon/merlin/kernel/impl/conf/merlin.properties
  
  Index: merlin.properties
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/impl/conf/merlin.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- merlin.properties	9 Dec 2003 13:46:33 -0000	1.3
  +++ merlin.properties	10 Dec 2003 09:10:01 -0000	1.4
  @@ -48,7 +48,7 @@
   merlin.ext = ${merlin.dir}
   
   #
  -# The info generation policy.  If 'true' a short infomation header is 
  +# The info generation policy.  If 'true' a short information header is 
   # generated on startup detailing the kernel parameterization state.
   #
   merlin.info = false
  @@ -60,7 +60,7 @@
   merlin.debug = false
   
   #
  -# The default execution model.  If 'true' the merlin kernel will 
  +# The default execution mode.  If 'true' the merlin kernel will 
   # continue until expliciy stopped or process termination is invoked.
   # If 'false' the kernel will initiate decommissioning on completion
   # of the deployment phase.
  
  
  
  1.2       +5 -11     avalon/merlin/platform/xdocs/merlin/kernel/cli.xml
  
  Index: cli.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/kernel/cli.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cli.xml	24 Sep 2003 09:34:38 -0000	1.1
  +++ cli.xml	10 Dec 2003 09:10:01 -0000	1.2
  @@ -80,9 +80,10 @@
   <source><![CDATA[
    $ merlin -help
   usage: merlin [block] [-lang <code>] [-install <url>] [-library
  -       <directory>] [-help] [-version] [-home <directory>] [-debug] [-info]
  -       [-config <url>] [-jmx] [-execute] [-repository <directory>] [-kernel
  -       <url>]]></source>
  +       <directory>] [-help] [-version] [-home <directory>] [-impl <artifact>]
  +       [-debug] [-info] [-config <url>] [-context <directory>] [-system
  +       <directory>] [-execute] [-repository <directory>] [-kernel <url>]
      
  +]]></source>
         </subsection>
   
         <subsection name="Command Line Qualifiers">
  @@ -126,7 +127,7 @@
             </tr>
             <tr>
               <td>-repository</td><td>file</td>
  -            <td>Declaration of a local repository.  If not suppplied Merlin will
default to ${merlin.home}/repository/.</td>
  +            <td>Declaration of a local repository.  If not suppplied Merlin will
default to ${avalon.home}.</td>
             </tr>
           </table>
         </subsection>
  @@ -141,13 +142,6 @@
   
           <table>
             <tr><th>Qualifier</th><th>Parameter</th><th>Description</th></tr>
  -          <tr>
  -            <td>-jmx</td>
  -            <td></td>
  -            <td>
  -Launches a jmx server and registeres the merlin kernal as a managed entity.
  -            </td>
  -          </tr>
             <tr>
               <td>-install</td>
               <td>url</td>
  
  
  
  1.3       +1 -0      avalon/merlin/platform/xdocs/merlin/kernel/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/kernel/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	28 Oct 2003 11:41:49 -0000	1.2
  +++ navigation.xml	10 Dec 2003 09:10:01 -0000	1.3
  @@ -67,6 +67,7 @@
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html">
           <item name="Kernel" href="/merlin/kernel/index.html">
  +          <item name="Properties" href="/merlin/kernel/properties.html"/>
             <item name="CLI" href="/merlin/kernel/cli.html"/>
             <item name="NT" href="/merlin/kernel/nt.html"/>
           </item>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message