From 17e573358db8a4a83247037b957db32127bdd00a Mon Sep 17 00:00:00 2001 From: slaws Date: Wed, 29 Feb 2012 15:06:57 +0000 Subject: TUSCANY-4020 - move hardcoded message strings into properties files git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1295144 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/assembly/xml/BaseAssemblyProcessor.java | 11 ++++++++--- .../assembly/xml/CompositeDocumentProcessor.java | 22 ++++++++++++++++++---- .../sca/assembly/xml/CompositeProcessor.java | 16 ++++++++++------ 3 files changed, 36 insertions(+), 13 deletions(-) (limited to 'sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly') diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java index 966c0ac275..d9fe434795 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java @@ -304,8 +304,13 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor { property.setXSDType(getQName(reader, TYPE)); // MJE added 14/05/2009 - check for both @element and @type being present - disallowed by OASIS Assembly spec if( property.getXSDElement() != null && property.getXSDType() != null ) { - ContributionReadException ce = new ContributionReadException("[ASM40010,ASM60040] Error: property has both @type and @element attribute values - " + - property.getName()); + // TUSCANY-4020 - should get rid of the exception but that would mean getting OASIS to change the + // expected strings again + ContributionReadException ce = new ContributionReadException(context.getMonitor().getMessageString(BaseAssemblyProcessor.class.getName(), + Messages.RESOURCE_BUNDLE, + "BothTypeAndElementAttributeFound") + + " - " + + property.getName()); error(context.getMonitor(), "ContributionReadException", property, ce); } // end if @@ -512,7 +517,7 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor { // A property subelement MUST NOT be used when the @value attribute is used // to specify the value for that property. if (valueAttr != null) { - error(context.getMonitor(), "ASM50033: value attribute exists for the property element", name, name); + error(context.getMonitor(), "ValueAttributeForPropertyElement", element, nameAttr); } // Read if (VALUE_QNAME.equals(name)) { diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java index 5ba42a0dec..47f61ffe23 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java @@ -73,14 +73,20 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements */ public Composite read(URL contributionURL, URI uri, URL url, ProcessorContext context) throws ContributionReadException { if( uri == null || url == null ) { - throw new ContributionReadException("Request to read composite with uri or url NULL"); + throw new ContributionReadException(context.getMonitor().getMessageString(CompositeDocumentProcessor.class.getName(), + Messages.RESOURCE_BUNDLE, + "NullURL")); } // end if InputStream scdlStream = null; try { scdlStream = IOHelper.openStream(url); } catch (IOException e) { - ContributionReadException ce = new ContributionReadException("Exception reading " + uri, e); + ContributionReadException ce = new ContributionReadException(context.getMonitor().getMessageString(CompositeDocumentProcessor.class.getName(), + Messages.RESOURCE_BUNDLE, + "ReadException") + + " " + + uri, e); error(context.getMonitor(), "ContributionReadException", url, ce); throw ce; } @@ -119,7 +125,11 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements return composite; } catch (XMLStreamException e) { - ContributionReadException ce = new ContributionReadException("Exception reading " + uri, e); + ContributionReadException ce = new ContributionReadException(context.getMonitor().getMessageString(CompositeDocumentProcessor.class.getName(), + Messages.RESOURCE_BUNDLE, + "ReadException") + + " " + + uri, e); error(context.getMonitor(), "ContributionReadException", inputFactory, ce); throw ce; } finally { @@ -169,7 +179,11 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements extensionProcessor.resolve(composite, resolver, context); } catch (Throwable e ) { // Add information about which composite was being processed when the exception occurred - String newMessage = "Processing composite " + composite.getName() + ": " + e.getMessage(); + String newMessage = context.getMonitor().getMessageString(CompositeDocumentProcessor.class.getName(), + Messages.RESOURCE_BUNDLE, + "ProcessingComposite") + + " " + + composite.getName() + ": " + e.getMessage(); throw new ContributionResolveException( newMessage, e ); } // end try } diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java index 55e4cc53ae..e32171a0ee 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java @@ -1040,15 +1040,19 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt if ((composite.isLocal() && resolved.isLocal()) || (!composite.isLocal() && !resolved.isLocal())) { composite.getIncludes().set(i, resolved); } else { - ContributionResolveException ce = - new ContributionResolveException("[ASM60041] Error: Composite " + composite.getName() - + " can only include another composite with the identical @local attribute value"); + String message = context.getMonitor().getMessageString(CompositeProcessor.class.getName(), + Messages.RESOURCE_BUNDLE, + "LocalAttibuteMissmatch"); + message = message.replace("{0}", composite.getName().toString()); + ContributionResolveException ce = new ContributionResolveException(message); error(monitor, "ContributionResolveException", include, ce); } } else { - ContributionResolveException ce = - new ContributionResolveException("[ASM60042] Error: Composite " + include.getName() - + " is not a valid composite within the domain"); + String message = context.getMonitor().getMessageString(CompositeProcessor.class.getName(), + Messages.RESOURCE_BUNDLE, + "CompositeNotFound"); + message = message.replace("{0}", include.getName().toString()); + ContributionResolveException ce = new ContributionResolveException(message); error(monitor, "ContributionResolveException", include, ce); } } -- cgit v1.2.3