TUSCANY-3015 - Using URI to properly escape/unescape spaces for the BPEL extension

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

3 files changed, 7 insertions, 16 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 dd733d7901..5ad8b7c5d9 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
@@ -211,10 +211,8 @@ public class BPELODEDeployFile {
     private File getBPELFile() {

         try {

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

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

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

-            }

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

+            URI locationURI = new URI(null, location, null);

+            File theProcess = new File(locationURI);

             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 2090d1c34a..5cc9a350ef 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
@@ -96,10 +96,8 @@ public class TuscanyProcessConfImpl implements ProcessConf {
         //System.out.println("getBPELDocument called");
         try {
             String location = this.implementation.getProcessDefinition().getLocation();
-            if (location.indexOf(' ') != -1) {
-               location = location.replace(" ", "%20");
-            }
-            File processFile = new File(URI.create(location));
+            URI locationURI = new URI(null, location, null);
+            File processFile = new File(locationURI);
             return getRelativePath( getDirectory(), processFile);
         } catch (Exception e) {
             if(__log.isWarnEnabled()) {
@@ -387,10 +385,8 @@ public class TuscanyProcessConfImpl implements ProcessConf {
     private File getBPELFile() {
         try {
             String location = this.implementation.getProcessDefinition().getLocation();
-            if (location.indexOf(' ') != -1) {
-               location = location.replace(" ", "%20");
-            }
-            File theProcess = new File(URI.create(location));
+            URI locationURI = new URI(null, location, null);
+            File theProcess = new File(locationURI);
             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 f550cacab4..c500f001dc 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
@@ -96,10 +96,7 @@ public class BPELImplementationProvider implements ImplementationProvider {
             }
 
             String location = this.implementation.getProcessDefinition().getLocation();
-            if (location.indexOf(' ') != -1) {
-               location = location.replace(" ", "%20");
-            }
-            URI deployURI = URI.create(location);
+            URI deployURI = new URI(null, location, null);
             
             File deploymentDir = new File(deployURI).getParentFile();