You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/10/09 15:39:33 UTC
svn commit: r823549 - in /tuscany/java/sca/modules:
assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
Author: slaws
Date: Fri Oct 9 13:39:33 2009
New Revision: 823549
URL: http://svn.apache.org/viewvc?rev=823549&view=rev
Log:
Add warning when XPath expression for property doesn't return anything
Modified:
tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
Modified: tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties?rev=823549&r1=823548&r2=823549&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties (original)
+++ tuscany/java/sca/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties Fri Oct 9 13:39:33 2009
@@ -69,4 +69,5 @@
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 = Intent {0} and {1} are mutually exclusive [POL40009]
\ No newline at end of file
+MutuallyExclusiveIntents = [POL40009] 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
\ No newline at end of file
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=823549&r1=823548&r2=823549&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 Fri Oct 9 13:39:33 2009
@@ -65,6 +65,7 @@
import org.apache.tuscany.sca.policy.ExtensionType;
import org.apache.tuscany.sca.policy.PolicySubject;
import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
@@ -644,6 +645,13 @@
if (node != null) {
componentProperty.setValue(node);
+ } else {
+ Monitor.warning(monitor,
+ this,
+ Messages.ASSEMBLY_VALIDATION,
+ "PropertyXpathExpressionReturnedNull",
+ component.getName(),
+ componentProperty.getName());
}
} catch (Exception ex) {
Monitor.error(monitor,