You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by am...@apache.org on 2007/02/13 15:32:56 UTC

svn commit: r507024 - in /webservices/axis2/trunk/java/modules: kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java

Author: amilas
Date: Tue Feb 13 06:32:55 2007
New Revision: 507024

URL: http://svn.apache.org/viewvc?view=rev&rev=507024
Log:
pass the absolute file name instead of user given name

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
    webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?view=diff&rev=507024&r1=507023&r2=507024
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java Tue Feb 13 06:32:55 2007
@@ -57,6 +57,7 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.InputStream;
+import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.*;
@@ -114,7 +115,13 @@
     public WSDL20ToAxisServiceBuilder(String wsdlUri,
                                       String name, String interfaceName) throws Exception {
         WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
-        Description description = wsdlReader.readWSDL(wsdlUri);
+
+        String fullPath = wsdlUri;
+        if (!wsdlUri.startsWith("http://")){
+           File file = new File(wsdlUri);
+           fullPath = file.getAbsolutePath();
+        }
+        Description description = wsdlReader.readWSDL(fullPath);
         DescriptionElement descriptionElement = description.toElement();
         savedTargetNamespace = descriptionElement.getTargetNamespace()
                 .toString();

Modified: webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java?view=diff&rev=507024&r1=507023&r2=507024
==============================================================================
--- webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java (original)
+++ webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java Tue Feb 13 06:32:55 2007
@@ -168,6 +168,7 @@
                     new Axis2Filer(cgconfig),
                     new XmlOptions().setEntityResolver(er));
 
+
             // prune the generated schema type system and add the list of base64 types
             cgconfig.putProperty(Constants.BASE_64_PROPERTY_KEY,
                     findBase64Types(sts));



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org