update messages with conformance statements (note the java files that have messages that have not been extracted to a properties file, these need to be factored out)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@918526 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 5 insertions, 5 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);
                     }
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties b/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
index e3e31f7559..baaa60f992 100644
--- a/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
+++ b/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
@@ -23,7 +23,7 @@ DuplicateComponentReferenceName = Duplicate component reference name: Component
 DuplicateComponentPropertyName = Duplicate component property name: Component = {0} Property = {1}
 NoComponentImplementation = No implementation for component: Component = {0}
 ServiceNotFoundForComponentService = Component type service not found for component service (missing @Remotable annotation?): Component = {0} Service = {1}
-UnresolvedComponentImplementation = Component implementation not resolved: Component = {0} Uri = {1}
+UnresolvedComponentImplementation = [ASM60030] Component implementation not resolved: Component = {0} Uri = {1}
 DuplicateImplementationPropertyName = [ASM40005,ASM60014] Duplicate implementation property name: Component = {0} Property = {1}
 DuplicateImplementationServiceName = [ASM40003,ASM60003] Duplicate implementation service name: Component = {0} Service = {1}
 DuplicateImplementationReferenceName = [ASM40004,ASM50007,ASM60006] Duplicate implementation reference name: Component = {0} Reference = {1}
@@ -67,7 +67,7 @@ PropertyFileValueInvalid = The property file {0} for property {1} in component {
 PolicyRelatedException = Policy Related Exception occured due to : {0}
 IntentNotFound = Intent {0} is not defined in SCA definitions
 PolicySetNotFound = PolicySet {0} is not defined in SCA definitions
-MutuallyExclusiveIntents = [POL40009] Intent {0} and {1} are mutually exclusive 
+MutuallyExclusiveIntents = [POL40009,ASM60009,ASM60010] Intent {0} and {1} are mutually exclusive 
 PropertyXpathExpressionReturnedNull = The property XPath expression for component {0} property {1} expression {2} did not match anything in the source property
 PropertyHasManyValues = [ASM50032] The property component {0} property {1} has many values but its "many" attribute is set to false
 PropertXSDTypesDontMatch = [ASM_5036] The property component {0} property {1} has XSD type {2} while its component type property has the XSD type {3}