From 697cacf736c15c1cc0af4d9acb2309f56069037e Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 8 Jul 2001 07:16:38 +0000 Subject: [PATCH] Update task to reflect new location of property resolving git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269295 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/myrmidon/framework/AbstractContainerTask.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java index 537805d8c..1120e4843 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java @@ -19,6 +19,8 @@ import org.apache.myrmidon.converter.ConverterException; 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 @@ public abstract class AbstractContainerTask { try { - final Object object = getContext().resolveValue( value ); + final Object object = + PropertyUtil.resolveProperty( value, getContext(), false ); if( null == object ) { @@ -68,9 +71,9 @@ public abstract class AbstractContainerTask 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 ); } }