You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/08/18 19:04:59 UTC
svn commit: r805498 - in /tuscany/java/sca/modules: assembly-xml/
assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ assembly/
assembly/META-INF/
assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/
assembly/src/main/resour...
Author: rfeng
Date: Tue Aug 18 17:04:59 2009
New Revision: 805498
URL: http://svn.apache.org/viewvc?rev=805498&view=rev
Log:
Fix for ASM_4008
Modified:
tuscany/java/sca/modules/assembly-xml/pom.xml
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
tuscany/java/sca/modules/assembly/META-INF/MANIFEST.MF
tuscany/java/sca/modules/assembly/pom.xml
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
tuscany/java/sca/modules/assembly/src/main/resources/assembly-validation-messages.properties
Modified: tuscany/java/sca/modules/assembly-xml/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/pom.xml?rev=805498&r1=805497&r2=805498&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/pom.xml (original)
+++ tuscany/java/sca/modules/assembly-xml/pom.xml Tue Aug 18 17:04:59 2009
@@ -99,7 +99,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-assembly-xsd</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
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=805498&r1=805497&r2=805498&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 18 17:04:59 2009
@@ -606,9 +606,11 @@
if (root.getChildNodes().getLength() == 0) {
// Add an text as an <value>
if (isTextForProperty){
- Element valueElement = document.createElementNS(SCA11_NS, VALUE);
- root.appendChild(valueElement);
- valueElement.setTextContent(text.toString());
+ if (text.length() > 0) {
+ Element valueElement = document.createElementNS(SCA11_NS, VALUE);
+ root.appendChild(valueElement);
+ valueElement.setTextContent(text.toString());
+ }
}
}
return document;
Modified: tuscany/java/sca/modules/assembly/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/META-INF/MANIFEST.MF?rev=805498&r1=805497&r2=805498&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/assembly/META-INF/MANIFEST.MF Tue Aug 18 17:04:59 2009
@@ -36,13 +36,11 @@
org.apache.tuscany.sca.assembly;version="2.0.0",
org.apache.tuscany.sca.assembly.builder;version="2.0.0",
org.apache.tuscany.sca.assembly.impl;version="2.0.0",
- org.apache.tuscany.sca.assembly.xsd;version="2.0.0",
org.apache.tuscany.sca.core;version="2.0.0",
org.apache.tuscany.sca.definitions;version="2.0.0",
org.apache.tuscany.sca.extensibility;version="2.0.0",
org.apache.tuscany.sca.interfacedef;version="2.0.0",
- org.apache.tuscany.sca.interfacedef.impl;version="2.0.0";
- resolution:=optional,
+ org.apache.tuscany.sca.interfacedef.impl;version="2.0.0";resolution:=optional,
org.apache.tuscany.sca.monitor;version="2.0.0",
org.apache.tuscany.sca.policy;version="2.0.0",
org.apache.tuscany.sca.policy.util;version="2.0.0",
Modified: tuscany/java/sca/modules/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/pom.xml?rev=805498&r1=805497&r2=805498&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/pom.xml (original)
+++ tuscany/java/sca/modules/assembly/pom.xml Tue Aug 18 17:04:59 2009
@@ -29,12 +29,7 @@
<name>Apache Tuscany SCA Assembly Model</name>
<dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-assembly-xsd</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-policy</artifactId>
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java?rev=805498&r1=805497&r2=805498&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java Tue Aug 18 17:04:59 2009
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.sca.assembly.builder.impl;
+import static org.apache.tuscany.sca.assembly.Base.SCA11_NS;
+
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@@ -52,10 +54,6 @@
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
-import static org.apache.tuscany.sca.assembly.xsd.Constants.PROPERTY;
-import static org.apache.tuscany.sca.assembly.xsd.Constants.SCA11_NS;
-import static org.apache.tuscany.sca.assembly.xsd.Constants.VALUE;
-
/**
* Utility class to deal with processing of component properties that are taking values from the parent
* composite's properties or an external file.
@@ -92,14 +90,14 @@
return (Document)result;
} else {
Document document = documentBuilderFactory.newDocumentBuilder().newDocument();
- Element newProperty = document.createElementNS(SCA11_NS, PROPERTY);
+ Element newProperty = document.createElementNS(SCA11_NS, "property");
- if( VALUE.equals(result.getLocalName()) ) {
+ if( "value".equals(result.getLocalName()) ) {
// If the result is a <value/> element, use it directly in the result
newProperty.appendChild(document.importNode(result, true));
} else {
// If the result is not a <value/> element, create a <value/> element to contain the result
- Element newValue = document.createElementNS(SCA11_NS, VALUE);
+ Element newValue = document.createElementNS(SCA11_NS, "value");
newValue.appendChild(document.importNode(result, true));
newProperty.appendChild(newValue);
} // end if
Modified: tuscany/java/sca/modules/assembly/src/main/resources/assembly-validation-messages.properties
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/resources/assembly-validation-messages.properties?rev=805498&r1=805497&r2=805498&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/resources/assembly-validation-messages.properties (original)
+++ tuscany/java/sca/modules/assembly/src/main/resources/assembly-validation-messages.properties Tue Aug 18 17:04:59 2009
@@ -30,7 +30,7 @@
DuplicateImplementationReferenceName = Duplicate reference name: Component = {0} Reference = {1}
PropertyNotFound = Property not found for component property: Component = {0} Property = {1}
PropertyMustSupplyIncompatible = Component property mustSupply attribute incompatible with property: Component = {0} Property = {1}
-PropertyMustSupplyNull = No value configured on a mustSupply property: Component = {0} Property = {1}
+PropertyMustSupplyNull = [ASM_4008] No value configured on a mustSupply property: Component = {0} Property = {1}
PropertyOverrideManyAttribute = Component property many attribute incompatible with property: Component = {0} Property = {1}
ReferenceNotFound = Reference not found for component reference: Component = {0} Reference = {1}
ReferenceIncompatibleMultiplicity = Component reference multiplicity incompatible with reference multiplicity: Component = {0} Reference = {1}