Return-Path: 
 <ant-dev-return-22302-qmlist-jakarta-archive-ant-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-ant-dev-archive@apache.org
Received: (qmail 13770 invoked from network); 5 Jan 2002 03:17:59 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 5 Jan 2002 03:17:59 -0000
Received: (qmail 14870 invoked by uid 97); 5 Jan 2002 03:18:05 -0000
Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org
Received: (qmail 14828 invoked by uid 97); 5 Jan 2002 03:18:04 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:ant-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:ant-dev-help@jakarta.apache.org>
List-Post: <mailto:ant-dev@jakarta.apache.org>
List-Id: "Ant Developers List" <ant-dev.jakarta.apache.org>
Reply-To: "Ant Developers List" <ant-dev@jakarta.apache.org>
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 14797 invoked by uid 97); 5 Jan 2002 03:18:04 -0000
Date: 5 Jan 2002 03:17:52 -0000
Message-ID: <20020105031752.64757.qmail@icarus.apache.org>
From: donaldp@apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit:
 jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/selftest
 ConfigurationTest.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

donaldp     02/01/04 19:17:52

  Modified:    proposal/myrmidon/src/java/org/apache/antlib/selftest
                        ConfigurationTest.java
  Log:
  Refactor now that resolveValue is part of TaskContext
  
  Revision  Changes    Path
  1.4       +11 -3     jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/selftest/ConfigurationTest.java
  
  Index: ConfigurationTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/selftest/ConfigurationTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConfigurationTest.java	23 Dec 2001 06:24:52 -0000	1.3
  +++ ConfigurationTest.java	5 Jan 2002 03:17:52 -0000	1.4
  @@ -10,8 +10,8 @@
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.myrmidon.framework.AbstractContainerTask;
   
   /**
    * This is to test self interpretation of configuration.
  @@ -19,7 +19,7 @@
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    */
   public class ConfigurationTest
  -    extends AbstractContainerTask
  +    extends AbstractTask
       implements Configurable
   {
       private String m_message;
  @@ -28,7 +28,15 @@
           throws ConfigurationException
       {
           final String message = configuration.getAttribute( "message" );
  -        final Object object = resolve( message );
  +        final Object object;
  +        try
  +        {
  +            object = resolveValue( message );
  +        }
  +        catch( final TaskException te )
  +        {
  +            throw new ConfigurationException( te.getMessage(), te );
  +        }
   
           if( object instanceof String )
           {
  
  
  

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