svn commit: r821679 - /tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java

[rfeng]

Author: rfeng
Date: Mon Oct  5 04:44:22 2009
New Revision: 821679

URL: http://svn.apache.org/viewvc?rev=821679&view=rev
Log:
Make the property mustSupply check is done after the @source/file is handled

Modified:
    
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java

Modified: 
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java?rev=821679&r1=821678&r2=821679&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
 (original)
+++ 
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
 Mon Oct  5 04:44:22 2009
@@ -294,6 +294,12 @@
 
             // 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 @@
                 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 @@
                               file,
                               componentProperty.getName(),
                               component.getName(),
-                              ex.toString());
+                              ex);
             }
         }