You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/09/01 23:05:50 UTC
svn commit: r691062 - 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
Author: jsdelfino
Date: Mon Sep 1 14:05:50 2008
New Revision: 691062
URL: http://svn.apache.org/viewvc?rev=691062&view=rev
Log:
Fixed conversion between URI string and BPEL File.
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=691062&r1=691061&r2=691062&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 Mon Sep 1 14:05:50 2008
@@ -29,6 +29,7 @@
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 @@
*/
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()) {
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=691062&r1=691061&r2=691062&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 Mon Sep 1 14:05:50 2008
@@ -95,12 +95,12 @@
*/
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 @@
*/
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()) {
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=691062&r1=691061&r2=691062&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 Mon Sep 1 14:05:50 2008
@@ -97,7 +97,7 @@
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());