Return-Path: 
 <cvs-return-24931-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@www.apache.org
Received: (qmail 21384 invoked from network); 31 Jul 2004 09:11:59 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 31 Jul 2004 09:11:59 -0000
Received: (qmail 20477 invoked by uid 500); 31 Jul 2004 09:11:58 -0000
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 20423 invoked by uid 500); 31 Jul 2004 09:11:58 -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 20406 invoked by uid 99); 31 Jul 2004 09:11:58 -0000
X-ASF-Spam-Status: No, hits=0.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.27.1) with SMTP; Sat, 31 Jul 2004 02:11:56 -0700
Received: (qmail 21315 invoked by uid 65534); 31 Jul 2004 09:11:56 -0000
Date: 31 Jul 2004 09:11:56 -0000
Message-ID: <20040731091156.21311.qmail@minotaur.apache.org>
From: niclas@apache.org
To: cvs@avalon.apache.org
Subject: svn commit: rev 31031 - avalon/trunk
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: niclas
Date: Sat Jul 31 02:11:55 2004
New Revision: 31031

Modified:
   avalon/trunk/README.txt
   avalon/trunk/build.xml
Log:
Some changes laying around that hasn't been committed.

Modified: avalon/trunk/README.txt
==============================================================================
--- avalon/trunk/README.txt	(original)
+++ avalon/trunk/README.txt	Sat Jul 31 02:11:55 2004
@@ -11,8 +11,8 @@
 
 =======================================================================
 summary:   Apache Avalon provides a complete platform for component
-	   programming including a core framework, utilities, tools,
-	   components, and a container written in the Java language.
+           programming including a core framework, utilities, tools,
+           components, and a container written in the Java language.
 publisher: Apache Software Foundation
 website:   http://avalon.apache.org/
 license:   Please see the LICENSE.txt file
@@ -40,7 +40,7 @@
 run:
 
    ant setup               <-- only needed once to bootstrap magic
-   ant clean		   <-- deletes any 'dirty' content
+   ant clean               <-- deletes any 'dirty' content
    ant                     <-- builds entire Avalon platform
 
 Magic uses an environmental variable "MAGIC_HOME" which defaults
@@ -93,8 +93,8 @@
 moved, deprecated, or archived.
 
     excalibur/ecm   -->  http://excalibur.apache.org
-    fortress	    -->  http://excalibur.apache.org
-    phoenix	    -->  http://loom.codehaus.org
+    fortress        -->  http://excalibur.apache.org
+    phoenix         -->  http://loom.codehaus.org
 
 A CVS snapshot can be found in SVN at:
 
@@ -102,4 +102,4 @@
 
 More information on Avalon legacy software can be found at:
 
-   http://avalon.apache.org/products/legacy/index.html
\ No newline at end of file
+   http://avalon.apache.org/products/legacy/index.html

Modified: avalon/trunk/build.xml
==============================================================================
--- avalon/trunk/build.xml	(original)
+++ avalon/trunk/build.xml	Sat Jul 31 02:11:55 2004
@@ -3,8 +3,11 @@
 <project name="avalon" default="install" basedir="." 
   xmlns:x="antlib:org.apache.avalon.tools">
 
-  <available property="magic.available" classname="org.apache.avalon.tools.model.Home"/>
-
+  <available property="magic.available" classname="org.apache.avalon.tools.model.Home" >
+    <classpath >
+      <pathelement location="${user.home}/.ant/lib/avalon-tools-magic.jar"/>
+    </classpath>
+  </available>
   <property environment="ENV"/>
   <property name="magic.dir" value="${basedir}/tools/magic"/>
   <property file="${basedir}/user.properties"/>

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