Author: kelvingoodson
Date: Wed Mar 3 15:46:18 2010
New Revision: 918526
URL: http://svn.apache.org/viewvc?rev=918526&view=rev
Log:
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)
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java?rev=918526&r1=918525&r2=918526&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
Wed Mar 3 15:46:18 2010
@@ -305,7 +305,7 @@
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
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java?rev=918526&r1=918525&r2=918526&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
Wed Mar 3 15:46:18 2010
@@ -987,13 +987,13 @@
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);
}
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties?rev=918526&r1=918525&r2=918526&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
(original)
+++
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
Wed Mar 3 15:46:18 2010
@@ -23,7 +23,7 @@
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 @@
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}
