Return-Path: Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org Received: (qmail 49377 invoked by uid 500); 13 Mar 2003 04:00:44 -0000 Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list cvs@avalon.apache.org Received: (qmail 49366 invoked by uid 500); 13 Mar 2003 04:00:44 -0000 Received: (qmail 49363 invoked from network); 13 Mar 2003 04:00:44 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 13 Mar 2003 04:00:44 -0000 Received: (qmail 64303 invoked by uid 1438); 13 Mar 2003 04:00:43 -0000 Date: 13 Mar 2003 04:00:43 -0000 Message-ID: <20030313040043.64302.qmail@icarus.apache.org> From: mcconnell@apache.org To: avalon-sandbox-cvs@apache.org Subject: cvs commit: avalon-sandbox/merlin/merlin-smp/xdocs/about/starting installation.xml X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N 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.

- $ cd <merlin-dir> + $ cd <your-merlin-cvs-dir> $ cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login $ cvs -z3 -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic co avalon-sandbox/merlin/ @@ -26,7 +26,7 @@ Once checkout is complete you can build Merlin using Maven as follows:

- $ maven merlin:install + $ maven merlin-dist

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