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 2007/06/01 17:58:54 UTC
svn commit: r543519 - in
/incubator/tuscany/java/sca/modules/assembly-xml/src:
main/java/org/apache/tuscany/sca/assembly/xml/
test/resources/org/apache/tuscany/sca/assembly/xml/
Author: rfeng
Date: Fri Jun 1 08:58:54 2007
New Revision: 543519
URL: http://svn.apache.org/viewvc?view=rev&rev=543519
Log:
Fix for JIRA 1321 to support the correct syntax of <include>
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java?view=diff&rev=543519&r1=543518&r2=543519
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java Fri Jun 1 08:58:54 2007
@@ -114,6 +114,7 @@
// Read an <include>
include = assemblyFactory.createComposite();
+ include.setName(getQName(reader, "name"));
include.setUnresolved(true);
composite.getIncludes().add(include);
@@ -267,12 +268,6 @@
break;
case XMLStreamConstants.CHARACTERS:
-
- // Read an <include>qname</include>
- if (include != null && INCLUDE_QNAME.equals(name)) {
- include.setName(getQNameValue(reader, reader.getText().trim()));
- }
-
break;
case END_ELEMENT:
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite?view=diff&rev=543519&r1=543518&r2=543519
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite Fri Jun 1 08:58:54 2007
@@ -25,7 +25,7 @@
xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0 "
xmlns:cns="http://test/confidentiality" xmlns:sns="http://test/secure">
- <include>tns:TestAllDivide</include>
+ <include name="tns:TestAllDivide"/>
<service name="CalculatorService" promote="CalculatorServiceComponent/CalculatorService" requires="cns:confidentiality"
policySets="sns:secure">
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite?view=diff&rev=543519&r1=543518&r2=543519
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite Fri Jun 1 08:58:54 2007
@@ -29,7 +29,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0 http://www.osoa.org/xmlns/sca/1.0 ">
- <include>tns:CompleteDivide</include>
+ <include name="tns:CompleteDivide"/>
<service name="DivideService" policySets="" promote="CalculatorDivideComponent/DivideService" requires="">
<interface.java interface="calculator.DivideService" callbackInterface="calculator.DivideCallback"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org