axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: ws-axis/java/tools/org/apache/axis/tools/ant/wsdl Java2WsdlAntTask.java TypeMappingVersionEnum.java Wsdl2javaAntTask.java
Date Tue, 18 Jan 2005 03:38:03 GMT
dims        2005/01/17 19:38:03

  Modified:    java/src/org/apache/axis/encoding
                        DefaultTypeMappingImpl.java
               java/src/org/apache/axis/wsdl/fromJava Emitter.java
               java/src/org/apache/axis/wsdl/toJava Emitter.java
               java/src/org/apache/axis/wsdl Java2WSDL.java WSDL2Java.java
               java/tools/org/apache/axis/tools/ant/wsdl
                        Java2WsdlAntTask.java TypeMappingVersionEnum.java
                        Wsdl2javaAntTask.java
  Added:       java/test/wsdl/schema2 build.xml schema2.wsdl
                        Schema2ServiceSoapBindingImpl.java
                        Schema2ServiceTestCase.java
               java/src/org/apache/axis/encoding
                        DefaultJAXRPC11TypeMappingImpl.java
  Log:
  - Move JAXRPC11 stuff into its own little typemappingimpl ("1.3")
  - Move duplicate code for creating TypeMappingImpl in J2W Ant Task and Command line into Emitter
  - Remove the old commented out jaxrpc11mappings code
  - Eliminated need for the axis.jaxrpc11Compliance when running the J2W/W2J ant/commandline tools.
  - Adding a sample (start from WSDL) for testing the new JAXRPC11TypeMappingImpl.
  
  TODO:
  - Looking that the wire traces, some of them have weird xsi:types, need to fix them, before updating the docs
  - Need be able to switch axis.jaxrpc11Compliance runtime flag on for specific services or atleast from AxisProperties
  - Need to seriously fix which Defautl*TypeMappingImpl gets created under what conditions.
  - Need to get rid of the axis.jaxrpc11Compliance system property (codegen more stuff?)
  
  Revision  Changes    Path
  1.1                  ws-axis/java/test/wsdl/schema2/build.xml
  
  Index: build.xml
  ===================================================================
  <?xml version="1.0" ?>
  <!DOCTYPE project [
          <!ENTITY properties SYSTEM "file:../../../xmls/properties.xml">
          <!ENTITY paths  SYSTEM "file:../../../xmls/path_refs.xml">
          <!ENTITY taskdefs SYSTEM "file:../../../xmls/taskdefs.xml">
          <!ENTITY taskdefs_post_compile SYSTEM "file:../../../xmls/taskdefs_post_compile.xml">
          <!ENTITY targets SYSTEM "file:../../../xmls/targets.xml">
  ]>
  
  <!-- ===================================================================
  <description>
     Test/Sample Component file for Axis
  
  Notes:
     This is a build file for use with the Jakarta Ant build tool.
  
  Prerequisites:
  
     jakarta-ant from http://jakarta.apache.org
  
  Build Instructions:
     To compile
          ant compile
     To execute
          ant run
  
  Author:
    Matt Seibert mseibert@us.ibm.com
  
  Copyright:
    Copyright (c) 2002-2003 Apache Software Foundation.
  </description>
  ==================================================================== -->
  
  <project default="compile">
  
  <property name="axis.home" location="../../.." />
  <property name="componentName" value="test/wsdl/schema2" />
          &properties;
          &paths;
          &taskdefs;
          &taskdefs_post_compile;
          &targets;
  
  <target name="clean">
      <echo message="Removing ${build.dir}/classes/${componentName} and ${build.dir}/work/${componentName}" />
      <delete dir="${build.dir}/classes/${componentName}"/>
      <delete dir="${build.dir}/work/${componentName}"/>
  </target>
  
  <target name="copy" depends="setenv"/>
  
  <target name="compile" depends="copy">
    <echo message="Compiling test.wsdl.schema2"/>
      <!-- Schema2 Sample Test -->
      <wsdl2java url="${axis.home}/test/wsdl/schema2/schema2.wsdl"
                 output="${axis.home}/build/work"
                 deployscope="session"
                 serverSide="yes"
                 skeletonDeploy="yes"
                 typemappingversion="1.3"
                 testcase="yes">
          <mapping namespace="urn:CityBBB" package="test.wsdl.schema2"/>
      </wsdl2java>
  
      <copy todir="${build.dir}/work/test/wsdl/schema2" overwrite="yes">
        <fileset dir="${axis.home}/test/wsdl/schema2">
          <include name="*TestCase.java"/>
          <include name="*Impl.java"/>
        </fileset>
      </copy>
  
      <javac srcdir="${build.dir}/work" destdir="${build.dest}" nowarn="${nowarn}" source="${source}" fork="${javac.fork}"
             debug="${debug}">
        <classpath refid="classpath" />
        <include name="test/wsdl/schema2/*.java" />
      </javac>
  
  </target>
  
  <target name="run" >
    <antcall target="execute-Component" />
  </target>
  
  </project>
  
  
  
  1.1                  ws-axis/java/test/wsdl/schema2/schema2.wsdl
  
  Index: schema2.wsdl
  ===================================================================
  <wsdl:definitions xmlns:impl="urn:schema2.wsdl.test" xmlns:intf="urn:schema2.wsdl.test" 
                    xmlns:tns1="urn:schema2.wsdl.test" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
                    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" 
                    xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:schema2.wsdl.test">
      <wsdl:types>
          <schema elementFormDefault="qualified" targetNamespace="urn:schema2.wsdl.test" xmlns="http://www.w3.org/2001/XMLSchema">
              <element name="languageElem" type="xsd:language"/>
              <element name="languageElem1" type="xsd:language"/>
              <element name="tokenElem" type="xsd:token"/>
              <element name="tokenElem1" type="xsd:token"/>
              <element name="nameElem" type="xsd:Name"/>
              <element name="nameElem1" type="xsd:Name"/>
              <element name="NCNameElem" type="xsd:NCName"/>
              <element name="NCNameElem1" type="xsd:NCName"/>
              <element name="IDElem" type="xsd:ID"/>
              <element name="IDElem1" type="xsd:ID"/>
              <element name="UnsignedShort" type="xsd:unsignedShort"/>
              <element name="UnsignedShort1" type="xsd:unsignedShort"/>
              <element name="UnsignedInt" type="xsd:unsignedInt"/>
              <element name="UnsignedInt1" type="xsd:unsignedInt"/>
              <element name="UnsignedByte" type="xsd:unsignedByte"/>
              <element name="UnsignedByte1" type="xsd:unsignedByte"/>
              <element name="UnsignedLong" type="xsd:unsignedLong"/>
              <element name="UnsignedLong1" type="xsd:unsignedLong"/>
              <element name="NonPositiveInteger" type="xsd:nonPositiveInteger"/>
              <element name="NonPositiveInteger1" type="xsd:nonPositiveInteger"/>
              <element name="NonNegativeInteger" type="xsd:nonNegativeInteger"/>
              <element name="NonNegativeInteger1" type="xsd:nonNegativeInteger"/>
              <element name="PositiveInteger" type="xsd:positiveInteger"/>
              <element name="PositiveInteger1" type="xsd:positiveInteger"/>
              <element name="NegativeInteger" type="xsd:negativeInteger"/>
              <element name="NegativeInteger1" type="xsd:negativeInteger"/>
              <element name="Time" type="xsd:time"/>
              <element name="Time1" type="xsd:time"/>
              <element name="Date" type="xsd:date"/>
              <element name="Date1" type="xsd:date"/>
          </schema>
      </wsdl:types>
      <wsdl:message name="echoDateTestRequest">
          <wsdl:part name="Date" element="tns1:Date"/>
      </wsdl:message>
      <wsdl:message name="echoPositiveIntegerTestResponse">
          <wsdl:part name="PositiveInteger" element="tns1:PositiveInteger1"/>
      </wsdl:message>
      <wsdl:message name="echoUnsignedLongTestRequest">
          <wsdl:part name="UnsignedLong" element="tns1:UnsignedLong"/>
      </wsdl:message>
      <wsdl:message name="echoNonNegativeIntegerTestResponse">
          <wsdl:part name="NonNegativeInteger" element="tns1:NonNegativeInteger1"/>
      </wsdl:message>
      <wsdl:message name="echoTokenTypeTestRequest">
          <wsdl:part name="tokenElem" element="tns1:tokenElem"/>
      </wsdl:message>
      <wsdl:message name="echoUnsignedByteTestResponse">
          <wsdl:part name="UnsignedByte" element="tns1:UnsignedByte1"/>
      </wsdl:message>
      <wsdl:message name="echoNonPositiveIntegerTestRequest">
          <wsdl:part name="NonPositiveInteger" element="tns1:NonPositiveInteger"/>
      </wsdl:message>
      <wsdl:message name="echoNegativeIntegerTestResponse">
          <wsdl:part name="NegativeInteger" element="tns1:NegativeInteger1"/>
      </wsdl:message>
      <wsdl:message name="echoTokenTypeTestResponse">
          <wsdl:part name="tokenElem" element="tns1:tokenElem1"/>
      </wsdl:message>
      <wsdl:message name="echoIDTypeTestRequest">
          <wsdl:part name="IDElem" element="tns1:IDElem"/>
      </wsdl:message>
      <wsdl:message name="echoUnsignedIntTestResponse">
          <wsdl:part name="UnsignedInt" element="tns1:UnsignedInt1"/>
      </wsdl:message>
      <wsdl:message name="echoDateTestResponse">
          <wsdl:part name="Date" element="tns1:Date1"/>
      </wsdl:message>
      <wsdl:message name="echoUnsignedShortTestResponse">
          <wsdl:part name="UnsignedShort" element="tns1:UnsignedShort1"/>
      </wsdl:message>
      <wsdl:message name="echoTimeTestRequest">
          <wsdl:part name="Time" element="tns1:Time"/>
      </wsdl:message>
      <wsdl:message name="echoNameTypeTestResponse">
          <wsdl:part name="nameElem" element="tns1:nameElem1"/>
      </wsdl:message>
      <wsdl:message name="echoNonNegativeIntegerTestRequest">
          <wsdl:part name="NonNegativeInteger" element="tns1:NonNegativeInteger"/>
      </wsdl:message>
      <wsdl:message name="echoNCNameTypeTestRequest">
          <wsdl:part name="NCNameElem" element="tns1:NCNameElem"/>
      </wsdl:message>
      <wsdl:message name="echoNegativeIntegerTestRequest">
          <wsdl:part name="NegativeInteger" element="tns1:NegativeInteger"/>
      </wsdl:message>
      <wsdl:message name="echoUnsignedLongTestResponse">
          <wsdl:part name="UnsignedLong" element="tns1:UnsignedLong1"/>
      </wsdl:message>
      <wsdl:message name="echoLanguageTypeTestRequest">
          <wsdl:part name="languageElem" element="tns1:languageElem"/>
      </wsdl:message>
      <wsdl:message name="echoNonPositiveIntegerTestResponse">
          <wsdl:part name="NonPositiveInteger" element="tns1:NonPositiveInteger1"/>
      </wsdl:message>
      <wsdl:message name="echoTimeTestResponse">
          <wsdl:part name="Time" element="tns1:Time1"/>
      </wsdl:message>
      <wsdl:message name="echoIDTypeTestResponse">
          <wsdl:part name="IDElem" element="tns1:IDElem1"/>
      </wsdl:message>
      <wsdl:message name="echoUnsignedIntTestRequest">
          <wsdl:part name="UnsignedInt" element="tns1:UnsignedInt"/>
      </wsdl:message>
      <wsdl:message name="echoNCNameTypeTestResponse">
          <wsdl:part name="NCNameElem" element="tns1:NCNameElem1"/>
      </wsdl:message>
      <wsdl:message name="echoNameTypeTestRequest">
          <wsdl:part name="nameElem" element="tns1:nameElem"/>
      </wsdl:message>
      <wsdl:message name="echoUnsignedByteTestRequest">
          <wsdl:part name="UnsignedByte" element="tns1:UnsignedByte"/>
      </wsdl:message>
      <wsdl:message name="echoLanguageTypeTestResponse">
          <wsdl:part name="languageElem" element="tns1:languageElem1"/>
      </wsdl:message>
      <wsdl:message name="echoUnsignedShortTestRequest">
          <wsdl:part name="UnsignedShort" element="tns1:UnsignedShort"/>
      </wsdl:message>
      <wsdl:message name="echoPositiveIntegerTestRequest">
          <wsdl:part name="PositiveInteger" element="tns1:PositiveInteger"/>
      </wsdl:message>
      <wsdl:portType name="Schema2Test">
          <wsdl:operation name="echoLanguageTypeTest" parameterOrder="languageElem">
              <wsdl:input name="echoLanguageTypeTestRequest" message="impl:echoLanguageTypeTestRequest"/>
              <wsdl:output name="echoLanguageTypeTestResponse" message="impl:echoLanguageTypeTestResponse"/>
          </wsdl:operation>
          <wsdl:operation name="echoTokenTypeTest" parameterOrder="tokenElem">
              <wsdl:input name="echoTokenTypeTestRequest" message="impl:echoTokenTypeTestRequest"/>
              <wsdl:output name="echoTokenTypeTestResponse" message="impl:echoTokenTypeTestResponse"/>
          </wsdl:operation>
          <wsdl:operation name="echoNameTypeTest" parameterOrder="nameElem">
              <wsdl:input name="echoNameTypeTestRequest" message="impl:echoNameTypeTestRequest"/>
              <wsdl:output name="echoNameTypeTestResponse" message="impl:echoNameTypeTestResponse"/>
          </wsdl:operation>
          <wsdl:operation name="echoNCNameTypeTest" parameterOrder="NCNameElem">
              <wsdl:input name="echoNCNameTypeTestRequest" message="impl:echoNCNameTypeTestRequest"/>
              <wsdl:output name="echoNCNameTypeTestResponse" message="impl:echoNCNameTypeTestResponse"/>
          </wsdl:operation>
          <wsdl:operation name="echoIDTypeTest" parameterOrder="IDElem">
              <wsdl:input name="echoIDTypeTestRequest" message="impl:echoIDTypeTestRequest"/>
              <wsdl:output name="echoIDTypeTestResponse" message="impl:echoIDTypeTestResponse"/>
          </wsdl:operation>
          <wsdl:operation name="echoUnsignedShortTest" parameterOrder="UnsignedShort">
              <wsdl:input name="echoUnsignedShortTestRequest" message="impl:echoUnsignedShortTestRequest"/>
              <wsdl:output name="echoUnsignedShortTestResponse" message="impl:echoUnsignedShortTestResponse"/>
          </wsdl:operation>
          <wsdl:operation name="echoUnsignedIntTest" parameterOrder="UnsignedInt">
              <wsdl:input name="echoUnsignedIntTestRequest" message="impl:echoUnsignedIntTestRequest"/>
              <wsdl:output name="echoUnsignedIntTestResponse" message="impl:echoUnsignedIntTestResponse"/>
          </wsdl:operation>
          <wsdl:operation name="echoUnsignedByteTest" parameterOrder="UnsignedByte">
              <wsdl:input name="echoUnsignedByteTestRequest" message="impl:echoUnsignedByteTestRequest"/>
              <wsdl:output name="echoUnsignedByteTestResponse" message="impl:echoUnsignedByteTestResponse"/>
          </wsdl:operation>
          <wsdl:operation name="echoUnsignedLongTest" parameterOrder="UnsignedLong">
              <wsdl:input name="echoUnsignedLongTestRequest" message="impl:echoUnsignedLongTestRequest"/>
              <wsdl:output name="echoUnsignedLongTestResponse" message="impl:echoUnsignedLongTestResponse"/>
          </wsdl:operation>
          <wsdl:operation name="echoNonPositiveIntegerTest" parameterOrder="NonPositiveInteger">
              <wsdl:input name="echoNonPositiveIntegerTestRequest" message="impl:echoNonPositiveIntegerTestRequest"/>
              <wsdl:output name="echoNonPositiveIntegerTestResponse" message="impl:echoNonPositiveIntegerTestResponse"/>
          </wsdl:operation>
          <wsdl:operation name="echoNonNegativeIntegerTest" parameterOrder="NonNegativeInteger">
              <wsdl:input name="echoNonNegativeIntegerTestRequest" message="impl:echoNonNegativeIntegerTestRequest"/>
              <wsdl:output name="echoNonNegativeIntegerTestResponse" message="impl:echoNonNegativeIntegerTestResponse"/>
          </wsdl:operation>
          <wsdl:operation name="echoPositiveIntegerTest" parameterOrder="PositiveInteger">
              <wsdl:input name="echoPositiveIntegerTestRequest" message="impl:echoPositiveIntegerTestRequest"/>
              <wsdl:output name="echoPositiveIntegerTestResponse" message="impl:echoPositiveIntegerTestResponse"/>
          </wsdl:operation>
          <wsdl:operation name="echoNegativeIntegerTest" parameterOrder="NegativeInteger">
              <wsdl:input name="echoNegativeIntegerTestRequest" message="impl:echoNegativeIntegerTestRequest"/>
              <wsdl:output name="echoNegativeIntegerTestResponse" message="impl:echoNegativeIntegerTestResponse"/>
          </wsdl:operation>
          <wsdl:operation name="echoTimeTest" parameterOrder="Time">
              <wsdl:input name="echoTimeTestRequest" message="impl:echoTimeTestRequest"/>
              <wsdl:output name="echoTimeTestResponse" message="impl:echoTimeTestResponse"/>
          </wsdl:operation>
          <wsdl:operation name="echoDateTest" parameterOrder="Date">
              <wsdl:input name="echoDateTestRequest" message="impl:echoDateTestRequest"/>
              <wsdl:output name="echoDateTestResponse" message="impl:echoDateTestResponse"/>
          </wsdl:operation>
      </wsdl:portType>
      <wsdl:binding name="Schema2ServiceSoapBinding" type="impl:Schema2Test">
          <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
          <wsdl:operation name="echoLanguageTypeTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
          <wsdl:operation name="echoTokenTypeTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
          <wsdl:operation name="echoNameTypeTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
          <wsdl:operation name="echoNCNameTypeTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
          <wsdl:operation name="echoIDTypeTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
          <wsdl:operation name="echoUnsignedShortTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
          <wsdl:operation name="echoUnsignedIntTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
          <wsdl:operation name="echoUnsignedByteTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
          <wsdl:operation name="echoUnsignedLongTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
          <wsdl:operation name="echoNonPositiveIntegerTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
          <wsdl:operation name="echoNonNegativeIntegerTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
          <wsdl:operation name="echoPositiveIntegerTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
          <wsdl:operation name="echoNegativeIntegerTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
          <wsdl:operation name="echoTimeTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
          <wsdl:operation name="echoDateTest">
              <wsdlsoap:operation/>
              <wsdl:input>
                  <wsdlsoap:body use="literal"/>
              </wsdl:input>
              <wsdl:output>
                  <wsdlsoap:body use="literal"/>
              </wsdl:output>
          </wsdl:operation>
      </wsdl:binding>
      <wsdl:service name="Schema2Service">
          <wsdl:port name="Schema2Service" binding="impl:Schema2ServiceSoapBinding">
              <wsdlsoap:address location="http://srida01l:8080/axis/services/Schema2Service"/>
          </wsdl:port>
      </wsdl:service>
  </wsdl:definitions>
  
  
  
  1.1                  ws-axis/java/test/wsdl/schema2/Schema2ServiceSoapBindingImpl.java
  
  Index: Schema2ServiceSoapBindingImpl.java
  ===================================================================
  /**
   * Schema2ServiceSoapBindingImpl.java
   *
   * This file was auto-generated from WSDL
   * by the Apache Axis 1.2RC2 Jan 14, 2005 (05:38:50 EST) WSDL2Java emitter.
   */
  
  package test.wsdl.schema2;
  
  public class Schema2ServiceSoapBindingImpl implements test.wsdl.schema2.Schema2Test{
      public java.lang.String echoLanguageTypeTest(java.lang.String languageElem) throws java.rmi.RemoteException {
          return languageElem;
      }
  
      public java.lang.String echoTokenTypeTest(java.lang.String tokenElem) throws java.rmi.RemoteException {
          return tokenElem;
      }
  
      public java.lang.String echoNameTypeTest(java.lang.String nameElem) throws java.rmi.RemoteException {
          return nameElem;
      }
  
      public java.lang.String echoNCNameTypeTest(java.lang.String NCNameElem) throws java.rmi.RemoteException {
          return NCNameElem;
      }
  
      public java.lang.String echoIDTypeTest(java.lang.String IDElem) throws java.rmi.RemoteException {
          return IDElem;
      }
  
      public int echoUnsignedShortTest(int unsignedShort) throws java.rmi.RemoteException {
          return unsignedShort;
      }
  
      public long echoUnsignedIntTest(long unsignedInt) throws java.rmi.RemoteException {
          return unsignedInt;
      }
  
      public short echoUnsignedByteTest(short unsignedByte) throws java.rmi.RemoteException {
          return unsignedByte;
      }
  
      public java.math.BigInteger echoUnsignedLongTest(java.math.BigInteger unsignedLong) throws java.rmi.RemoteException {
          return unsignedLong;
      }
  
      public java.math.BigInteger echoNonPositiveIntegerTest(java.math.BigInteger nonPositiveInteger) throws java.rmi.RemoteException {
          return nonPositiveInteger;
      }
  
      public java.math.BigInteger echoNonNegativeIntegerTest(java.math.BigInteger nonNegativeInteger) throws java.rmi.RemoteException {
          return nonNegativeInteger;
      }
  
      public java.math.BigInteger echoPositiveIntegerTest(java.math.BigInteger positiveInteger) throws java.rmi.RemoteException {
          return positiveInteger;
      }
  
      public java.math.BigInteger echoNegativeIntegerTest(java.math.BigInteger negativeInteger) throws java.rmi.RemoteException {
          return null;
      }
  
      public java.util.Calendar echoTimeTest(java.util.Calendar time) throws java.rmi.RemoteException {
          return null;
      }
  
      public java.util.Calendar echoDateTest(java.util.Calendar date) throws java.rmi.RemoteException {
          return null;
      }
  
  }
  
  
  
  1.1                  ws-axis/java/test/wsdl/schema2/Schema2ServiceTestCase.java
  
  Index: Schema2ServiceTestCase.java
  ===================================================================
  /**
   * Schema2ServiceTestCase.java
   *
   * This file was auto-generated from WSDL
   * by the Apache Axis 1.2RC2 Jan 14, 2005 (05:38:50 EST) WSDL2Java emitter.
   */
  
  package test.wsdl.schema2;
  
  public class Schema2ServiceTestCase extends junit.framework.TestCase {
      public Schema2ServiceTestCase(java.lang.String name) {
          super(name);
      }
  
      public void testSchema2ServiceWSDL() throws Exception {
          javax.xml.rpc.ServiceFactory serviceFactory = javax.xml.rpc.ServiceFactory.newInstance();
          java.net.URL url = new java.net.URL(new test.wsdl.schema2.Schema2ServiceLocator().getSchema2ServiceAddress() + "?WSDL");
          javax.xml.rpc.Service service = serviceFactory.createService(url, new test.wsdl.schema2.Schema2ServiceLocator().getServiceName());
          assertTrue(service != null);
      }
  
      public void test1Schema2ServiceEchoLanguageTypeTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          java.lang.String value = null;
          value = binding.echoLanguageTypeTest(new java.lang.String("ABC"));
          // TBD - validate results
      }
  
      public void test2Schema2ServiceEchoTokenTypeTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          java.lang.String value = null;
          value = binding.echoTokenTypeTest(new java.lang.String("ABC"));
          // TBD - validate results
      }
  
      public void test3Schema2ServiceEchoNameTypeTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          java.lang.String value = null;
          value = binding.echoNameTypeTest(new java.lang.String("ABC"));
          // TBD - validate results
      }
  
      public void test4Schema2ServiceEchoNCNameTypeTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          java.lang.String value = null;
          value = binding.echoNCNameTypeTest(new java.lang.String("ABC"));
          // TBD - validate results
      }
  
      public void test5Schema2ServiceEchoIDTypeTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          java.lang.String value = null;
          value = binding.echoIDTypeTest(new java.lang.String("ABC"));
          // TBD - validate results
      }
  
      public void test6Schema2ServiceEchoUnsignedShortTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          int value = -3;
          value = binding.echoUnsignedShortTest(123);
          // TBD - validate results
      }
  
      public void test7Schema2ServiceEchoUnsignedIntTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          long value = -3;
          value = binding.echoUnsignedIntTest(234);
          // TBD - validate results
      }
  
      public void test8Schema2ServiceEchoUnsignedByteTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          short value = -3;
          value = binding.echoUnsignedByteTest((short)456);
          // TBD - validate results
      }
  
      public void test9Schema2ServiceEchoUnsignedLongTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          java.math.BigInteger value = null;
          value = binding.echoUnsignedLongTest(new java.math.BigInteger("567"));
          // TBD - validate results
      }
  
      public void test10Schema2ServiceEchoNonPositiveIntegerTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          java.math.BigInteger value = null;
          value = binding.echoNonPositiveIntegerTest(new java.math.BigInteger("678"));
          // TBD - validate results
      }
  
      public void test11Schema2ServiceEchoNonNegativeIntegerTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          java.math.BigInteger value = null;
          value = binding.echoNonNegativeIntegerTest(new java.math.BigInteger("8910"));
          // TBD - validate results
      }
  
      public void test12Schema2ServiceEchoPositiveIntegerTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          java.math.BigInteger value = null;
          value = binding.echoPositiveIntegerTest(new java.math.BigInteger("91011"));
          // TBD - validate results
      }
  
      public void test13Schema2ServiceEchoNegativeIntegerTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          java.math.BigInteger value = null;
          value = binding.echoNegativeIntegerTest(new java.math.BigInteger("111213"));
          // TBD - validate results
      }
  
      public void test14Schema2ServiceEchoTimeTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          java.util.Calendar value = null;
          value = binding.echoTimeTest(java.util.Calendar.getInstance());
          // TBD - validate results
      }
  
      public void test15Schema2ServiceEchoDateTest() throws Exception {
          test.wsdl.schema2.Schema2ServiceSoapBindingStub binding;
          try {
              binding = (test.wsdl.schema2.Schema2ServiceSoapBindingStub)
                            new test.wsdl.schema2.Schema2ServiceLocator().getSchema2Service();
          }
          catch (javax.xml.rpc.ServiceException jre) {
              if(jre.getLinkedCause()!=null)
                  jre.getLinkedCause().printStackTrace();
              throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught: " + jre);
          }
          assertNotNull("binding is null", binding);
  
          // Time out after a minute
          binding.setTimeout(60000);
  
          // Test operation
          java.util.Calendar value = null;
          value = binding.echoDateTest(java.util.Calendar.getInstance());
          // TBD - validate results
      }
  
  }
  
  
  
  1.85      +5 -54     ws-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java
  
  Index: DefaultTypeMappingImpl.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- DefaultTypeMappingImpl.java	10 Jan 2005 19:02:30 -0000	1.84
  +++ DefaultTypeMappingImpl.java	18 Jan 2005 03:38:02 -0000	1.85
  @@ -82,7 +82,11 @@
        */
       public static synchronized TypeMapping getSingleton() {
           if (tm == null) {
  -            tm = new DefaultTypeMappingImpl();
  +            if(AxisEngine.jaxrpc11Compliance) {
  +                tm = new DefaultJAXRPC11TypeMappingImpl();
  +            } else {
  +                tm = new DefaultTypeMappingImpl();
  +            }
           }
           return tm;
       }
  @@ -552,59 +556,6 @@
                                                Constants.XSD_SCHEMA)
           );
           
  -        if (AxisEngine.jaxrpc11Compliance) {
  -            // Table 4-1 of the JAXRPC 1.1 spec
  -            myRegisterSimple(Constants.XSD_UNSIGNEDINT, long.class);    
  -            myRegisterSimple(Constants.XSD_UNSIGNEDSHORT, int.class);    
  -            myRegisterSimple(Constants.XSD_UNSIGNEDBYTE, short.class);   
  -            myRegister(Constants.XSD_DATETIME,       java.util.Calendar.class,
  -                       new DateSerializerFactory(java.util.Calendar.class,
  -                                                 Constants.XSD_DATE),
  -                       new DateDeserializerFactory(java.util.Calendar.class,
  -                                                   Constants.XSD_DATE)
  -            );
  -            myRegister(Constants.XSD_DATE,       java.util.Calendar.class,
  -                       new DateSerializerFactory(java.util.Calendar.class,
  -                                                 Constants.XSD_DATE),
  -                       new DateDeserializerFactory(java.util.Calendar.class,
  -                                                   Constants.XSD_DATE)
  -            );
  -            myRegister(Constants.XSD_TIME,       java.util.Calendar.class,
  -                       new DateSerializerFactory(java.util.Calendar.class,
  -                                                 Constants.XSD_TIME),
  -                       new DateDeserializerFactory(java.util.Calendar.class,
  -                                                   Constants.XSD_TIME)
  -            );
  -            try {
  -                myRegisterSimple(Constants.XSD_ANYURI, Class.forName("java.net.URI"));
  -            } 
  -            catch (ClassNotFoundException e) {
  -                myRegisterSimple(Constants.XSD_ANYURI, java.lang.String.class);
  -            }
  -            
  -            // Table 4-2 of JAXRPC 1.1 spec
  -            myRegisterSimple(Constants.XSD_DURATION, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_YEARMONTH, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_YEAR, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_MONTHDAY, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_DAY, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_MONTH, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_NORMALIZEDSTRING, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_TOKEN, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_LANGUAGE, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_NAME, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_NCNAME, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_ID, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_NMTOKEN, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_NMTOKENS, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_STRING, java.lang.String.class);
  -            myRegisterSimple(Constants.XSD_NONPOSITIVEINTEGER, java.math.BigInteger.class);
  -            myRegisterSimple(Constants.XSD_NEGATIVEINTEGER, java.math.BigInteger.class);
  -            myRegisterSimple(Constants.XSD_NONNEGATIVEINTEGER, java.math.BigInteger.class);
  -            myRegisterSimple(Constants.XSD_UNSIGNEDLONG, java.math.BigInteger.class);
  -            myRegisterSimple(Constants.XSD_POSITIVEINTEGER, java.math.BigInteger.class);
  -        }
  -
           // Need this at the default TypeMapping level so that we can correctly
           // obtain the ArraySerializer when in doc/lit mode and only have a
           // Java class available (no XML type metadata) - see TypeMappingImpl
  
  
  
  1.1                  ws-axis/java/src/org/apache/axis/encoding/DefaultJAXRPC11TypeMappingImpl.java
  
  Index: DefaultJAXRPC11TypeMappingImpl.java
  ===================================================================
  /*
   * Copyright 2001-2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  package org.apache.axis.encoding;
  
  import org.apache.axis.Constants;
  import org.apache.axis.encoding.ser.DateDeserializerFactory;
  import org.apache.axis.encoding.ser.DateSerializerFactory;
  
  /**
   * This is the implementation of the axis Default JAX-RPC SOAP Encoding TypeMapping
   * See DefaultTypeMapping for more information.
   */
  public class DefaultJAXRPC11TypeMappingImpl extends DefaultTypeMappingImpl {
  
      private static DefaultJAXRPC11TypeMappingImpl tm = null;
  
      /**
       * Obtain the singleton default typemapping.
       */
      public static synchronized TypeMapping getSingleton() {
          if (tm == null) {
              tm = new DefaultJAXRPC11TypeMappingImpl();
          }
          return tm;
      }
  
      public static TypeMapping createWithDelegate() {
          TypeMapping ret = new DefaultJAXRPC11TypeMappingImpl();
          ret.setDelegate(DefaultTypeMappingImpl.getSingleton());
          return ret;
      }
  
      protected DefaultJAXRPC11TypeMappingImpl() {
          registerXSDTypes();
      }
  
      /**
       * Register the XSD data types in JAXRPC11 spec.
       */
      private void registerXSDTypes() {
          // Table 4-1 of the JAXRPC 1.1 spec
          myRegisterSimple(Constants.XSD_UNSIGNEDINT, long.class);
          myRegisterSimple(Constants.XSD_UNSIGNEDSHORT, int.class);
          myRegisterSimple(Constants.XSD_UNSIGNEDBYTE, short.class);
          myRegister(Constants.XSD_DATETIME, java.util.Calendar.class,
                  new DateSerializerFactory(java.util.Calendar.class,
                          Constants.XSD_DATE),
                  new DateDeserializerFactory(java.util.Calendar.class,
                          Constants.XSD_DATE));
          myRegister(Constants.XSD_DATE, java.util.Calendar.class,
                  new DateSerializerFactory(java.util.Calendar.class,
                          Constants.XSD_DATE),
                  new DateDeserializerFactory(java.util.Calendar.class,
                          Constants.XSD_DATE));
          myRegister(Constants.XSD_TIME, java.util.Calendar.class,
                  new DateSerializerFactory(java.util.Calendar.class,
                          Constants.XSD_TIME),
                  new DateDeserializerFactory(java.util.Calendar.class,
                          Constants.XSD_TIME));
          try {
              myRegisterSimple(Constants.XSD_ANYURI,
                      Class.forName("java.net.URI"));
          } catch (ClassNotFoundException e) {
              myRegisterSimple(Constants.XSD_ANYURI, java.lang.String.class);
          }
              
          // Table 4-2 of JAXRPC 1.1 spec
          myRegisterSimple(Constants.XSD_DURATION, java.lang.String.class);
          myRegisterSimple(Constants.XSD_YEARMONTH, java.lang.String.class);
          myRegisterSimple(Constants.XSD_YEAR, java.lang.String.class);
          myRegisterSimple(Constants.XSD_MONTHDAY, java.lang.String.class);
          myRegisterSimple(Constants.XSD_DAY, java.lang.String.class);
          myRegisterSimple(Constants.XSD_MONTH, java.lang.String.class);
          myRegisterSimple(Constants.XSD_NORMALIZEDSTRING,
                  java.lang.String.class);
          myRegisterSimple(Constants.XSD_TOKEN, java.lang.String.class);
          myRegisterSimple(Constants.XSD_LANGUAGE, java.lang.String.class);
          myRegisterSimple(Constants.XSD_NAME, java.lang.String.class);
          myRegisterSimple(Constants.XSD_NCNAME, java.lang.String.class);
          myRegisterSimple(Constants.XSD_ID, java.lang.String.class);
          myRegisterSimple(Constants.XSD_NMTOKEN, java.lang.String.class);
          myRegisterSimple(Constants.XSD_NMTOKENS, java.lang.String.class);
          myRegisterSimple(Constants.XSD_STRING, java.lang.String.class);
          myRegisterSimple(Constants.XSD_NONPOSITIVEINTEGER,
                  java.math.BigInteger.class);
          myRegisterSimple(Constants.XSD_NEGATIVEINTEGER,
                  java.math.BigInteger.class);
          myRegisterSimple(Constants.XSD_NONNEGATIVEINTEGER,
                  java.math.BigInteger.class);
          myRegisterSimple(Constants.XSD_UNSIGNEDLONG,
                  java.math.BigInteger.class);
          myRegisterSimple(Constants.XSD_POSITIVEINTEGER,
                  java.math.BigInteger.class);
      }
  }
  
  
  
  1.135     +22 -0     ws-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java
  
  Index: Emitter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java,v
  retrieving revision 1.134
  retrieving revision 1.135
  diff -u -r1.134 -r1.135
  --- Emitter.java	14 Dec 2004 20:22:27 -0000	1.134
  +++ Emitter.java	18 Jan 2005 03:38:03 -0000	1.135
  @@ -34,6 +34,7 @@
   import org.apache.axis.encoding.DefaultTypeMappingImpl;
   import org.apache.axis.encoding.TypeMapping;
   import org.apache.axis.encoding.DefaultSOAPEncodingTypeMappingImpl;
  +import org.apache.axis.encoding.DefaultJAXRPC11TypeMappingImpl;
   import org.apache.axis.enum.Style;
   import org.apache.axis.enum.Use;
   import org.apache.axis.utils.ClassUtils;
  @@ -2541,6 +2542,27 @@
           this.defaultTM = defaultTM;
       }
   
  +    /**
  +     * Method setTypeMappingVersion
  +     * 
  +     * @param typeMappingVersion 
  +     */
  +    public void setTypeMappingVersion(String typeMappingVersion) {
  +        if(defaultTM == null) {
  +            if (typeMappingVersion.equals("1.0")) {
  +                defaultTM=DefaultSOAPEncodingTypeMappingImpl.create();
  +            } else if (typeMappingVersion.equals("1.1")) {
  +                defaultTM=DefaultTypeMappingImpl.getSingleton();
  +            } else if (typeMappingVersion.equals("1.2")) {
  +                defaultTM=DefaultSOAPEncodingTypeMappingImpl.createWithDelegate();
  +            } else if (typeMappingVersion.equals("1.3")) {
  +                defaultTM=DefaultJAXRPC11TypeMappingImpl.createWithDelegate();
  +            } else {
  +                throw new RuntimeException(org.apache.axis.utils.Messages.getMessage("j2wBadTypeMapping00"));
  +            }
  +            setDefaultTypeMapping(defaultTM);
  +        }
  +    }
       /**
        * getStyle
        * 
  
  
  
  1.77      +3 -30     ws-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java
  
  Index: Emitter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- Emitter.java	15 Jan 2005 13:33:41 -0000	1.76
  +++ Emitter.java	18 Jan 2005 03:38:03 -0000	1.77
  @@ -18,6 +18,7 @@
   import org.apache.axis.encoding.DefaultSOAPEncodingTypeMappingImpl;
   import org.apache.axis.encoding.TypeMapping;
   import org.apache.axis.encoding.DefaultTypeMappingImpl;
  +import org.apache.axis.encoding.DefaultJAXRPC11TypeMappingImpl;
   import org.apache.axis.enum.Scope;
   import org.apache.axis.enum.Use;
   import org.apache.axis.i18n.Messages;
  @@ -93,9 +94,6 @@
   
       private boolean typeCollisionProtection = true;
   
  -    /** Use JAX-RPC 1.1 type mappings */
  -    //private boolean useJaxRPC11Mappings = false;
  -
       /** Check if URL endpoints are valid or not */
       private boolean allowInvalidURL = false;
   
  @@ -426,33 +424,6 @@
       }
       
       /**
  -     * <B>WARNING: NOT IMPLEMENTED</B>
  -     * <p>
  -     * Turn on the JAX-RPC 1.1 type mappings, which maps
  -     * various XML Schema types to java types (string, BigInteger, Calendar, etc).
  -     * <p>
  -     * Axis has custom types (in org.apache.axis.types) that are used by default.
  -     */
  -/*
  -    public void setUseJaxRPC11Mappings(boolean b) {
  -        useJaxRPC11Mappings = b;
  -    }
  -*/
  -
  -    /**
  -     * <B>WARNING: NOT IMPLEMENTED</B>
  -     * <p>
  -     * Will this emitter use the JAX-RPC 1.1 type mappings for
  -     * the types that aren't directly mappable to Java.
  -     * @return TRUE if we are using the JAX-RPC 1.1 mappings.
  -     */
  -/*
  -    public boolean getUseJaxRPC11Mappings() {
  -        return useJaxRPC11Mappings;
  -    }
  -*/
  -
  -    /**
        * Sets the <code>WriterFactory Class</code> to use
        * 
        * @param factory the name of the factory <code>Class</code>
  @@ -790,6 +761,8 @@
                   defaultTM=DefaultTypeMappingImpl.getSingleton();
               } else if (typeMappingVersion.equals("1.2")) {
                   defaultTM=DefaultSOAPEncodingTypeMappingImpl.createWithDelegate();
  +            } else if (typeMappingVersion.equals("1.3")) {
  +                defaultTM=DefaultJAXRPC11TypeMappingImpl.createWithDelegate();
               } else {
                   throw new RuntimeException(org.apache.axis.utils.Messages.getMessage("j2wBadTypeMapping00"));
               }
  
  
  
  1.46      +5 -10     ws-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java
  
  Index: Java2WSDL.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- Java2WSDL.java	15 Jan 2005 13:33:41 -0000	1.45
  +++ Java2WSDL.java	18 Jan 2005 03:38:03 -0000	1.46
  @@ -17,6 +17,7 @@
   
   import org.apache.axis.encoding.DefaultSOAPEncodingTypeMappingImpl;
   import org.apache.axis.encoding.DefaultTypeMappingImpl;
  +import org.apache.axis.encoding.DefaultJAXRPC11TypeMappingImpl;
   import org.apache.axis.utils.CLArgsParser;
   import org.apache.axis.utils.CLOption;
   import org.apache.axis.utils.CLOptionDescriptor;
  @@ -410,16 +411,10 @@
               case TYPEMAPPING_OPT:
                   value = option.getArgument();
   
  -                if (value.equals("1.0")) {
  -                    emitter.setDefaultTypeMapping(DefaultSOAPEncodingTypeMappingImpl.create());
  -                } else if (value.equals("1.1")) {
  -                    emitter.setDefaultTypeMapping(DefaultTypeMappingImpl.getSingleton());
  -                } else if (value.equals("1.2")) {
  -                    emitter.setDefaultTypeMapping(DefaultSOAPEncodingTypeMappingImpl.createWithDelegate());
  -                } else {
  -                    System.out.println(
  -                            Messages.getMessage("j2wBadTypeMapping00"));
  -
  +                try {
  +                    emitter.setTypeMappingVersion(value);
  +                } catch (Exception e) {
  +                    System.out.println(Messages.getMessage("j2wBadTypeMapping00"));
                       status = false;
                   }
                   break;
  
  
  
  1.54      +2 -13     ws-axis/java/src/org/apache/axis/wsdl/WSDL2Java.java
  
  Index: WSDL2Java.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/WSDL2Java.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- WSDL2Java.java	15 Jan 2005 13:33:41 -0000	1.53
  +++ WSDL2Java.java	18 Jan 2005 03:38:03 -0000	1.54
  @@ -90,9 +90,6 @@
   	/** Field IMPL_CLASS_OPT */
   	protected static final int IMPL_CLASS_OPT = 'c';
   
  -    /** Field JARPC11_OPT */
  -    //protected static final int JAXRPC11_OPT = 'j';
  -
       /** Field ALLOW_INVALID_URL_OPT */
       protected static final int ALLOW_INVALID_URL_OPT = 'u';
   
  @@ -180,10 +177,6 @@
   						CLOptionDescriptor.ARGUMENT_REQUIRED,
   						IMPL_CLASS_OPT,
   						Messages.getMessage("implementationClassName")),
  -/*
  -                new CLOptionDescriptor("jaxrpc", CLOptionDescriptor.ARGUMENT_DISALLOWED,
  -                        JAXRPC11_OPT, Messages.getMessage("optionJaxrpc")),
  -*/
                   new CLOptionDescriptor("allowInvalidURL", CLOptionDescriptor.ARGUMENT_DISALLOWED,
                           ALLOW_INVALID_URL_OPT, Messages.getMessage("optionAllowInvalidURL"))
                   };
  @@ -289,6 +282,8 @@
                           emitter.setTypeMappingVersion("1.1");
                   } else if (tmValue.equals("1.2")) {
                       emitter.setTypeMappingVersion("1.2");
  +                } else if (tmValue.equals("1.3")) {
  +                    emitter.setTypeMappingVersion("1.3");
                   } else {
                       System.out.println(
                               Messages.getMessage("badTypeMappingOption00"));
  @@ -323,12 +318,6 @@
   			case IMPL_CLASS_OPT:
   				emitter.setImplementationClassName(option.getArgument());
   				break;
  -
  -/*
  -            case JAXRPC11_OPT:
  -                emitter.setUseJaxRPC11Mappings(true);
  -                break;
  -*/
   
               case ALLOW_INVALID_URL_OPT:
                   emitter.setAllowInvalidURL(true);
  
  
  
  1.24      +7 -22     ws-axis/java/tools/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java
  
  Index: Java2WsdlAntTask.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/tools/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Java2WsdlAntTask.java	15 Jan 2005 13:33:41 -0000	1.23
  +++ Java2WsdlAntTask.java	18 Jan 2005 03:38:03 -0000	1.24
  @@ -15,12 +15,8 @@
    */
   package org.apache.axis.tools.ant.wsdl;
   
  -import org.apache.axis.encoding.DefaultSOAPEncodingTypeMappingImpl;
  -import org.apache.axis.encoding.DefaultTypeMappingImpl;
   import org.apache.axis.encoding.TypeMappingImpl;
  -import org.apache.axis.encoding.TypeMapping;
   import org.apache.axis.utils.ClassUtils;
  -import org.apache.axis.utils.Messages;
   import org.apache.axis.wsdl.fromJava.Emitter;
   import org.apache.tools.ant.AntClassLoader;
   import org.apache.tools.ant.BuildException;
  @@ -33,10 +29,10 @@
   import java.io.PrintWriter;
   import java.io.StringWriter;
   import java.util.HashMap;
  -import java.util.StringTokenizer;
  +import java.util.Iterator;
   import java.util.LinkedList;
   import java.util.List;
  -import java.util.Iterator;
  +import java.util.StringTokenizer;
   
   /*
    * Important. we autogenerate the ant task docs from this.
  @@ -86,8 +82,6 @@
       private Path classpath = null;
       private String soapAction = null;
       private List complexTypes = new LinkedList();
  -    private TypeMappingImpl tmi;
  -    private TypeMapping defaultTM;    
   
       /**
        * trace out parameters
  @@ -193,22 +187,13 @@
                   emitter.setExtraClasses(extraClasses);
               }
   
  -            if (typeMappingVersion.equals("1.0")) {
  -                defaultTM=DefaultSOAPEncodingTypeMappingImpl.create();
  -            } else if (typeMappingVersion.equals("1.1")) {
  -                defaultTM=DefaultTypeMappingImpl.getSingleton();
  -            } else if (typeMappingVersion.equals("1.2")) {
  -                defaultTM=DefaultSOAPEncodingTypeMappingImpl.createWithDelegate();
  -            } else {
  -                throw new BuildException(Messages.getMessage("j2wBadTypeMapping00"));
  -            }
  -            emitter.setDefaultTypeMapping(defaultTM);
  +            emitter.setTypeMappingVersion(typeMappingVersion);
               // Create TypeMapping and register complex types
  -            tmi = new TypeMappingImpl(defaultTM);
  +            TypeMappingImpl tmi = new TypeMappingImpl(emitter.getDefaultTypeMapping());
               Iterator i = complexTypes.iterator();
               while (i.hasNext()) {
  -                ( (ComplexType)i.next()).register(tmi);
  -             }
  +                ((ComplexType) i.next()).register(tmi);
  +            }
               emitter.setTypeMapping(tmi);
               
               if (style != null) {
  @@ -231,7 +216,7 @@
               emitter.setImportUrl(locationImport);
               emitter.setUseInheritedMethods(useInheritedMethods);
               if(serviceElementName!=null) {
  -                emitter.setServiceElementName( serviceElementName);
  +                emitter.setServiceElementName(serviceElementName);
               }
               if(methods!=null) {
                   emitter.setAllowedMethods(methods);
  
  
  
  1.4       +1 -1      ws-axis/java/tools/org/apache/axis/tools/ant/wsdl/TypeMappingVersionEnum.java
  
  Index: TypeMappingVersionEnum.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/tools/org/apache/axis/tools/ant/wsdl/TypeMappingVersionEnum.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TypeMappingVersionEnum.java	15 Jan 2005 13:33:41 -0000	1.3
  +++ TypeMappingVersionEnum.java	18 Jan 2005 03:38:03 -0000	1.4
  @@ -24,7 +24,7 @@
    */
   public class TypeMappingVersionEnum extends EnumeratedAttribute {
       public String[] getValues() {
  -        return new String[]{"1.0", "1.1", "1.2"};
  +        return new String[]{"1.0", "1.1", "1.2", "1.3"};
       }
   
       /**
  
  
  
  1.26      +0 -12     ws-axis/java/tools/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java
  
  Index: Wsdl2javaAntTask.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/tools/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- Wsdl2javaAntTask.java	15 Jan 2005 13:33:41 -0000	1.25
  +++ Wsdl2javaAntTask.java	18 Jan 2005 03:38:03 -0000	1.26
  @@ -86,7 +86,6 @@
       private boolean all = false;
       private boolean helperGen = false;
       private boolean noWrapped = false;
  -    //private boolean jaxrpc11mappings = false;
       private boolean allowInvalidURL = false;
       private String factory = null;
       private HashMap namespaceMap = new HashMap();
  @@ -180,7 +179,6 @@
           log("\tusername:" + username, logLevel);
           log("\t:password" + password, logLevel);
           log("\t:noWrapped" + noWrapped, logLevel);
  -        //log("\t:jaxrpc11mappings" + jaxrpc11mappings, logLevel);
           log("\t:allowInvalidURL" + allowInvalidURL, logLevel);
   		log("\t:implementationClassName" + implementationClassName, logLevel);
           log("\t:classpath" + classpath, logLevel);
  @@ -235,7 +233,6 @@
               emitter.setQuiet(quiet);
               emitter.setTypeMappingVersion(typeMappingVersion);
               emitter.setNowrap(noWrapped);
  -            //emitter.setUseJaxRPC11Mappings(jaxrpc11mappings);
               emitter.setAllowInvalidURL(allowInvalidURL);
               if (namespaceMappingFile != null) {
                   emitter.setNStoPkg(namespaceMappingFile.toString());
  @@ -526,15 +523,6 @@
       public void setNoWrapped(boolean noWrapped) {
           this.noWrapped = noWrapped;
       }
  -
  -    /**
  -     * Set the jaxrpc11mappings flag.
  -     */
  -/*
  -    public void setJaxrpc11mappings(boolean b) {
  -        this.jaxrpc11mappings = b;
  -    }
  -*/
   
       /**
        * Set the allowInvalidURL flag.
  
  
  

Mime
View raw message