Changed uri and location to strings instead of URI and URL in the BPEL implementation model as strings are more lightweight and that's what we've already done with other similar models as well. Added a pointer to the ModelResolver which can be used to resolve WSDLs and XSDs referenced by the BPEL process when it's deployed and started later, after the original model read/resolve phases.

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

3 files changed, 7 insertions, 9 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 dc77c5ecc6..4b65f77479 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
@@ -209,9 +209,8 @@ public class BPELODEDeployFile {
      * @return - the File object containing the BPEL process

      */

     private File getBPELFile() {

-        URL fileURL = implementation.getProcessDefinition().getLocation();

         try {

-            File theProcess = new File( fileURL.toURI());

+            File theProcess = new File(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 13523734d1..8bd2b911ee 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,9 +95,9 @@ public class TuscanyProcessConfImpl implements ProcessConf {
      */
     public String getBpelDocument() {
         //System.out.println("getBPELDocument called");
-        URL processURL = implementation.getProcessDefinition().getLocation();
+        String processURL = implementation.getProcessDefinition().getLocation();
         try {
-            return getRelativePath( getDirectory(), new File( processURL.toURI() ));
+            return getRelativePath( getDirectory(), new File(processURL));
         } catch (Exception e) {
             if(__log.isWarnEnabled()) {
                 __log.warn("Unable to resolve relative path of BPEL process" + processURL, e );
@@ -382,9 +382,8 @@ public class TuscanyProcessConfImpl implements ProcessConf {
      * @return - the File object containing the BPEL process
      */
     private File getBPELFile() {
-        URL fileURL = implementation.getProcessDefinition().getLocation();
         try {
-            File theProcess = new File( fileURL.toURI());
+            File theProcess = new File(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 b67d6755c3..51948e1392 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
@@ -19,7 +19,7 @@
 package org.apache.tuscany.sca.implementation.bpel.ode.provider;
 
 import java.io.File;
-import java.net.URL;
+import java.net.URI;
 
 import javax.transaction.TransactionManager;
 
@@ -95,9 +95,9 @@ public class BPELImplementationProvider implements ImplementationProvider {
                 odeServer.init();
             }
 
-            URL deployURL = this.implementation.getProcessDefinition().getLocation();
+            URI deployURI = URI.create(this.implementation.getProcessDefinition().getLocation());
             
-            File deploymentDir = new File(deployURL.toURI().getPath()).getParentFile();
+            File deploymentDir = new File(deployURI.getPath()).getParentFile();
             
             if(__log.isInfoEnabled()) {
                 __log.info(">>> Deploying : " + deploymentDir.toString());