svn commit: r635399 - /incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java

[jsdelfino]

Author: jsdelfino
Date: Sun Mar  9 16:55:25 2008
New Revision: 635399

URL: http://svn.apache.org/viewvc?rev=635399&view=rev
Log:
Read contribution URis from implementation.node elements.

Modified:
    
incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java

Modified: 
incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java?rev=635399&r1=635398&r2=635399&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-node-xml/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
 Sun Mar  9 16:55:25 2008
@@ -67,13 +67,15 @@
         
         // Read an <implementation.node> element
         NodeImplementation implementation = 
implementationFactory.createNodeImplementation();
-        implementation.setUnresolved(true);
+        implementation.setUnresolved(false);
 
         // Read the composite attribute
         QName qname = getQName(reader, "composite");
         if (qname != null) {
             Composite composite = assemblyFactory.createComposite();
             composite.setName(qname);
+            String uri = getString(reader, "uri");
+            composite.setURI(uri);
             composite.setUnresolved(true);
             implementation.setComposite(composite);
         }
@@ -89,16 +91,8 @@
     }
 
     public void resolve(NodeImplementation implementation, ModelResolver 
resolver) throws ContributionResolveException {
-        
-        // Resolve the referenced composite
-        Composite composite = implementation.getComposite();
-        if (composite != null) {
-            composite = resolver.resolveModel(Composite.class, composite);
-            if (!composite.isUnresolved()) {
-                implementation.setComposite(composite);
-            }
-        }
-        implementation.setUnresolved(false);
+        // We do not need to resolve the referenced composites here
+        // Nodes and application composites are not in the same composition 
tree
     }
 
     public void write(NodeImplementation implementation, XMLStreamWriter 
writer) throws ContributionWriteException, XMLStreamException {
@@ -106,13 +100,16 @@
         // Write <implementation.node>
         Composite composite = implementation.getComposite();
         QName qname;
+        String uri;
         if (composite != null) {
             qname = composite.getName();
+            uri = composite.getURI();
         } else {
             qname = null;
+            uri = null;
         }
         writeStart(writer, IMPLEMENTATION_NODE.getNamespaceURI(), 
IMPLEMENTATION_NODE.getLocalPart(),
-                                 new XAttr("composite", qname));
+                                 new XAttr("composite", qname), new 
XAttr("uri", uri));
         
         writeEnd(writer);
     }



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