diff options
3 files changed, 7 insertions, 6 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 4b65f77479..0b0cd98a66 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 @@ -29,6 +29,7 @@ import java.io.File; import java.io.PrintStream;
import java.io.IOException;
import java.io.FileOutputStream;
+import java.net.URI;
import java.net.URL;
import javax.xml.namespace.QName;
@@ -210,7 +211,7 @@ public class BPELODEDeployFile { */
private File getBPELFile() {
try {
- File theProcess = new File(implementation.getProcessDefinition().getLocation());
+ File theProcess = new File(URI.create(implementation.getProcessDefinition().getLocation()));
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 8bd2b911ee..22a86a9e0f 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,12 +95,12 @@ public class TuscanyProcessConfImpl implements ProcessConf { */ public String getBpelDocument() { //System.out.println("getBPELDocument called"); - String processURL = implementation.getProcessDefinition().getLocation(); try { - return getRelativePath( getDirectory(), new File(processURL)); + File processFile = new File(URI.create(implementation.getProcessDefinition().getLocation())); + return getRelativePath( getDirectory(), processFile); } catch (Exception e) { if(__log.isWarnEnabled()) { - __log.warn("Unable to resolve relative path of BPEL process" + processURL, e ); + __log.warn("Unable to resolve relative path of BPEL process" + implementation.getProcessDefinition().getLocation(), e ); } return null; } // end try @@ -383,7 +383,7 @@ public class TuscanyProcessConfImpl implements ProcessConf { */ private File getBPELFile() { try { - File theProcess = new File(implementation.getProcessDefinition().getLocation()); + File theProcess = new File(URI.create(implementation.getProcessDefinition().getLocation())); 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 51948e1392..c644b6a965 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 @@ -97,7 +97,7 @@ public class BPELImplementationProvider implements ImplementationProvider { URI deployURI = URI.create(this.implementation.getProcessDefinition().getLocation()); - File deploymentDir = new File(deployURI.getPath()).getParentFile(); + File deploymentDir = new File(deployURI).getParentFile(); if(__log.isInfoEnabled()) { __log.info(">>> Deploying : " + deploymentDir.toString()); |