TUSCANY-3015: Fix URI creation to escape spaces in the name

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

3 files changed, 20 insertions, 4 deletions

diff --git a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
index 20373d0819..dd733d7901 100644
--- a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
+++ b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
@@ -210,7 +210,11 @@ public class BPELODEDeployFile {
      */

     private File getBPELFile() {

         try {

-            File theProcess = new File(URI.create(implementation.getProcessDefinition().getLocation()));

+            String location = this.implementation.getProcessDefinition().getLocation();

+            if (location.indexOf(' ') != -1) {

+               location = location.replace(" ", "%20");

+            }

+            File theProcess = new File(URI.create(location));

             return theProcess;

         } catch( Exception e ) {

             if(__log.isDebugEnabled()) {

diff --git a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
index a85c7b1e5c..2090d1c34a 100644
--- a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
+++ b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
@@ -95,7 +95,11 @@ public class TuscanyProcessConfImpl implements ProcessConf {
     public String getBpelDocument() {
         //System.out.println("getBPELDocument called");
         try {
-            File processFile = new File(URI.create(implementation.getProcessDefinition().getLocation()));
+            String location = this.implementation.getProcessDefinition().getLocation();
+            if (location.indexOf(' ') != -1) {
+               location = location.replace(" ", "%20");
+            }
+            File processFile = new File(URI.create(location));
             return getRelativePath( getDirectory(), processFile);
         } catch (Exception e) {
             if(__log.isWarnEnabled()) {
@@ -382,7 +386,11 @@ public class TuscanyProcessConfImpl implements ProcessConf {
      */
     private File getBPELFile() {
         try {
-            File theProcess = new File(URI.create(implementation.getProcessDefinition().getLocation()));
+            String location = this.implementation.getProcessDefinition().getLocation();
+            if (location.indexOf(' ') != -1) {
+               location = location.replace(" ", "%20");
+            }
+            File theProcess = new File(URI.create(location));
             return theProcess;
         } catch( Exception e ) {
             if(__log.isDebugEnabled()) {
diff --git a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
index c644b6a965..f550cacab4 100644
--- a/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
+++ b/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
@@ -95,7 +95,11 @@ public class BPELImplementationProvider implements ImplementationProvider {
                 odeServer.init();
             }
 
-            URI deployURI = URI.create(this.implementation.getProcessDefinition().getLocation());
+            String location = this.implementation.getProcessDefinition().getLocation();
+            if (location.indexOf(' ') != -1) {
+               location = location.replace(" ", "%20");
+            }
+            URI deployURI = URI.create(location);
             
             File deploymentDir = new File(deployURI).getParentFile();