You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by br...@apache.org on 2007/03/19 17:02:38 UTC

svn commit: r520014 - in /incubator/yoko/trunk: bindings/pom.xml tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java

Author: bravi
Date: Mon Mar 19 10:02:35 2007
New Revision: 520014

URL: http://svn.apache.org/viewvc?view=rev&rev=520014
Log:
[YOKO-259] - Added support for resolving the relative imports in the wsdltoidl tools and changed the bindings test to use relative url's.

Modified:
    incubator/yoko/trunk/bindings/pom.xml
    incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java

Modified: incubator/yoko/trunk/bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/pom.xml?view=diff&rev=520014&r1=520013&r2=520014
==============================================================================
--- incubator/yoko/trunk/bindings/pom.xml (original)
+++ incubator/yoko/trunk/bindings/pom.xml Mon Mar 19 10:02:35 2007
@@ -178,7 +178,7 @@
                                 <xslt style="${test.resources.dir}/wsdl/type_test/type_test_wsdl.xsl"
                                       in="${test.resources.dir}/wsdl/type_test/type_test.xsd"
                                       out="${generated.resources.test}/wsdl/type_test/type_test_corba_inc.wsdl">
-                                    <param name="inc_xsd_path" expression="${file.url.prefix}${generated.resources.test}/wsdl/type_test" />
+                                    <param name="inc_xsd_path" expression="." />
                                     <param name="use_style" expression="document" />
                                     <param name="tns_suffix" expression="corba" />
                                 </xslt>

Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java?view=diff&rev=520014&r1=520013&r2=520014
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java Mon Mar 19 10:02:35 2007
@@ -89,7 +89,7 @@
                 reader.setExtensionRegistry(extReg);
             }
             wsdlDefinition = reader.readWSDL(wsdlUrl);
-
+            schemaCol.setBaseUri(wsdlDefinition.getDocumentBaseURI());
             parseImports(wsdlDefinition);
             buildWSDLDefinition();    
         } catch (WSDLException we) {