Return-Path: 
 <cvs-return-17710-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 20101 invoked by uid 500); 1 Aug 2003 05:14:37 -0000
Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:cvs-unsubscribe@avalon.apache.org>
List-Subscribe: <mailto:cvs-subscribe@avalon.apache.org>
List-Help: <mailto:cvs-help@avalon.apache.org>
List-Post: <mailto:cvs@avalon.apache.org>
List-Id: "Avalon CVS List" <cvs.avalon.apache.org>
Reply-To: "Avalon Developers List" <dev@avalon.apache.org>
Delivered-To: mailing list cvs@avalon.apache.org
Received: (qmail 20083 invoked by uid 500); 1 Aug 2003 05:14:36 -0000
Received: (qmail 20080 invoked from network); 1 Aug 2003 05:14:36 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 1 Aug 2003 05:14:36 -0000
Received: (qmail 53272 invoked by uid 1433); 1 Aug 2003 05:14:57 -0000
Date: 1 Aug 2003 05:14:57 -0000
Message-ID: <20030801051457.53271.qmail@minotaur.apache.org>
From: leif@apache.org
To: avalon-excalibur-cvs@apache.org
Subject: cvs commit: avalon-excalibur/datasource build.xml default.properties
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

leif        2003/07/31 22:14:57

  Modified:    datasource build.xml default.properties
  Log:
  Fix things after the last commit so that the components are once again usable
  by Fortress.
  
  Revision  Changes    Path
  1.58      +2 -6      avalon-excalibur/datasource/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/datasource/build.xml,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- build.xml	25 Jun 2003 13:55:26 -0000	1.57
  +++ build.xml	1 Aug 2003 05:14:57 -0000	1.58
  @@ -22,8 +22,8 @@
           <pathelement location="${logkit.jar}"/>
           <pathelement location="${excalibur-instrument.jar}"/>
           <pathelement location="${excalibur-pool.jar}"/>
  -        <!--<pathelement location="${excalibur-fortress-tools.jar}"/>-->
  -        <!--<pathelement location="${qdox.jar}"/>-->
  +        <pathelement location="${excalibur-fortress-tools.jar}"/>
  +        <pathelement location="${qdox.jar}"/>
           <pathelement location="${comons-collections.jar}"/>
           <pathelement location="${util.concurrent.jar}"/>
           <pathelement path="${java.class.path}"/>
  @@ -147,13 +147,10 @@
           </javac>
   
           <!-- generate fortress meta descriptors -->
  -        <!--
           <taskdef name="fortress-collect-meta"
                    classname="org.apache.avalon.fortress.tools.ComponentMetaInfoCollector">
               <classpath refid="project.class.path"/>
           </taskdef>
  -        -->
  -        <!--
           <fortress-collect-meta destdir="${build.classes}">
               <fileset dir="${java.dir}">
                   <exclude name="**/cluster/*.java"/>
  @@ -170,7 +167,6 @@
                   <include name="**/ids/*.java"/>
               </fileset>
           </fortress-collect-meta>
  -        -->
   
           <!-- copy resources to same location as .class files -->
           <copy todir="${build.classes}">
  
  
  
  1.33      +1 -3      avalon-excalibur/datasource/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/datasource/default.properties,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- default.properties	2 Jun 2003 14:12:01 -0000	1.32
  +++ default.properties	1 Aug 2003 05:14:57 -0000	1.33
  @@ -37,9 +37,7 @@
   excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-1.0.jar
   
   # ----- Avalon Fortress, version 1.0 or later  -----
  -excalibur-fortress.home=${basedir}/../fortress
  -excalibur-fortress.lib=${excalibur-fortress.home}/dist
  -excalibur-fortress-tools.jar=${excalibur-fortress.lib}/excalibur-fortress-tools-1.0.jar
  +excalibur-fortress-tools.jar=${basedir}/../lib/excalibur-fortress-tools-1.0.jar
   
   # ----- QDox Jar ----
   qdox.jar=${basedir}/../lib/qdox-1.1.jar
  
  
  

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