svn commit: r774826 - /tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java

[edwardsmj]

Author: edwardsmj
Date: Thu May 14 15:35:23 2009
New Revision: 774826

URL: http://svn.apache.org/viewvc?rev=774826&view=rev
Log:
Fix for TUSCANY-3023, which has Tuscany raise an error if a <property/> element 
has both @type and @element attributes

Modified:
    
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java

Modified: 
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java?rev=774826&r1=774825&r2=774826&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
 (original)
+++ 
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
 Thu May 14 15:35:23 2009
@@ -326,6 +326,12 @@
         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
 
     }