svn commit: r774071 - in /tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode: BPELODEDeployFile.java TuscanyProcessConfImpl.java provider/BPELImplementationProvider.java

[lresende]

Author: lresende
Date: Tue May 12 20:38:07 2009
New Revision: 774071

URL: http://svn.apache.org/viewvc?rev=774071&view=rev
Log:
TUSCANY-3015 - Using URI to properly escape/unescape spaces for the BPEL 
extension

Modified:
    
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
    
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
    
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java

Modified: 
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java?rev=774071&r1=774070&r2=774071&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
 (original)
+++ 
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
 Tue May 12 20:38:07 2009
@@ -211,10 +211,8 @@
     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()) {

Modified: 
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java?rev=774071&r1=774070&r2=774071&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
 (original)
+++ 
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
 Tue May 12 20:38:07 2009
@@ -96,10 +96,8 @@
         //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 @@
     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()) {

Modified: 
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java?rev=774071&r1=774070&r2=774071&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
 (original)
+++ 
tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
 Tue May 12 20:38:07 2009
@@ -96,10 +96,7 @@
             }
 
             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();