TUSCANY-3015 - Using URI to properly escape/unescape spaces in various parts of the runtime

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@774067 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 14 insertions, 2 deletions

diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index 183d6f3471..ec059ace81 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
@@ -20,9 +20,11 @@
 package org.apache.tuscany.sca.assembly.xml;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Collection;
@@ -83,14 +85,24 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements
     	} // end if
         InputStream scdlStream = null;
         try {
-            URLConnection connection = url.openConnection();
+            URLConnection connection;
+            if (url.getProtocol().equals("file")) {
+            	File scdlFile = new File(url.toURI().getPath());
+            	connection = scdlFile.toURL().openConnection();
+            } else {
+            	connection = url.openConnection();
+            }
             connection.setUseCaches(false);
             scdlStream = connection.getInputStream();
         } catch (IOException e) {
             ContributionReadException ce = new ContributionReadException("Exception reading " + uri, e);
             error("ContributionReadException", url, ce);
             throw ce;
-        }
+        } catch (URISyntaxException e) {
+        	ContributionReadException ce = new ContributionReadException("Exception reading " + uri, e);
+        	error("ContributionReadException", url, ce);
+        	throw ce;
+		}
         return read(uri, scdlStream);
     }