svn commit: r630639 - /incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java

[jsdelfino]

Author: jsdelfino
Date: Sun Feb 24 09:21:22 2008
New Revision: 630639

URL: http://svn.apache.org/viewvc?rev=630639&view=rev
Log:
Fixed reading and writing of composite includes.

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

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?rev=630639&r1=630638&r2=630639&view=diff
==============================================================================
--- 
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
 Sun Feb 24 09:21:22 2008
@@ -141,7 +141,8 @@
 
                         // Read an <include>
                         include = assemblyFactory.createComposite();
-                        include.setName(getQName(reader, "name"));
+                        include.setName(getQName(reader, NAME));
+                        include.setURI(getString(reader, URI));
                         include.setUnresolved(true);
                         composite.getIncludes().add(include);
 
@@ -453,6 +454,16 @@
                            new XAttr(NAME, composite.getName().getLocalPart()),
                            new XAttr(AUTOWIRE, composite.getAutowire()),
                            policyProcessor.writePolicies(composite));
+
+        // Write <include> elements
+        for (Composite include : composite.getIncludes()) {
+            String uri = include.isUnresolved()? include.getURI() : null;
+            writeStart(writer,
+                       INCLUDE,
+                       new XAttr(NAME, include.getName()),
+                       new XAttr(URI, uri));
+            writeEnd(writer);
+        }
 
         // Write <service> elements
         for (Service service : composite.getServices()) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]