summaryrefslogtreecommitdiffstats
path: root/java/sca/modules
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-10-05 04:44:22 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-10-05 04:44:22 +0000
commit05a8574698d6ac697f85f47dbc9bfef046303de6 (patch)
treee7722688e5e9109e4b93e98cd103c5db75a2bdf6 /java/sca/modules
parentc2de7a4979a0aa8e9ef8a2b30b1d5bb85ed33d4e (diff)
Make the property mustSupply check is done after the @source/file is handled
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@821679 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules')
-rw-r--r--java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
index 4a97320030..3b3560e46f 100644
--- a/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
+++ b/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
@@ -294,6 +294,12 @@ public class ComponentBuilderImpl {
// configure the property value based on the @file attribute
processPropertyFileAttribute(component, componentProperty);
+
+ // Check that a value is supplied
+ if (componentProperty.isMustSupply() && !isPropertyValueSet(componentProperty)) {
+ Monitor.error(monitor, this, "assembly-validation-messages", "PropertyMustSupplyNull", component
+ .getName(), componentProperty.getName());
+ }
}
}
@@ -481,11 +487,7 @@ public class ComponentBuilderImpl {
componentTypeProperty.setValue(componentProperty.getValue());
}
- // Check that a value is supplied
- if (!isPropertyValueSet(componentProperty) && componentTypeProperty.isMustSupply()) {
- Monitor.error(monitor, this, "assembly-validation-messages", "PropertyMustSupplyNull", component
- .getName(), componentProperty.getName());
- }
+
// Check that a component property does not override the
// many attribute
@@ -635,7 +637,7 @@ public class ComponentBuilderImpl {
file,
componentProperty.getName(),
component.getName(),
- ex.toString());
+ ex);
}
}