Author: antelder
Date: Tue May 12 07:48:46 2009
New Revision: 773814

URL: http://svn.apache.org/viewvc?rev=773814&view=rev
Log:
TUSCANY-3015: Fix URI creation to escape spaces in the name

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=773814&r1=773813&r2=773814&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 07:48:46 2009
@@ -210,7 +210,11 @@
      */
     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()) {

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=773814&r1=773813&r2=773814&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 07:48:46 2009
@@ -95,7 +95,11 @@
     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 @@
      */
     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()) {

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=773814&r1=773813&r2=773814&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 07:48:46 2009
@@ -95,7 +95,11 @@
                 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();
             


Reply via email to