axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bu...@apache.org
Subject cvs commit: xml-axis/java/test/wsdl/types ComprehensiveTypes.wsdl
Date Wed, 12 Dec 2001 20:53:38 GMT
butek       01/12/12 12:53:38

  Modified:    java     build.xml
               java/src/org/apache/axis/wsdl/toJava SchemaUtils.java
                        SymbolTable.java
               java/test/wsdl/types ComprehensiveTypes.wsdl
  Log:
  More comprehensive types to test....
  
  Revision  Changes    Path
  1.94      +1 -0      xml-axis/java/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/build.xml,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- build.xml	2001/12/10 23:22:02	1.93
  +++ build.xml	2001/12/12 20:53:38	1.94
  @@ -273,6 +273,7 @@
         <exclude name="test/arrays/*.java" />
         <exclude name="test/refattr/*.java" />
         <exclude name="test/*/impl/*.java" />
  +      <exclude name="test/wsdl/types/*.java"/>
         <exclude name="test/wsdl/Wsdl2javaTestSuite.java" unless="servlet.present"/>
         <exclude name="test/md5attach/*.java" unless="attachments.present"/>
       </javac>
  
  
  
  1.2       +1 -1      xml-axis/java/src/org/apache/axis/wsdl/toJava/SchemaUtils.java
  
  Index: SchemaUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/SchemaUtils.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SchemaUtils.java	2001/12/11 15:08:47	1.1
  +++ SchemaUtils.java	2001/12/12 20:53:38	1.2
  @@ -181,7 +181,7 @@
                               typeAttr = true;
                           if (nodeType == null) { // The element may use an anonymous type
                               nodeType = nodeName;
  -                            typeAttr = true;
  +                            typeAttr = false;
                           }
   
                           Type Type = (Type) symbolTable.getTypeEntry(nodeType, !typeAttr);
  
  
  
  1.2       +6 -3      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SymbolTable.java	2001/12/11 15:08:47	1.1
  +++ SymbolTable.java	2001/12/12 20:53:38	1.2
  @@ -422,7 +422,10 @@
                           symbolTablePut(new BaseJavaType(qName));
                       }
                       else if (isElement) {
  -                        symbolTablePut(new ElementType(qName, getJavaName(qName), node));
  +                        ElementType element = new ElementType(
  +                                qName, getJavaName(qName), node);
  +                        symbolTablePut(element);
  +                        element.setShouldEmit(true);
                       }
                       else {
                           symbolTablePut(new DefinedType(qName, getJavaName(qName), node));
  @@ -541,7 +544,7 @@
                   // 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();
  -
  + 
                   while(operations.hasNext()) {
                       Operation operation = (Operation) operations.next();
                       String namespace = portType.getQName().getNamespaceURI();
  @@ -924,7 +927,7 @@
           if (addImports || node == null || node.getOwnerDocument() == doc) {
               entry.setIsReferenced(true);
               if (entry instanceof ElementType) {
  -                QName referentName = Utils.getNodeTypeRefQName(entry.getNode());
  +                QName referentName = Utils.getNodeTypeRefQName(node);
                   if (referentName != null) {
                       // Discover whether type is from a type= or ref=/element=
                       boolean typeAttr = false;
  
  
  
  1.3       +223 -0    xml-axis/java/test/wsdl/types/ComprehensiveTypes.wsdl
  
  Index: ComprehensiveTypes.wsdl
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/types/ComprehensiveTypes.wsdl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ComprehensiveTypes.wsdl	2001/12/11 16:43:28	1.2
  +++ ComprehensiveTypes.wsdl	2001/12/12 20:53:38	1.3
  @@ -8,6 +8,7 @@
       xmlns:xsd="http://www.w3.org/2001/XMLSchema"
       xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
       xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
  +    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
       xmlns="http://schemas.xmlsoap.org/wsdl/">
   
     <!-- type defs -->
  @@ -24,6 +25,14 @@
           </xsd:restriction>
         </xsd:simpleType>
   
  +      <xsd:complexType name="array">
  +        <xsd:complexContent>
  +          <xsd:restriction base="soapenc:Array">
  +            <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:string[]"/>
  +          </xsd:restriction>
  +        </xsd:complexContent>
  +      </xsd:complexType>
  +
         <xsd:complexType name="complexAll">
           <xsd:all>
             <xsd:element name="areaCode" type="xsd:int"/>
  @@ -40,6 +49,33 @@
           </xsd:sequence>
         </xsd:complexType>
   
  +      <xsd:element name="elemWComplex">
  +        <xsd:complexType>
  +          <xsd:all>
  +            <xsd:element name="one" type="xsd:string"/>
  +          </xsd:all>
  +        </xsd:complexType>
  +      </xsd:element>
  +
  +      <xsd:complexType name="complexWComplex">
  +        <xsd:sequence>
  +          <xsd:element name="stock_quote">
  +            <xsd:complexType>
  +              <xsd:sequence>
  +                <xsd:element name="symbol" type="xsd:string"/>
  +                <xsd:element name="time" type="xsd:string"/>
  +                <xsd:element name="last" type="xsd:string"/>
  +                <xsd:element name="change" type="xsd:string"/>
  +                <xsd:element name="pctchange" type="xsd:string"/>
  +                <xsd:element name="bid" type="xsd:string"/>
  +                <xsd:element name="ask" type="xsd:string"/>
  +              </xsd:sequence>
  +            </xsd:complexType>
  +          </xsd:element>
  +          <xsd:element name="outside" type="xsd:int"/>
  +        </xsd:sequence>
  +      </xsd:complexType>
  +
       </xsd:schema>
     </types>
   
  @@ -75,6 +111,10 @@
       <part name="enum" type="typens:enum"/>
     </message>
   
  +  <message name="array">
  +    <part name="array" type="typens:array"/>
  +  </message>
  +
     <message name="complexAll">
       <part name="complexAll" type="typens:complexAll"/>
     </message>
  @@ -83,6 +123,14 @@
       <part name="complexSequence" type="typens:complexSequence"/>
     </message>
   
  +  <message name="elemWComplex">
  +    <part name="elemWComplex" element="typens:elemWComplex"/>
  +  </message>
  +
  +  <message name="complexWComplex">
  +    <part name="complexWComplex" type="typens:complexWComplex"/>
  +  </message>
  +
     <!-- port type declns -->
     <portType name="TypeTest">
       <operation name="allPrimitivesIn">
  @@ -109,6 +157,20 @@
         <input message="tns:empty"/>
         <output message="tns:enum"/>
       </operation>
  +<!--
  +    <operation name="arrayIn">
  +      <input message="tns:array"/>
  +      <output message="tns:empty"/>
  +    </operation>
  +    <operation name="arrayInout">
  +      <input message="tns:array"/>
  +      <output message="tns:array"/>
  +    </operation>
  +    <operation name="arrayOut">
  +      <input message="tns:empty"/>
  +      <output message="tns:array"/>
  +    </operation>
  +-->
       <operation name="complexAllIn">
         <input message="tns:complexAll"/>
         <output message="tns:empty"/>
  @@ -133,6 +195,30 @@
         <input message="tns:empty"/>
         <output message="tns:complexSequence"/>
       </operation>
  +    <operation name="elemWComplexIn">
  +      <input message="tns:elemWComplex"/>
  +      <output message="tns:empty"/>
  +    </operation>
  +    <operation name="elemWComplexInout">
  +      <input message="tns:elemWComplex"/>
  +      <output message="tns:elemWComplex"/>
  +    </operation>
  +    <operation name="elemWComplexOut">
  +      <input message="tns:empty"/>
  +      <output message="tns:elemWComplex"/>
  +    </operation>
  +    <operation name="complexWComplexIn">
  +      <input message="tns:complexWComplex"/>
  +      <output message="tns:empty"/>
  +    </operation>
  +    <operation name="complexWComplexInout">
  +      <input message="tns:complexWComplex"/>
  +      <output message="tns:complexWComplex"/>
  +    </operation>
  +    <operation name="complexWComplexOut">
  +      <input message="tns:empty"/>
  +      <output message="tns:complexWComplex"/>
  +    </operation>
     </portType>
   
     <!-- binding declns -->
  @@ -230,6 +316,53 @@
               encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
         </output>
       </operation>
  +<!--
  +    <operation name="arrayIn">
  +      <soap:operation soapAction=""/>
  +      <input>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </input>
  +      <output>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </output>
  +    </operation>
  +    <operation name="arrayInout">
  +      <soap:operation soapAction=""/>
  +      <input>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </input>
  +      <output>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </output>
  +    </operation>
  +    <operation name="arrayOut">
  +      <soap:operation soapAction=""/>
  +      <input>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </input>
  +      <output>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </output>
  +    </operation>
  +-->
       <operation name="complexAllIn">
         <soap:operation soapAction=""/>
         <input>
  @@ -306,6 +439,96 @@
         </output>
       </operation>
       <operation name="complexSequenceOut">
  +      <soap:operation soapAction=""/>
  +      <input>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </input>
  +      <output>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </output>
  +    </operation>
  +    <operation name="elemWComplexIn">
  +      <soap:operation soapAction=""/>
  +      <input>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </input>
  +      <output>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </output>
  +    </operation>
  +    <operation name="elemWComplexInout">
  +      <soap:operation soapAction=""/>
  +      <input>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </input>
  +      <output>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </output>
  +    </operation>
  +    <operation name="elemWComplexOut">
  +      <soap:operation soapAction=""/>
  +      <input>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </input>
  +      <output>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </output>
  +    </operation>
  +    <operation name="complexWComplexIn">
  +      <soap:operation soapAction=""/>
  +      <input>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </input>
  +      <output>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </output>
  +    </operation>
  +    <operation name="complexWComplexInout">
  +      <soap:operation soapAction=""/>
  +      <input>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </input>
  +      <output>
  +        <soap:body
  +            use="encoded"
  +            namespace=""
  +            encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
  +      </output>
  +    </operation>
  +    <operation name="complexWComplexOut">
         <soap:operation soapAction=""/>
         <input>
           <soap:body
  
  
  

Mime
View raw message