diff options
Diffstat (limited to '')
2 files changed, 3 insertions, 3 deletions
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 3247d04dda..8f8158776f 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 @@ -305,7 +305,7 @@ 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] Error: property has both @type and @element attribute values - " + + ContributionReadException ce = new ContributionReadException("[ASM40010,ASM60040] Error: property has both @type and @element attribute values - " + property.getName()); error(context.getMonitor(), "ContributionReadException", property, ce); } // end if 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 fba0997d2f..3558b191cb 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 @@ -987,13 +987,13 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt composite.getIncludes().set(i, resolved); } else { ContributionResolveException ce = - new ContributionResolveException("Error: Composite " + composite.getName() + new ContributionResolveException("[ASM60041] Error: Composite " + composite.getName() + " can only include another composite with the identical @local attribute value"); error(monitor, "ContributionResolveException", include, ce); } } else { ContributionResolveException ce = - new ContributionResolveException("Error: Composite " + include.getName() + new ContributionResolveException("[ASM60042] Error: Composite " + include.getName() + " is not a valid composite within the domain"); error(monitor, "ContributionResolveException", include, ce); } |