Fix for TUSCANY-3023, which has Tuscany raise an error if a <property/> element has both @type and @element attributes

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

1 files changed, 6 insertions, 0 deletions

diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index 5701ae9593..b4fe17770c 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
@@ -326,6 +326,12 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor {
         property.setMustSupply(getBoolean(reader, MUST_SUPPLY));
         property.setXSDElement(getQName(reader, ELEMENT));
         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("Error: property has both @type and @element attribute values - " + 
+        			                                                     property.getName());
+        	error("ContributionReadException", property, ce);
+        } // end if
 
     }