Author: mriou
Date: Fri Jul 20 09:49:29 2007
New Revision: 558046
URL: http://svn.apache.org/viewvc?view=rev&rev=558046
Log:
ODE-153 Applying Richard Taylor's patch. Fixes to allow paths containing spaces.
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java?view=diff&rev=558046&r1=558045&r2=558046
==============================================================================
---
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
(original)
+++
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
Fri Jul 20 09:49:29 2007
@@ -21,6 +21,8 @@
import java.io.InputStream;
import java.net.URI;
+import java.net.URL;
+import java.net.URLEncoder;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -68,7 +70,7 @@
}
try {
- URI baseUri =
pconf.getBaseURL().toURI().resolve(wsdlDefinition.getDocumentBaseURI());
+ URI baseUri =
pconf.getBaseURI().resolve(wsdlDefinition.getDocumentBaseURI());
InputStream is = baseUri.toURL().openStream();
WSDL11ToAxisServiceBuilder serviceBuilder = new
WSDL11ToAxisServiceBuilder(is, wsdlServiceName, portName);
serviceBuilder.setBaseUri(baseUri.toString());
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java?view=diff&rev=558046&r1=558045&r2=558046
==============================================================================
---
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
(original)
+++
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/DeploymentWebService.java
Fri Jul 20 09:49:29 2007
@@ -56,6 +56,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.URI;
+import java.net.URL;
import java.util.Collection;
import java.util.List;
import java.util.zip.ZipEntry;
@@ -89,7 +91,8 @@
WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
wsdlReader.setFeature("javax.wsdl.verbose", false);
- def = wsdlReader.readWSDL(rootpath + "/deploy.wsdl");
+ File wsdlFile = new File(rootpath + "/deploy.wsdl");
+ def = wsdlReader.readWSDL(wsdlFile.toURI().toString());
AxisService deployService = ODEAxisService.createService(
axisConfig, new
QName("http://www.apache.org/ode/deployapi";, "DeploymentService"),
"DeploymentPort", "DeploymentService", def, new
DeploymentMessageReceiver());
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java?view=diff&rev=558046&r1=558045&r2=558046
==============================================================================
---
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java
(original)
+++
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/service/ManagementService.java
Fri Jul 20 09:49:29 2007
@@ -19,6 +19,25 @@
package org.apache.ode.axis2.service;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.wsdl.Definition;
+import javax.wsdl.WSDLException;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -45,21 +64,6 @@
import org.apache.xmlbeans.XmlObject;
import org.w3c.dom.Node;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import java.io.IOException;
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
/**
* Axis2 wrapper for process and instance management interfaces.
*/
@@ -80,7 +84,8 @@
WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
wsdlReader.setFeature("javax.wsdl.verbose", false);
- def = wsdlReader.readWSDL(rootpath + "/pmapi.wsdl");
+ File wsdlFile = new File(rootpath + "/pmapi.wsdl");
+ def = wsdlReader.readWSDL(wsdlFile.toURI().toString());
AxisService processService = ODEAxisService.createService(
axisConfig, new QName("http://www.apache.org/ode/pmapi";,
"ProcessManagementService"),
"ProcessManagementPort", "ProcessManagement", def, new
ProcessMessageReceiver());
Modified:
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java?view=diff&rev=558046&r1=558045&r2=558046
==============================================================================
---
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java
(original)
+++
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java
Fri Jul 20 09:49:29 2007
@@ -20,7 +20,7 @@
import java.io.File;
import java.io.InputStream;
-import java.net.URL;
+import java.net.URI;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -78,7 +78,7 @@
/**
* Get the base URL for resolving resources.
*/
- URL getBaseURL();
+ URI getBaseURI();
/**
* Get the date of deployment.
Modified:
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java?view=diff&rev=558046&r1=558045&r2=558046
==============================================================================
---
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
(original)
+++
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
Fri Jul 20 09:49:29 2007
@@ -43,8 +43,7 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -196,12 +195,8 @@
}
}
- public URL getBaseURL() {
- try {
- return _du.getDeployDir().toURL();
- } catch (MalformedURLException except) {
- throw new RuntimeException(except);
- }
+ public URI getBaseURI() {
+ return _du.getDeployDir().toURI();
}
public ProcessState getState() {
