tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r800682 - in /tuscany/java/sca/modules: assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
Date Tue, 04 Aug 2009 05:54:29 GMT
Author: rfeng
Date: Tue Aug  4 05:54:29 2009
New Revision: 800682

URL: http://svn.apache.org/viewvc?rev=800682&view=rev
Log:
Start to work on ASM50033

Modified:
    tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.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=800682&r1=800681&r2=800682&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
Tue Aug  4 05:54:29 2009
@@ -581,6 +581,13 @@
                         break;
                     }
                     isTextForProperty = false;
+                    
+                    // CONFORMANCE: ASM50033
+                    // A property <value/> subelement MUST NOT be used when the @value
attribute is used 
+                    // to specify the value for that property.
+                    if (valueAttr != null) {
+                        error("ASM50033: value attribute exists for the property element",
name, name);
+                    }
                     // Read <value>
                     if (VALUE_QNAME.equals(name)) {
                         loadElement(reader, root);

Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java?rev=800682&r1=800681&r2=800682&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
(original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
Tue Aug  4 05:54:29 2009
@@ -379,7 +379,9 @@
                 if (!componentProperties.containsKey(property.getName())) {
                     ComponentProperty componentProperty = assemblyFactory.createComponentProperty();
                     componentProperty.setName(property.getName());
+                    componentProperty.setValue(property.getValue());
                     componentProperty.setMany(property.isMany());
+                    componentProperty.setMustSupply(property.isMustSupply());
                     componentProperty.setXSDElement(property.getXSDElement());
                     componentProperty.setXSDType(property.getXSDType());
                     componentProperty.setProperty(property);
@@ -419,7 +421,7 @@
 
                 // Check that a value is supplied
                 if (componentProperty.getValue() == null && property.isMustSupply())
{
-                    warning(monitor, "PropertyMustSupplyNull", component, component.getName(),
componentProperty
+                    error(monitor, "PropertyMustSupplyNull", component, component.getName(),
componentProperty
                         .getName());
                 }
 



Mime
View raw message