From e982760c849aca983252efb5f9cf66534a7d3253 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 30 Aug 2001 07:36:25 +0000 Subject: [PATCH] i18n'ed the tasks. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269654 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/myrmidon/libs/core/Echo.java | 2 +- .../apache/myrmidon/libs/core/Property.java | 20 +++++++--- .../myrmidon/libs/core/Resources.properties | 15 +++++++ .../libs/core/StringToByteConverter.java | 13 ++++-- .../libs/core/StringToClassConverter.java | 12 ++++-- .../libs/core/StringToDoubleConverter.java | 12 ++++-- .../libs/core/StringToFileConverter.java | 12 ++++-- .../libs/core/StringToFloatConverter.java | 12 ++++-- .../libs/core/StringToIntegerConverter.java | 12 ++++-- .../libs/core/StringToLongConverter.java | 12 ++++-- .../libs/core/StringToShortConverter.java | 13 ++++-- .../libs/core/StringToURLConverter.java | 12 ++++-- .../myrmidon/libs/runtime/ConverterDef.java | 20 +++++++--- .../myrmidon/libs/runtime/Facility.java | 40 +++++++++++-------- .../apache/myrmidon/libs/runtime/Import.java | 11 ++++- .../libs/runtime/Resources.properties | 13 ++++++ 16 files changed, 173 insertions(+), 58 deletions(-) create mode 100644 proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Resources.properties create mode 100644 proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Resources.properties diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Echo.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Echo.java index 66f138ff4..002f43050 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Echo.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Echo.java @@ -15,7 +15,7 @@ import org.apache.myrmidon.api.TaskException; * * @author Peter Donald */ -public class Echo +public class Echo extends AbstractTask { private String m_message; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java index 94364c4b2..6d080c127 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java @@ -7,6 +7,8 @@ */ package org.apache.myrmidon.libs.core; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; @@ -32,6 +34,9 @@ public class Property extends AbstractContainerTask implements Configurable { + private static final Resources REZ = + ResourceManager.getPackageResources( Property.class ); + private String m_name; private Object m_value; private boolean m_localScope = true; @@ -46,7 +51,8 @@ public class Property try { m_factory = typeManager.getFactory( DataType.ROLE ); } catch( final TypeException te ) { - throw new ComponentException( "Unable to retrieve factory from TypeManager", te ); + final String message = REZ.getString( "property.bad-factory.error" ); + throw new ComponentException( message, te ); } } @@ -72,7 +78,8 @@ public class Property } catch( final Exception e ) { - throw new ConfigurationException( "Unable to set datatype", e ); + final String message = REZ.getString( "property.no-set.error" ); + throw new ConfigurationException( message, e ); } } } @@ -87,7 +94,8 @@ public class Property { if( null != m_value ) { - throw new TaskException( "Value can not be set multiple times" ); + final String message = REZ.getString( "property.multi-set.error" ); + throw new TaskException( message ); } m_value = value; @@ -103,12 +111,14 @@ public class Property { if( null == m_name ) { - throw new TaskException( "Name must be specified" ); + final String message = REZ.getString( "property.no-name.error" ); + throw new TaskException( message ); } if( null == m_value ) { - throw new TaskException( "Value must be specified" ); + final String message = REZ.getString( "property.no-value.error" ); + throw new TaskException( message ); } if( m_localScope ) diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Resources.properties b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Resources.properties new file mode 100644 index 000000000..e61570814 --- /dev/null +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Resources.properties @@ -0,0 +1,15 @@ +property.bad-factory.error=Unable to retrieve DataType factory from TypeManager. +property.no-set.error=Unable to set datatype. +property.multi-set.error=Value can not be set multiple times. +property.no-name.error=Name must be specified. +property.no-value.error=Value must be specified. + +convert.bad-byte.error=Error converting object ({0}) to Byte. +convert.bad-class.error=Error converting object ({0}) to Class. +convert.bad-double.error=Error converting object ({0}) to Double. +convert.bad-file.error=Error converting object ({0}) to File. +convert.bad-float.error=Error converting object ({0}) to Float. +convert.bad-integer.error=Error converting object ({0}) to Integer. +convert.bad-long.error=Error converting object ({0}) to Long. +convert.bad-short.error=Error converting object ({0}) to Short. +convert.bad-url.error=Error converting object ({0}) to URL. \ No newline at end of file diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToByteConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToByteConverter.java index 23724ca39..c0bb6bf40 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToByteConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToByteConverter.java @@ -7,6 +7,8 @@ */ package org.apache.myrmidon.libs.core; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; import org.apache.myrmidon.converter.ConverterException; @@ -19,20 +21,23 @@ import org.apache.myrmidon.converter.ConverterException; public class StringToByteConverter extends AbstractConverter { + private static final Resources REZ = + ResourceManager.getPackageResources( StringToByteConverter.class ); + public StringToByteConverter() { super( String.class, Byte.class ); } - public Object convert( final Object original, final Context context ) + public Object convert( final Object object, final Context context ) throws ConverterException { - try { return new Byte( (String)original ); } + try { return new Byte( (String)object ); } catch( final NumberFormatException nfe ) { - throw new ConverterException( "Error formatting object", nfe ); + final String message = REZ.getString( "convert.bad-byte.error", object ); + throw new ConverterException( message, nfe ); } - } } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToClassConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToClassConverter.java index 9db44f1ee..1be73b394 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToClassConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToClassConverter.java @@ -7,6 +7,8 @@ */ package org.apache.myrmidon.libs.core; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; import org.apache.myrmidon.converter.ConverterException; @@ -19,19 +21,23 @@ import org.apache.myrmidon.converter.ConverterException; public class StringToClassConverter extends AbstractConverter { + private static final Resources REZ = + ResourceManager.getPackageResources( StringToClassConverter.class ); + public StringToClassConverter() { super( String.class, Class.class ); } - public Object convert( final Object original, final Context context ) + public Object convert( final Object object, final Context context ) throws ConverterException { //TODO: Should we use ContextClassLoader here??? - try { return Class.forName( (String)original ); } + try { return Class.forName( (String)object ); } catch( final Exception e ) { - throw new ConverterException( "Error converting to class type", e ); + final String message = REZ.getString( "convert.bad-class.error", object ); + throw new ConverterException( message, e ); } } } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToDoubleConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToDoubleConverter.java index ce392e185..22dd0806e 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToDoubleConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToDoubleConverter.java @@ -7,6 +7,8 @@ */ package org.apache.myrmidon.libs.core; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; import org.apache.myrmidon.converter.ConverterException; @@ -19,18 +21,22 @@ import org.apache.myrmidon.converter.ConverterException; public class StringToDoubleConverter extends AbstractConverter { + private static final Resources REZ = + ResourceManager.getPackageResources( StringToDoubleConverter.class ); + public StringToDoubleConverter() { super( String.class, Double.class ); } - public Object convert( final Object original, final Context context ) + public Object convert( final Object object, final Context context ) throws ConverterException { - try { return new Double( (String)original ); } + try { return new Double( (String)object ); } catch( final NumberFormatException nfe ) { - throw new ConverterException( "Error formatting object", nfe ); + final String message = REZ.getString( "convert.bad-double.error", object ); + throw new ConverterException( message, nfe ); } } } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFileConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFileConverter.java index ddcb3d766..6b31b3bb9 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFileConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFileConverter.java @@ -8,6 +8,8 @@ package org.apache.myrmidon.libs.core; import java.io.File; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; @@ -22,22 +24,26 @@ import org.apache.myrmidon.converter.ConverterException; public class StringToFileConverter extends AbstractConverter { + private static final Resources REZ = + ResourceManager.getPackageResources( StringToFileConverter.class ); + public StringToFileConverter() { super( String.class, File.class ); } - public Object convert( final Object original, final Context context ) + public Object convert( final Object object, final Context context ) throws ConverterException { try { final TaskContext taskContext = (TaskContext)context; - return taskContext.resolveFile( (String)original ); + return taskContext.resolveFile( (String)object ); } catch( final TaskException te ) { - throw new ConverterException( "Error resolving file during conversion", te ); + final String message = REZ.getString( "convert.bad-file.error", object ); + throw new ConverterException( message, te ); } } } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFloatConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFloatConverter.java index 90f68e82f..20b065f50 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFloatConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFloatConverter.java @@ -7,6 +7,8 @@ */ package org.apache.myrmidon.libs.core; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; import org.apache.myrmidon.converter.ConverterException; @@ -19,18 +21,22 @@ import org.apache.myrmidon.converter.ConverterException; public class StringToFloatConverter extends AbstractConverter { + private static final Resources REZ = + ResourceManager.getPackageResources( StringToFloatConverter.class ); + public StringToFloatConverter() { super( String.class, Float.class ); } - public Object convert( final Object original, final Context context ) + public Object convert( final Object object, final Context context ) throws ConverterException { - try { return new Float( (String)original ); } + try { return new Float( (String)object ); } catch( final NumberFormatException nfe ) { - throw new ConverterException( "Error formatting object", nfe ); + final String message = REZ.getString( "convert.bad-float.error", object ); + throw new ConverterException( message, nfe ); } } } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToIntegerConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToIntegerConverter.java index a84027083..24adc543f 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToIntegerConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToIntegerConverter.java @@ -7,6 +7,8 @@ */ package org.apache.myrmidon.libs.core; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; import org.apache.myrmidon.converter.ConverterException; @@ -19,18 +21,22 @@ import org.apache.myrmidon.converter.ConverterException; public class StringToIntegerConverter extends AbstractConverter { + private static final Resources REZ = + ResourceManager.getPackageResources( StringToFloatConverter.class ); + public StringToIntegerConverter() { super( String.class, Integer.class ); } - public Object convert( final Object original, final Context context ) + public Object convert( final Object object, final Context context ) throws ConverterException { - try { return new Integer( (String)original ); } + try { return new Integer( (String)object ); } catch( final NumberFormatException nfe ) { - throw new ConverterException( "Error formatting object", nfe ); + final String message = REZ.getString( "convert.bad-integer.error", object ); + throw new ConverterException( message, nfe ); } } } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToLongConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToLongConverter.java index 5d24994f5..6c2ed4d18 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToLongConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToLongConverter.java @@ -7,6 +7,8 @@ */ package org.apache.myrmidon.libs.core; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; import org.apache.myrmidon.converter.ConverterException; @@ -19,18 +21,22 @@ import org.apache.myrmidon.converter.ConverterException; public class StringToLongConverter extends AbstractConverter { + private static final Resources REZ = + ResourceManager.getPackageResources( StringToLongConverter.class ); + public StringToLongConverter() { super( String.class, Long.class ); } - public Object convert( final Object original, final Context context ) + public Object convert( final Object object, final Context context ) throws ConverterException { - try { return new Long( (String)original ); } + try { return new Long( (String)object ); } catch( final NumberFormatException nfe ) { - throw new ConverterException( "Error formatting object", nfe ); + final String message = REZ.getString( "convert.bad-long.error", object ); + throw new ConverterException( message, nfe ); } } } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToShortConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToShortConverter.java index 17b706120..ccef46d96 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToShortConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToShortConverter.java @@ -7,6 +7,8 @@ */ package org.apache.myrmidon.libs.core; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; import org.apache.myrmidon.converter.ConverterException; @@ -19,20 +21,23 @@ import org.apache.myrmidon.converter.ConverterException; public class StringToShortConverter extends AbstractConverter { + private static final Resources REZ = + ResourceManager.getPackageResources( StringToShortConverter.class ); + public StringToShortConverter() { super( String.class, Short.class ); } - public Object convert( final Object original, final Context context ) + public Object convert( final Object object, final Context context ) throws ConverterException { - try { return new Short( (String)original ); } + try { return new Short( (String)object ); } catch( final NumberFormatException nfe ) { - throw new ConverterException( "Error formatting object", nfe ); + final String message = REZ.getString( "convert.bad-short.error", object ); + throw new ConverterException( message, nfe ); } - } } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToURLConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToURLConverter.java index 9325cab23..5b9bc0f37 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToURLConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToURLConverter.java @@ -9,6 +9,8 @@ package org.apache.myrmidon.libs.core; import java.net.MalformedURLException; import java.net.URL; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; import org.apache.myrmidon.converter.ConverterException; @@ -21,18 +23,22 @@ import org.apache.myrmidon.converter.ConverterException; public class StringToURLConverter extends AbstractConverter { + private static final Resources REZ = + ResourceManager.getPackageResources( StringToURLConverter.class ); + public StringToURLConverter() { super( String.class, URL.class ); } - public Object convert( final Object original, final Context context ) + public Object convert( final Object object, final Context context ) throws ConverterException { - try { return new URL( (String)original ); } + try { return new URL( (String)object ); } catch( final MalformedURLException mue ) { - throw new ConverterException( "Error formatting object", mue ); + final String message = REZ.getString( "convert.bad-url.error", object ); + throw new ConverterException( message, mue ); } } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java index feb2ee90e..8f758ca60 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java @@ -10,6 +10,8 @@ package org.apache.myrmidon.libs.runtime; import java.io.File; import java.net.MalformedURLException; import java.net.URL; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; @@ -29,6 +31,9 @@ public class ConverterDef extends AbstractTask implements Composable { + private static final Resources REZ = + ResourceManager.getPackageResources( ConverterDef.class ); + private String m_sourceType; private String m_destinationType; private File m_lib; @@ -68,19 +73,23 @@ public class ConverterDef { if( null == m_classname ) { - throw new TaskException( "Must specify classname parameter" ); + final String message = REZ.getString( "converterdef.no-classname.error" ); + throw new TaskException( message ); } else if( null == m_sourceType ) { - throw new TaskException( "Must specify the source-type parameter" ); + final String message = REZ.getString( "converterdef.no-source.error" ); + throw new TaskException( message ); } else if( null == m_destinationType ) { - throw new TaskException( "Must specify the destination-type parameter" ); + final String message = REZ.getString( "converterdef.no-destination.error" ); + throw new TaskException( message ); } else if( null == m_lib ) { - throw new TaskException( "Must specify the lib parameter" ); + final String message = REZ.getString( "converterdef.no-lib.error" ); + throw new TaskException( message ); } try @@ -95,7 +104,8 @@ public class ConverterDef } catch( final Exception e ) { - throw new TaskException( "Failed to register converter " + m_classname, e ); + final String message = REZ.getString( "converterdef.no-register.error", m_classname ); + throw new TaskException( message, e ); } } } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Facility.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Facility.java index 85cee6de7..b1ff4c403 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Facility.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Facility.java @@ -10,19 +10,21 @@ package org.apache.myrmidon.libs.runtime; import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import org.apache.avalon.framework.configuration.Configurable; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; +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.aspects.AspectHandler; import org.apache.myrmidon.components.aspect.AspectManager; -import org.apache.myrmidon.components.type.TypeFactory; import org.apache.myrmidon.components.type.TypeException; +import org.apache.myrmidon.components.type.TypeFactory; import org.apache.myrmidon.components.type.TypeManager; -import org.apache.myrmidon.aspects.AspectHandler; import org.apache.myrmidon.framework.AbstractContainerTask; /** @@ -32,26 +34,30 @@ import org.apache.myrmidon.framework.AbstractContainerTask; */ public class Facility extends AbstractContainerTask - implements Composable, Configurable + implements Composable, Configurable { + private static final Resources REZ = + ResourceManager.getPackageResources( Facility.class ); + private String m_namespace; private AspectHandler m_aspectHandler; private AspectManager m_aspectManager; private TypeFactory m_factory; - + public void compose( final ComponentManager componentManager ) throws ComponentException { super.compose( componentManager ); m_aspectManager = (AspectManager)componentManager.lookup( AspectManager.ROLE ); - + final TypeManager typeManager = (TypeManager)componentManager.lookup( TypeManager.ROLE ); try { m_factory = typeManager.getFactory( AspectHandler.ROLE ); } catch( final TypeException te ) { - throw new ComponentException( "Unable to retrieve factory from TypeManager", te ); + final String message = REZ.getString( "facility.no-factory.error" ); + throw new ComponentException( message, te ); } } @@ -68,7 +74,7 @@ public class Facility final Configuration[] children = configuration.getChildren(); - if( 1 == children.length ) + if( 1 == children.length ) { try { @@ -76,16 +82,17 @@ public class Facility } catch( final Exception e ) { - throw new ConfigurationException( "Failed to create aspect handler of type '" + - children[ 0 ].getName() + "'", e ); + final String message = + REZ.getString( "facility.no-create.error", children[ 0 ].getName() ); + throw new ConfigurationException( message, e ); } - + configure( m_aspectHandler, children[ 0 ] ); } else { - throw new ConfigurationException( "Expected one sub-element to " + - "configure facility" ); + final String message = REZ.getString( "facility.multi-element.error" ); + throw new ConfigurationException( message ); } } @@ -99,7 +106,8 @@ public class Facility { if( null == m_namespace ) { - throw new TaskException( "Must specify namespace parameter" ); + final String message = REZ.getString( "facility.no-namespace.error" ); + throw new TaskException( message ); } m_aspectManager.addAspectHandler( m_namespace, m_aspectHandler ); diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Import.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Import.java index 0709c3498..4637873e4 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Import.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Import.java @@ -7,6 +7,8 @@ */ package org.apache.myrmidon.libs.runtime; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; import java.io.File; import java.net.MalformedURLException; import java.net.URL; @@ -27,6 +29,9 @@ public class Import extends AbstractTask implements Composable { + private static final Resources REZ = + ResourceManager.getPackageResources( Import.class ); + private File m_lib; private Deployer m_deployer; @@ -46,7 +51,8 @@ public class Import { if( null == m_lib ) { - throw new TaskException( "Must specify lib parameter" ); + final String message = REZ.getString( "import.no-lib.error" ); + throw new TaskException( message ); } try @@ -55,7 +61,8 @@ public class Import } catch( final DeploymentException de ) { - throw new TaskException( "Error importing tasklib", de ); + final String message = REZ.getString( "import.no-deploy.error" ); + throw new TaskException( message, de ); } } } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Resources.properties b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Resources.properties new file mode 100644 index 000000000..3c1172bb6 --- /dev/null +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Resources.properties @@ -0,0 +1,13 @@ +converterdef.no-classname.error=Must specify classname parameter. +converterdef.no-source.error=Must specify the source-type parameter. +converterdef.no-destination.error=Must specify the destination-type parameter. +converterdef.no-lib.error=Must specify the lib parameter. +converterdef.no-register.error=Failed to register converter {0}. + +facility.no-factory.error=Unable to retrieve AspectHandler factory from TypeManager. +facility.no-create.error=Failed to create aspect handler of type {0}. +facility.multi-element.error=Expected one sub-element to configure facility. +facility.no-namespace.error=Must specify namespace parameter. + +import.no-lib.error=Must specify lib parameter. +import.no-deploy.error=Error importing tasklib. \ No newline at end of file