svn commit: r661355 - /incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java

[jsdelfino]

Author: jsdelfino
Date: Thu May 29 08:22:12 2008
New Revision: 661355

URL: http://svn.apache.org/viewvc?rev=661355&view=rev
Log:
Fixed malformed URL exception when specifying relative paths.

Modified:
    
incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java

Modified: 
incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=661355&r1=661354&r2=661355&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
 Thu May 29 08:22:12 2008
@@ -20,8 +20,10 @@
 package org.apache.tuscany.sca.node.impl;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.InputStream;
 import java.io.StringReader;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
@@ -277,7 +279,11 @@
         ContributionService contributionService = 
runtime.getContributionService();
         List<Contribution> contributions = new ArrayList<Contribution>();
         for (Contribution contribution: configuration.getContributions()) {
-            URL contributionURL = new URL(contribution.getLocation());
+            URI uri = URI.create(contribution.getLocation());
+            if (uri.getScheme() == null) {
+                uri = new File(contribution.getLocation()).toURI();
+            }
+            URL contributionURL = uri.toURL();
 
             // Extract contribution file name
             String file =contributionURL.getPath();
@@ -301,7 +307,11 @@
         // Load the specified composite
         StAXArtifactProcessor<Composite> compositeProcessor = 
artifactProcessors.getProcessor(Composite.class);
         if (configuration.getComposite().getName() == null) {
-            URL compositeURL = new URL(configuration.getComposite().getURI());
+            URI uri = URI.create(configuration.getComposite().getURI());
+            if (uri.getScheme() == null) {
+                uri = new File(configuration.getComposite().getURI()).toURI();
+            }
+            URL compositeURL = uri.toURL();
             logger.log(Level.INFO, "Loading composite: " + compositeURL);
             InputStream is = compositeURL.openStream();
             XMLStreamReader reader = inputFactory.createXMLStreamReader(is);