axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: xml-axis/java/test/wsdl Wsdl2javaTestSuite.xml
Date Thu, 25 Oct 2001 17:08:51 GMT
dims        01/10/25 10:08:51

  Modified:    java/src/org/apache/axis/wsdl Emitter.java
               java/test/wsdl Wsdl2javaTestSuite.xml
  Log:
  Added http://www.xmethods.net/tmodels/InteropTest.wsdl to the automated test. This is from
SOAPBuilders Interoperability Lab "Round 1" at http://www.xmethods.net/ilab/.
  
  TODO: Figure out why there duplicates and the remove the patch for it.
  
  Revision  Changes    Path
  1.81      +8 -4      xml-axis/java/src/org/apache/axis/wsdl/Emitter.java
  
  Index: Emitter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Emitter.java,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- Emitter.java	2001/10/25 14:54:19	1.80
  +++ Emitter.java	2001/10/25 17:08:51	1.81
  @@ -87,6 +87,8 @@
   import java.net.URL;
   import java.util.ArrayList;
   import java.util.Collection;
  +import java.util.Collections;
  +import java.util.Comparator;
   import java.util.HashMap;
   import java.util.HashSet;
   import java.util.Iterator;
  @@ -464,10 +466,12 @@
           interfacePW.println("public interface " + nameValue + " extends java.rmi.Remote
{");
   
           HashMap portTypeInfo = new HashMap();
  -        List operations = portType.getOperations();
  -
  -        for (int i = 0; i < operations.size(); ++i) {
  -            Operation operation = (Operation) operations.get(i);
  +        // Remove Duplicates - happens with only a few WSDL's. No idea why!!! 
  +        // (like http://www.xmethods.net/tmodels/InteropTest.wsdl) 
  +        // TODO: Remove this patch...
  +        Iterator operations = (new HashSet(portType.getOperations())).iterator();
  +        while(operations.hasNext()) {
  +            Operation operation = (Operation) operations.next();
               Parameters operationInfo = writeOperation(operation, portType.getQName().getNamespaceURI(),
interfacePW);
   
               portTypeInfo.put(operation, operationInfo);
  
  
  
  1.7       +16 -0     xml-axis/java/test/wsdl/Wsdl2javaTestSuite.xml
  
  Index: Wsdl2javaTestSuite.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/Wsdl2javaTestSuite.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Wsdl2javaTestSuite.xml	2001/10/25 14:39:42	1.6
  +++ Wsdl2javaTestSuite.xml	2001/10/25 17:08:51	1.7
  @@ -16,17 +16,33 @@
     </taskdef>
   
     <target name="main">
  +
  +    <!-- AddressBook Sample -->
       <wsdl2java url="samples/addr/AddressBook.wsdl"
                  deployscope="session"
                  output="build/work"
                  testcase="no">
           <mapping namespace="urn:AddressFetcher2" package="samples.addr"/>
       </wsdl2java>
  +
  +    <!-- InOut Sample -->
       <wsdl2java url="test/inout/inout.wsdl"
                  output="build/work"
                  testcase="no">
           <mapping namespace="http://www.ibm.com/inout" package="test.inout"/>
       </wsdl2java>
  +
  +    <!-- SOAPBuilders Interoperability Lab "Round 1" -->
  +    <!--     http://www.xmethods.net/ilab/           -->
  +    <wsdl2java url="http://www.xmethods.net/tmodels/InteropTest.wsdl"
  +               output="build/work"
  +               testcase="no">
  +        <mapping namespace="http://soapinterop.org/" package="net.xmethods"/>
  +        <mapping namespace="http://soapinterop.org/xsd" package="net.xmethods"/>
  +    </wsdl2java>
  +
  +    <!-- SOAPBuilders Interoperability Lab "Round 2" -->
  +    <!--     http://www.whitemesa.com/interop.htm    -->
       <wsdl2java url="http://www.whitemesa.com/interop/InteropTest.wsdl"
                  output="build/work"
                  testcase="no">
  
  
  

Mime
View raw message