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 bu...@apache.org on 2002/01/24 19:02:29 UTC

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

butek       02/01/24 10:02:29

  Modified:    java/src/org/apache/axis/wsdl/toJava
                        JavaInterfaceWriter.java SymbolTable.java
  Log:
  I removed a patch.  The problem this patch was getting around turns out to occur
  only on invalid WSDL.  It only occurs when a binding appears before a portType
  (like http://www.xmethods.net/tmodels/InteropTest.wsdl used to do).  Since it only
  occurs with bad WSDL and the folks at www.xmethods.net were happy to fix their
  WSDL, we don't need this patch.
  
  WSDL4J should still fix this (probably by raising an exception) but it's out of our
  hands since the WSDL4J structures don't present any sort of order for us to check.
  
  Revision  Changes    Path
  1.3       +1 -5      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaInterfaceWriter.java
  
  Index: JavaInterfaceWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaInterfaceWriter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavaInterfaceWriter.java	10 Jan 2002 20:08:51 -0000	1.2
  +++ JavaInterfaceWriter.java	24 Jan 2002 18:02:29 -0000	1.3
  @@ -92,11 +92,7 @@
       protected void writeFileBody() throws IOException {
           pw.println("public interface " + className + " extends java.rmi.Remote {");
   
  -        // Remove Duplicates - happens with only a few WSDL's. No idea why!!! 
  -        // (like http://www.xmethods.net/tmodels/InteropTest.wsdl) 
  -        // TODO: Remove this patch...
  -        // NOTE from RJB:  this is a WSDL4J bug and the WSDL4J guys have been notified.
  -        Iterator operations = (new HashSet(portType.getOperations())).iterator();
  +        Iterator operations = portType.getOperations().iterator();
           while(operations.hasNext()) {
               Operation operation = (Operation) operations.next();
               writeOperation(operation);
  
  
  
  1.16      +1 -5      xml-axis/java/src/org/apache/axis/wsdl/toJava/SymbolTable.java
  
  Index: SymbolTable.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/SymbolTable.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- SymbolTable.java	23 Jan 2002 17:53:05 -0000	1.15
  +++ SymbolTable.java	24 Jan 2002 18:02:29 -0000	1.16
  @@ -747,11 +747,7 @@
               if (!portType.isUndefined()) {
                   HashMap parameters = new HashMap();
   
  -                // Remove Duplicates - happens with only a few WSDL's. No idea why!!! 
  -                // (like http://www.xmethods.net/tmodels/InteropTest.wsdl) 
  -                // TODO: Remove this patch...
  -                // NOTE from RJB:  this is a WSDL4J bug and the WSDL4J guys have been notified.
  -                Iterator operations = (new HashSet(portType.getOperations())).iterator();
  +                Iterator operations = portType.getOperations().iterator();
    
                   while(operations.hasNext()) {
                       Operation operation = (Operation) operations.next();