cvs commit: xml-axis/java/src/org/apache/axis/wsdl/symbolTable SymbolTable.java

[dims]

dims        2002/11/22 06:38:54

  Modified:    java/src/org/apache/axis/wsdl/symbolTable SymbolTable.java
  Log:
  Fix for Bug 14712 - wsdl2java can not do standard <import>s and does not support 
xml:lang and xsi:schemaLocation
  
  Revision  Changes    Path
  1.52      +18 -1     
xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java
  
  Index: SymbolTable.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- SymbolTable.java  1 Nov 2002 20:14:57 -0000       1.51
  +++ SymbolTable.java  22 Nov 2002 14:38:53 -0000      1.52
  @@ -617,7 +617,7 @@
                   Node namespace = attributes.getNamedItem("namespace");
                   // skip XSD import of soap encoding
                   if (namespace != null &&
  -                        Constants.isSOAP_ENC(namespace.getNodeValue())) {
  +                        isKnownNamespace(namespace.getNodeValue())) {
                       continue;
                   }
                   Node importFile = attributes.getNamedItem("schemaLocation");
  @@ -635,6 +635,23 @@
               lookForImports(context, child);
           }
       } // lookForImports
  +    
  +    /**
  +     * Check if this is a known namespace (soap-enc or schema xsd or schema xsi or 
xml)
  +     * @param namespace
  +     * @return true if this is a know namespace.
  +     */ 
  +    public boolean isKnownNamespace(String namespace) {
  +        if (Constants.isSOAP_ENC(namespace)) 
  +            return true;
  +        if (Constants.isSchemaXSD(namespace)) 
  +            return true;
  +        if (Constants.isSchemaXSI(namespace)) 
  +            return true;
  +        if (namespace.equals(Constants.NS_URI_XML)) 
  +            return true;
  +        return false;
  +    }
   
       /**
        * Populate the symbol table with all of the Types from the Document.