Author: ajith
Date: Tue Jul 26 00:44:28 2005
New Revision: 225251
URL: http://svn.apache.org/viewcvs?rev=225251&view=rev
Log:
Solved the relative path problem. Now the relative paths are resolved relative
to the location of the WSDL file
Modified:
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
Modified:
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java?rev=225251&r1=225250&r2=225251&view=diff
==============================================================================
---
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java
(original)
+++
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WOMBuilder.java
Tue Jul 26 00:44:28 2005
@@ -26,7 +26,7 @@
public interface WOMBuilder {
public WSDLVersionWrapper build(InputStream in) throws WSDLException;
-
+ public WSDLVersionWrapper build(InputStream in,String baseURI) throws
WSDLException;
public WSDLVersionWrapper build(InputStream in,
WSDLComponentFactory wsdlComponentFactory)
throws WSDLException;
}
Modified:
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java?rev=225251&r1=225250&r2=225251&view=diff
==============================================================================
---
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java
(original)
+++
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/WSDL2ToWOMBuilder.java
Tue Jul 26 00:44:28 2005
@@ -34,4 +34,10 @@
throw new UnsupportedOperationException("Not Implemented");
}
+
+ public WSDLVersionWrapper build(InputStream in,
+ String baseURI) throws WSDLException {
+ throw new UnsupportedOperationException("Not Implemented");
+
+ }
}
Modified:
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java?rev=225251&r1=225250&r2=225251&view=diff
==============================================================================
---
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
(original)
+++
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
Tue Jul 26 00:44:28 2005
@@ -41,7 +41,16 @@
WSDLDescription wsdlDescription = new WSDLDescriptionImpl();
- Definition wsdl1Definition = this.readInTheWSDLFile(in);
+ Definition wsdl1Definition = this.readInTheWSDLFile(in,null);
+ WSDLPump pump = new WSDLPump(wsdlDescription, wsdl1Definition);
+ pump.pump();
+
+ return new WSDLVersionWrapper(wsdlDescription, wsdl1Definition);
+ }
+
+ public WSDLVersionWrapper build(InputStream wsdlSource, String baseUri)
throws WSDLException {
+ WSDLDescription wsdlDescription = new WSDLDescriptionImpl();
+ Definition wsdl1Definition =
this.readInTheWSDLFile(wsdlSource,baseUri);
WSDLPump pump = new WSDLPump(wsdlDescription, wsdl1Definition);
pump.pump();
@@ -52,7 +61,7 @@
WSDLComponentFactory wsdlComponentFactory)
throws WSDLException {
WSDLDescription wsdlDescription =
wsdlComponentFactory.createDescription();
- Definition wsdl1Definition = this.readInTheWSDLFile(in);
+ Definition wsdl1Definition = this.readInTheWSDLFile(in,null);
WSDLPump pump = new WSDLPump(wsdlDescription,
wsdl1Definition,
wsdlComponentFactory);
@@ -62,10 +71,11 @@
}
- private Definition readInTheWSDLFile(InputStream in) throws WSDLException {
+ private Definition readInTheWSDLFile(InputStream in, String baseURI)
throws WSDLException {
WSDLReader reader =
WSDLFactory.newInstance().newWSDLReader();
+
Document doc;
try {
doc = Utils.newDocument(in);
@@ -82,7 +92,7 @@
throw new WSDLException(WSDLException.INVALID_WSDL, "IO Error", e);
}
- return reader.readWSDL(null, doc);
+ return reader.readWSDL(baseURI, doc);
}
Modified:
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL:
http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=225251&r1=225250&r2=225251&view=diff
==============================================================================
---
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
(original)
+++
webservices/axis/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
Tue Jul 26 00:44:28 2005
@@ -127,8 +127,10 @@
IOException {
String uri = ((CommandLineOption) parser.getAllOptions().get(
CommandLineOptionConstants.WSDL_LOCATION_URI_OPTION)).getOptionValue();
- InputStream in = new FileInputStream(new File(uri));
- return WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in)
+ File file = new File(uri);
+ InputStream in = new FileInputStream(file);
+ String baseURI =
file.getParentFile()!=null?file.getParentFile().toURI().toString():null;
+ return
WOMBuilderFactory.getBuilder(WOMBuilderFactory.WSDL11).build(in,baseURI)
.getDescription();
}
