cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework AbstractContainerTask.java

[donaldp]

donaldp     01/07/08 00:16:39

  Modified:    proposal/myrmidon/src/java/org/apache/myrmidon/framework
                        AbstractContainerTask.java
  Log:
  Update task to reflect new location of property resolving
  
  Revision  Changes    Path
  1.3       +6 -3      
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java
  
  Index: AbstractContainerTask.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractContainerTask.java        2001/06/04 12:46:35     1.2
  +++ AbstractContainerTask.java        2001/07/08 07:16:38     1.3
  @@ -19,6 +19,8 @@
   import org.apache.myrmidon.components.configurer.Configurer;
   import org.apache.myrmidon.components.converter.MasterConverter;
   import org.apache.myrmidon.components.executor.Executor;
  +import org.apache.avalon.excalibur.property.PropertyException;
  +import org.apache.avalon.excalibur.property.PropertyUtil;
   
   /**
    * This is the class that Task writers should extend to provide custom tasks.
  @@ -58,7 +60,8 @@
       {
           try
           {
  -            final Object object = getContext().resolveValue( value );
  +            final Object object = 
  +                PropertyUtil.resolveProperty( value, getContext(), false );
   
               if( null == object )
               {
  @@ -68,9 +71,9 @@
   
               return object;
           }
  -        catch( final TaskException te )
  +        catch( final PropertyException pe )
           {
  -            throw new ConfigurationException( "Error resolving value: " + 
value, te );
  +            throw new ConfigurationException( "Error resolving value: " + 
value, pe );
           }
       }