Return-Path: 
 <avalon-cvs-return-6390-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 14638 invoked from network); 24 Apr 2002 08:38:48 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 24 Apr 2002 08:38:48 -0000
Received: (qmail 3480 invoked by uid 97); 24 Apr 2002 08:38:59 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 3447 invoked by uid 97); 24 Apr 2002 08:38:58 -0000
Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:avalon-cvs-subscribe@jakarta.apache.org>
List-Help: <mailto:avalon-cvs-help@jakarta.apache.org>
List-Post: <mailto:avalon-cvs@jakarta.apache.org>
List-Id: "Avalon CVS List" <avalon-cvs.jakarta.apache.org>
Reply-To: "Avalon Developers List" <avalon-dev@jakarta.apache.org>
Delivered-To: mailing list avalon-cvs@jakarta.apache.org
Received: (qmail 3436 invoked by uid 97); 24 Apr 2002 08:38:58 -0000
Date: 24 Apr 2002 08:38:44 -0000
Message-ID: <20020424083844.19478.qmail@icarus.apache.org>
From: leif@apache.org
To: jakarta-avalon-excalibur-cvs@apache.org
Subject: cvs commit: jakarta-avalon-excalibur/instrument-manager/example/conf
 instrument.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

leif        02/04/24 01:38:44

  Modified:    instrument-manager/example ant.properties.sample build.xml
               instrument-manager/example/bin run.sh
               instrument-manager/example/conf instrument.xml
  Log:
  Bring some files up to date.
  
  Revision  Changes    Path
  1.3       +4 -4      jakarta-avalon-excalibur/instrument-manager/example/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/example/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	3 Apr 2002 11:36:10 -0000	1.2
  +++ ant.properties.sample	24 Apr 2002 08:38:44 -0000	1.3
  @@ -9,7 +9,7 @@
   # The ant.properties values in this directory apply only to this component, and
   # override the defaults in ../ant.properties.
   #
  -# $Id: ant.properties.sample,v 1.2 2002/04/03 11:36:10 hammant Exp $
  +# $Id: ant.properties.sample,v 1.3 2002/04/24 08:38:44 leif Exp $
   # -----------------------------------------------------------------------------
   
   # --------------------------------------------------
  @@ -49,9 +49,9 @@
   avalon-framework.home=../../../jakarta-avalon/build/lib
   avalon-framework.jar=${avalon-framework.home}/avalon-framework.jar
   
  -# ----- Avalon Excalibur -----
  -avalon-excalibur.home=../../all/build/lib
  -avalon-excalibur.jar=${avalon-excalibur.home}/avalon-excalibur.jar
  +# ----- Excalibur Concurrent -----
  +excalibur-concurrent.home=../../concurrent/build/lib
  +excalibur-concurrent.jar=${excalibur-concurrent.home}/excalibur-concurrent-1.0.jar
   
   # ----- Excalibur Instrument -----
   excalibur-instrument.home=../../instrument/build/lib
  
  
  
  1.6       +1 -4      jakarta-avalon-excalibur/instrument-manager/example/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/example/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	6 Apr 2002 13:55:04 -0000	1.5
  +++ build.xml	24 Apr 2002 08:38:44 -0000	1.6
  @@ -56,13 +56,10 @@
           <copy file="${xalan.jar}" todir="${lib.dir}" preservelastmodified="yes"/>
           
           <!-- Logkit -->
  -        <copy file="${avalon-logkit.jar}" todir="${lib.dir}" preservelastmodified="yes"/>
  +        <copy file="${logkit.jar}" todir="${lib.dir}" preservelastmodified="yes"/>
           
           <!-- Avalon Framework -->
           <copy file="${avalon-framework.jar}" todir="${lib.dir}" preservelastmodified="yes"/>
  -        
  -        <!-- Avalon Excalibur -->
  -        <copy file="${avalon-excalibur.jar}" todir="${lib.dir}" preservelastmodified="yes"/>
           
           <!-- Avalon Excalibur Concurrent -->
           <copy file="${excalibur-concurrent.jar}"
  
  
  
  1.2       +2 -4      jakarta-avalon-excalibur/instrument-manager/example/bin/run.sh
  
  Index: run.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/example/bin/run.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- run.sh	26 Mar 2002 11:56:15 -0000	1.1
  +++ run.sh	24 Apr 2002 08:38:44 -0000	1.2
  @@ -23,7 +23,7 @@
   
   # Main.java has hard coded config values so this script must be run from 
   # altprofile/bin (any better ideas ?)
  -EXAMPLE_HOME=../..
  +EXAMPLE_HOME=..
   
   #
   # Build the runtime classpath
  @@ -32,10 +32,8 @@
       CP=${CP}:$i
   done
   
  -CP=${CP}:../lib/altprofile.jar
  -
   #echo $CP
   
   # Run the example application
  -$JAVACMD -classpath $CP org.apache.avalon.examples.altprofile.Main $@
  +$JAVACMD -classpath $CP org.apache.avalon.excalibur.instrument.example.Main $@
   
  
  
  
  1.3       +3 -3      jakarta-avalon-excalibur/instrument-manager/example/conf/instrument.xml
  
  Index: instrument.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/example/conf/instrument.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- instrument.xml	29 Mar 2002 14:03:49 -0000	1.2
  +++ instrument.xml	24 Apr 2002 08:38:44 -0000	1.3
  @@ -39,19 +39,19 @@
               <instrument name="random-quick" description="Random Values at a quick rate.">
                   <sample type="maximum" interval="1000" size="600" description="Maximum each second."/>
                   <sample type="minimum" interval="1000" size="600" description="Minimum each second."/>
  -                <sample type="average" interval="1000" size="600" description="Average each second."/>
  +                <sample type="mean" interval="1000" size="600" description="Average each second."/>
               </instrument>
               
               <instrument name="random-slow" description="Random Values at a slow rate.">
                   <sample type="maximum" interval="1000" size="600" description="Maximum each second."/>
                   <sample type="minimum" interval="1000" size="600" description="Minimum each second."/>
  -                <sample type="average" interval="1000" size="600" description="Average each second."/>
  +                <sample type="mean" interval="1000" size="600" description="Average each second."/>
               </instrument>
               
               <instrument name="random-random" description="Random Values at a random rate.">
                   <sample type="maximum" interval="1000" size="600" description="Maximum each second."/>
                   <sample type="minimum" interval="1000" size="600" description="Minimum each second."/>
  -                <sample type="average" interval="1000" size="600" description="Average each second."/>
  +                <sample type="mean" interval="1000" size="600" description="Average each second."/>
               </instrument>
               
               <instrument name="counter-quick" description="Count of actions at a quick rate.">
  
  
  

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