avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-smp/xdocs/starting installation.xml
Date Thu, 24 Apr 2003 13:00:18 GMT
mcconnell    2003/04/24 06:00:18

  Modified:    merlin/merlin-smp/xdocs/starting installation.xml
  Log:
  Doc housekeeping.
  
  Revision  Changes    Path
  1.4       +60 -60    avalon-sandbox/merlin/merlin-smp/xdocs/starting/installation.xml
  
  Index: installation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/installation.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- installation.xml	17 Apr 2003 13:13:47 -0000	1.3
  +++ installation.xml	24 Apr 2003 13:00:17 -0000	1.4
  @@ -19,10 +19,10 @@
                       similar, and identical if you have <a
                       href="http://www.cygwin.com">cygwin</a> installed.
                   </p>
  -                <source><![CDATA[
  -                $ cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login
  -                $ cvs -z3 -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic co avalon-sandbox/merlin/
  -                ]]></source>
  +<source><![CDATA[
  +$ cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login
  +$ cvs -z3 -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic co avalon-sandbox/merlin/
  +]]></source>
   
                   <p>
                       Once checkout is complete you can build Merlin using <a
  @@ -39,12 +39,12 @@
                       directory containing the Merlin system at
                   </p>
   
  -                <source><![CDATA[
  -                +-- avalon-sandbox
  -                    +-- merlin
  -                        +-- target
  -                            +-- inst
  -                ]]></source>
  +<source><![CDATA[
  ++-- avalon-sandbox
  +  +-- merlin
  +    +-- target
  +      +-- inst
  +]]></source>
   
               </subsection>
               <subsection name="Copy inst to your preferred location.">
  @@ -54,10 +54,10 @@
                       the installation dir to the /opt dir:
                   </p>
   
  -                <source><![CDATA[
  -                $ cp -Rf merlin/target/inst /opt/merlin-SNAPSHOT
  -                $ ln -s /opt/merlin-SNAPSHOT /opt/merlin
  -                ]]></source>
  +<source><![CDATA[
  +$ cp -Rf merlin/target/inst /opt/merlin-SNAPSHOT
  +$ ln -s /opt/merlin-SNAPSHOT /opt/merlin
  +]]></source>
   
               </subsection>
               <subsection name="Declare MERLIN_HOME environment variable">
  @@ -69,15 +69,15 @@
                       your system path:
                   </p>
   
  -                <source><![CDATA[
  -                $ echo '
  -                > # set location of merlin
  -                > export MERLIN_HOME=/opt/merlin
  -                > # include it in the path
  -                > export PATH=$PATH:MERLIN_HOME
  -                > ' > ~/.bash_profile
  -                $ source ~/.bash_profile
  -                ]]></source>
  +<source><![CDATA[
  +$ echo '
  +> # set location of merlin
  +> export MERLIN_HOME=/opt/merlin
  +> # include it in the path
  +> export PATH=$PATH:MERLIN_HOME
  +> ' > ~/.bash_profile
  +$ source ~/.bash_profile
  +]]></source>
   
               </subsection>
               <subsection name="Validating your installation.">
  @@ -95,13 +95,13 @@
                       Merlin CLI help information.
                   </p>
   
  -                <source><![CDATA[
  -                $ merlin.sh -help
  -                  usage: merlin [block] [-debug] [-config <file>] [-lang
  -                  <code>] [-system <directory>] [-kernel <file>] [-home
  -                  <directory>] [-version] [-help]
  -                       ...
  -                ]]></source>
  +<source><![CDATA[
  +$ merlin.sh -help
  +usage: merlin [block] [-debug] [-config <file>] [-lang
  +<code>] [-system <directory>] [-kernel <file>] [-home
  +<directory>] [-version] [-help]
  +...
  +]]></source>
   
                   <p>
                       The Merlin installation includes some demonstration block
  @@ -112,9 +112,9 @@
                       deployment scenarios.
                   </p>
   
  -                <source><![CDATA[
  -                $ merlin.sh run $MERLIN_HOME/repository/demo/block.xml
  -                ]]></source>
  +<source><![CDATA[
  +$ merlin.sh run $MERLIN_HOME/repository/demo/block.xml
  +]]></source>
   
                   <p>
                       This demonstration should generate the following output
  @@ -122,43 +122,43 @@
                       you installation path).
                   </p>
   
  -                <source><![CDATA[
  -                [INFO   ] (sys): initialization from: F:\dev on localhost
  -                [INFO   ] (sys): commencing block assembly phase
  -                [INFO   ] (demo.standard): config message: Custom message from override
target.
  -                [INFO   ] (demo.standard): context
  -
  -                  home: F:\dev\working\home\demo\standard
  -                  work: F:\dev\working\temp\demo\standard
  -                  name: standard
  -                  partition: /demo/standard
  -
  -                [INFO   ] (demo.test.standard): config message: Standard component inside
a nested block.
  -                [INFO   ] (demo.test.standard): context
  -
  -                  home: F:\dev\working\home\demo\test\standard
  -                  work: F:\dev\working\temp\demo\test\standard
  -                  name: standard
  -                  partition: /demo/test/standard
  +<source><![CDATA[
  +[INFO   ] (sys): initialization from: F:\dev on localhost
  +[INFO   ] (sys): commencing block assembly phase
  +[INFO   ] (demo.standard): config message: Custom message from override target.
  +[INFO   ] (demo.standard): context
  +
  +home: F:\dev\working\home\demo\standard
  +work: F:\dev\working\temp\demo\standard
  +name: standard
  +partition: /demo/standard
  +
  +[INFO   ] (demo.test.standard): config message: Standard component inside a nested block.
  +[INFO   ] (demo.test.standard): context
  +
  +home: F:\dev\working\home\demo\test\standard
  +work: F:\dev\working\temp\demo\test\standard
  +name: standard
  +partition: /demo/test/standard
   
  -                [INFO   ] (sys): Block hierarchy established.
  -                ]]></source>
  +[INFO   ] (sys): Block hierarchy established.
  +]]></source>
   
                   <p>User ^C to terminate the session.  You should see the following
                       log entries reflecting the orderly decommisioning of the system.
                   </p>
  -                <source><![CDATA[
  -                [INFO   ] (sys): commencing decommissioning phase
  -                [INFO   ] (sys): bye
  -                ]]></source>
  +<source><![CDATA[
  +[INFO   ] (sys): commencing decommissioning phase
  +[INFO   ] (sys): bye
  +]]></source>
   
                   <p>
                       Under the hood Merlin is doing a lot of things to ensure that the components
declared in the block.xml file are being deployed with all required resources and dependencies.
 To take a closer look at the Merlin internal process, you can switch on internal log tracing
by using the -debug switch on the command line. E.g:
                   </p>
   
  -                <source><![CDATA[
  -                $ merlin %MERLIN_HOME%\repository\demo\block.xml -debug
  -                ]]></source>
  +<source><![CDATA[
  +$ merlin tutorial.jar -debug
  +]]></source>
   
               </subsection>
               <subsection name="Next Steps">
  
  
  

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


Mime
View raw message