Return-Path: 
 <cvs-return-13652-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 53967 invoked by uid 500); 7 Aug 2003 16:40:17 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 53902 invoked by uid 500); 7 Aug 2003 16:40:16 -0000
Delivered-To: apmail-cocoon-2.1-cvs@apache.org
Received: (qmail 53878 invoked from network); 7 Aug 2003 16:40:16 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 7 Aug 2003 16:40:16 -0000
Received: (qmail 55901 invoked by uid 1672); 7 Aug 2003 16:40:22 -0000
Date: 7 Aug 2003 16:40:22 -0000
Message-ID: <20030807164022.55900.qmail@minotaur.apache.org>
From: joerg@apache.org
To: cocoon-2.1-cvs@apache.org
Subject: cvs commit: cocoon-2.1 build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

joerg       2003/08/07 09:40:22

  Modified:    lib      jars.xml
               .        build.xml
  Added:       tools/instrumentation/lib altrmi-client-interfaces-0.9.2.jar
                        excalibur-instrument-client-0.3.jar
                        altrmi-client-impl-0.9.2.jar
               src/targets instrumentation-build.xml
  Removed:     tools/instrumentation/lib
                        excalibur-instrument-client-20030116.jar
                        excalibur-altrmi-client-interfaces-20030116.jar
                        excalibur-altrmi-common-20030116.jar
                        excalibur-altrmi-client-impl-20030116.jar
                        avalon-framework-4.1.3.jar
                        excalibur-instrument-manager-interfaces-20030116.jar
               tools/instrumentation/bin runclient.bat runclient.sh
  Log:
  Updated instrumentation libraries to work with the AltRMI server libraries (bug 19839).
  Added warning to jars.xml for synchronsition needs of these libraries.
  Added instrumentation-build.xml for starting the instrumentation client.
  
  Revision  Changes    Path
  1.1                  cocoon-2.1/tools/instrumentation/lib/altrmi-client-interfaces-0.9.2.jar
  
  	<<Binary file>>
  
  
  1.1                  cocoon-2.1/tools/instrumentation/lib/excalibur-instrument-client-0.3.jar
  
  	<<Binary file>>
  
  
  1.1                  cocoon-2.1/tools/instrumentation/lib/altrmi-client-impl-0.9.2.jar
  
  	<<Binary file>>
  
  
  1.75      +6 -1      cocoon-2.1/lib/jars.xml
  
  Index: jars.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/lib/jars.xml,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- jars.xml	4 Aug 2003 01:54:49 -0000	1.74
  +++ jars.xml	7 Aug 2003 16:40:22 -0000	1.75
  @@ -210,6 +210,11 @@
       <homepage>http://avalon.apache.org/framework/</homepage>
     </file>
   
  +  <!--+
  +      | If you update the AltRMI server libraries, make sure
  +      | you also update the AltRMI client libraries in
  +      | tools/instrumentation/lib !!
  +      +-->
     <file>
       <title>Avalon AltRMI Common</title>
       <description>
  
  
  
  1.1                  cocoon-2.1/src/targets/instrumentation-build.xml
  
  Index: instrumentation-build.xml
  ===================================================================
    <target name="start-instrumentation-client" depends="init">
      <property name="lib.instrumentation" value="tools/instrumentation/lib"/>
  
      <echo message="The version of the altrmi server libraries in ${lib.optional} must correspond"/>
      <echo message="to the version of the altrmi client libraries in ${lib.instrumentation}."/>
  
      <java classname="org.apache.excalibur.instrument.client.Main" fork="true">
        <classpath>
          <fileset dir="${lib.core}">
            <include name="avalon-framework-*.jar"/>
            <include name="excalibur-instrument-manager-interfaces-*.jar"/>
          </fileset>
          <fileset dir="${lib.optional}">
            <include name="altrmi-common-*.jar"/>
          </fileset>
          <fileset dir="${lib.instrumentation}">
            <include name="excalibur-instrument-client-*.jar"/>
            <include name="altrmi-*.jar"/>
          </fileset>
        </classpath>
      </java>
    </target>
  
  
  
  1.32      +4 -1      cocoon-2.1/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/build.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- build.xml	2 May 2003 06:53:07 -0000	1.31
  +++ build.xml	7 Aug 2003 16:40:22 -0000	1.32
  @@ -22,6 +22,7 @@
     <!ENTITY dist-targets     SYSTEM "./src/targets/dist-build.xml">
     <!ENTITY admin-targets    SYSTEM "./src/targets/admin-build.xml">
     <!ENTITY standalone-demo-targets  SYSTEM "./src/targets/standalone-demo-build.xml">
  +  <!ENTITY instrumentation-targets  SYSTEM "./src/targets/instrumentation-build.xml">
     <!-- =================================================================== -->
   
     <!-- ==================  Apache Forrest targets  ======================= -->
  @@ -56,6 +57,8 @@
     <!-- Administration targets  -->  &admin-targets;
     <!-- =================================================================== -->
     <!-- Standalone-demo targets -->  &standalone-demo-targets;
  +  <!-- =================================================================== -->
  +  <!-- Instrumentation targets -->  &instrumentation-targets;
     <!-- =================================================================== -->
   
     <!-- ==================  Apache Forrest targets  ======================= -->