donaldp 02/02/21 01:34:23
Modified:
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
DefaultConfigurer.java
Log:
Remove CascadingException references
Revision Changes Path
1.27 +19 -13
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
Index: DefaultConfigurer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DefaultConfigurer.java 14 Feb 2002 10:53:53 -0000 1.26
+++ DefaultConfigurer.java 21 Feb 2002 09:34:23 -0000 1.27
@@ -11,7 +11,6 @@
import java.util.Map;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.property.PropertyUtil;
import org.apache.avalon.framework.CascadingException;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -35,7 +34,7 @@
* Class used to configure tasks.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.26 $ $Date: 2002/02/14 10:53:53 $
+ * @version $Revision: 1.27 $ $Date: 2002/02/21 09:34:23 $
*/
public class DefaultConfigurer
extends AbstractLogEnabled
@@ -130,7 +129,7 @@
{
throw ce;
}
- catch( final CascadingException ce )
+ catch( final Exception ce )
{
final String message =
REZ.getString( "bad-set-attribute.error", elemName,
name );
@@ -158,7 +157,7 @@
{
throw ce;
}
- catch( final CascadingException ce )
+ catch( final Exception ce )
{
final String message =
REZ.getString( "bad-set-content.error", elemName );
@@ -186,7 +185,7 @@
{
throw ce;
}
- catch( final CascadingException ce )
+ catch( final Exception ce )
{
final String message =
REZ.getString( "bad-set-element.error", elemName,
name );
@@ -227,7 +226,7 @@
{
setAttribute( state, name, value, context );
}
- catch( final CascadingException ce )
+ catch( final Exception ce )
{
final String message =
REZ.getString( "bad-set-class-attribute.error",
@@ -246,7 +245,7 @@
private void configureElement( final ConfigurationState state,
final Configuration element,
final Context context )
- throws CascadingException
+ throws Exception
{
final String elementName = element.getName();
if( elementName.toLowerCase().endsWith( "-ref" ) )
@@ -267,7 +266,7 @@
private void configureInline( final ConfigurationState state,
final Configuration element,
final Context context )
- throws CascadingException
+ throws Exception
{
final String name = element.getName();
@@ -289,7 +288,7 @@
private void configureReference( final ConfigurationState state,
final Configuration element,
final Context context )
- throws CascadingException
+ throws Exception
{
// Extract the id
@@ -313,7 +312,7 @@
final String refName,
final String unresolvedId,
final Context context )
- throws CascadingException
+ throws Exception
{
// Adjust the name
final String name = refName.substring( 0, refName.length() - 4 );
@@ -323,7 +322,7 @@
= getConfigurerFromName( state.getConfigurer(), name, false );
// Resolve any props in the id
- Object id = PropertyUtil.resolveProperty( unresolvedId, context,
false );
+ Object id = resolveProperty( unresolvedId, context );
// Locate the referenced object
Object ref = null;
@@ -349,6 +348,13 @@
childConfigurer.addValue( state, ref );
}
+ private Object resolveProperty( final String unresolvedId,
+ final Context context )
+ throws Exception
+ {
+ return PropertyUtil.resolveProperty( unresolvedId, context, false );
+ }
+
/**
* Sets an attribute value.
*/
@@ -356,7 +362,7 @@
final String name,
final String value,
final Context context )
- throws CascadingException
+ throws Exception
{
if( name.toLowerCase().endsWith( "-ref" ) )
{
@@ -379,7 +385,7 @@
final ConfigurationState state,
final String value,
final Context context )
- throws CascadingException
+ throws Exception
{
// Resolve property references in the attribute value
Object objValue = PropertyUtil.resolveProperty( value, context,
false );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
