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/about/starting installation.xml
Date Thu, 13 Mar 2003 04:00:43 GMT
mcconnell    2003/03/12 20:00:43

  Modified:    merlin/merlin-smp/src/bin merlin.bat
               merlin/merlin-smp/src/config wrapper.conf
               merlin/merlin-smp/xdocs/about/starting installation.xml
  Log:
  Updating installation documetation to sync. with the Maven build process.
  
  Revision  Changes    Path
  1.2       +1 -1      avalon-sandbox/merlin/merlin-smp/src/bin/merlin.bat
  
  Index: merlin.bat
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/bin/merlin.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- merlin.bat	13 Mar 2003 01:05:29 -0000	1.1
  +++ merlin.bat	13 Mar 2003 04:00:43 -0000	1.2
  @@ -1,3 +1,3 @@
   @echo off
  -java -jar %MERLIN_HOME%\lib\system\merlin-bootstrap-1.0.jar -system %MERLIN_HOME% %1 %2
%3 %4 %5 %6
  +java -jar %MERLIN_HOME%\lib\system\merlin-cli-1.0.jar -system %MERLIN_HOME% %1 %2 %3 %4
%5 %6
   
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/merlin-smp/src/config/wrapper.conf
  
  Index: wrapper.conf
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/config/wrapper.conf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- wrapper.conf	13 Mar 2003 01:05:36 -0000	1.1
  +++ wrapper.conf	13 Mar 2003 04:00:43 -0000	1.2
  @@ -10,7 +10,7 @@
   # Java Classpath (include wrapper.jar)  Add class path elements as
   #  needed starting from 1
   wrapper.java.classpath.1=../lib/wrapper.jar
  -wrapper.java.classpath.2=../lib/system/merlin-bootstrap-1.0.jar
  +wrapper.java.classpath.2=../lib/system/merlin-cli-1.0.jar
   
   # Java Library Path (location of Wrapper.DLL or libwrapper.so)
   wrapper.java.library.path.1=../lib
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/merlin-smp/xdocs/about/starting/installation.xml
  
  Index: installation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/about/starting/installation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- installation.xml	13 Mar 2003 01:05:39 -0000	1.1
  +++ installation.xml	13 Mar 2003 04:00:43 -0000	1.2
  @@ -17,7 +17,7 @@
         Merlin project from CVS.
         </p>
   <source>
  -    $ cd &lt;merlin-dir&gt;
  +    $ cd &lt;your-merlin-cvs-dir&gt;
       $ 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>
  @@ -26,7 +26,7 @@
         Once checkout is complete you can build Merlin using Maven as follows:
         </p>
   <source>
  -    $ maven merlin:install
  +    $ maven merlin-dist
   </source>
   
         <p>
  
  
  

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


Mime
View raw message