svn commit: r1002690 - /tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java

[an...@apache.org]

Author: antelder
Date: Wed Sep 29 15:44:25 2010
New Revision: 1002690

URL: http://svn.apache.org/viewvc?rev=1002690&view=rev
Log:
Update to use all the contribution attributes, rename the test to use the correct attribute name, and make sure the xml file gets closed

Modified:
    tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java

Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java?rev=1002690&r1=1002689&r2=1002690&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java Wed Sep 29 15:44:25 2010
@@ -116,8 +116,7 @@ public class NodeFactory {
         NodeConfiguration configuration = loadConfiguration(configURL);
         Node node = createNode(configuration.getDomainURI());
         for ( ContributionConfiguration c : configuration.getContributions()) {
-//            node.installContribution(c.getURI(), c.getLocation(), c.getMetaDataURL(), c.getDependentContributionURIs(), c.getRunDeployables());
-            node.installContribution(c.getURI(), c.getLocation(), null, null, true);
+            node.installContribution(c.getURI(), c.getLocation(), c.getMetaDataURL(), c.getDependentContributionURIs(), c.isStartDeployables());
         }
         return node;
     }
@@ -182,9 +181,10 @@ public class NodeFactory {
     }
 
     protected NodeConfiguration loadConfiguration(String configURL) {
+        InputStream xml =null;
         try {
             URL base = IOHelper.getLocationAsURL(configURL);
-            InputStream xml = IOHelper.openStream(base);
+            xml = IOHelper.openStream(base);
             InputStreamReader reader = new InputStreamReader(xml, "UTF-8");
             ProcessorContext context = deployer.createProcessorContext();
             NodeConfiguration config = deployer.loadXMLDocument(reader, context.getMonitor());
@@ -203,6 +203,12 @@ public class NodeFactory {
             return config;
         } catch (Throwable e) {
             throw new ServiceRuntimeException(e);
+        } finally {
+            try {
+                if (xml != null) xml.close();
+            } catch (IOException e) {
+                throw new ServiceRuntimeException(e);
+            }
         }
     }