axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/types UnsignedInt.java UnsignedLong.java
Date Thu, 08 Aug 2002 16:44:15 GMT
tomj        2002/08/08 09:44:15

  Modified:    java/test/wsdl/types ComprehensiveTypes.wsdl
                        DynamicProxyTestCase.java VerifyTestCase.java
               java/src/org/apache/axis/wsdl/toJava JavaImplWriter.java
                        JavaTestCaseWriter.java
               java/src/org/apache/axis/encoding
                        SerializationContextImpl.java
               java/src/org/apache/axis/types UnsignedInt.java
                        UnsignedLong.java
  Log:
  Enhance testing for new XML Schema types, time, unsigned{Long,Int,Short,Byte}.
  - Added the new types to the WSDL ComprehensiveTypes.wsdl test.
  - Default the Unisgned types to 0.
  - Update WSDL2Java to emit test case and Impl files that are correct.
  
  All of the XML Schema simple types are considered "Primitive" by the
  SerializationContextImpl now, and will not be href'd.
  
  Revision  Changes    Path
  1.33      +150 -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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- ComprehensiveTypes.wsdl	25 Jun 2002 14:45:56 -0000	1.32
  +++ ComprehensiveTypes.wsdl	8 Aug 2002 16:44:14 -0000	1.33
  @@ -359,6 +359,11 @@
       <part name="soapInt" type="soapenc:int"/>
       <part name="soapShort" type="soapenc:short"/>
       <part name="soapBase64" type="soapenc:base64"/>
  +    <part name="time" type="xsd:time"/>
  +    <part name="unsignedLong" type="xsd:unsignedLong"/>
  +    <part name="unsignedInt" type="xsd:unsignedInt"/>
  +    <part name="unsignedShort" type="xsd:unsignedShort"/>
  +    <part name="unsignedByte" type="xsd:unsignedByte"/>
     </message>
     <message name="inputBoolean">
       <part name="inBoolean" type="xsd:boolean"/>
  @@ -500,6 +505,56 @@
       <part name="hexBinary" type="xsd:hexBinary"/>
     </message>
   
  +  <message name="inputTime">
  +    <part name="inTime" type="xsd:time"/>
  +    <part name="time" type="xsd:time"/>
  +  </message>
  +
  +  <message name="outputTime">
  +    <part name="outTime" type="xsd:time"/>
  +    <part name="time" type="xsd:time"/>
  +  </message>
  +
  +  <message name="inputUnsignedLong">
  +    <part name="inUnsignedLong" type="xsd:unsignedLong"/>
  +    <part name="unsignedLong" type="xsd:unsignedLong"/>
  +  </message>
  +
  +  <message name="outputUnsignedLong">
  +    <part name="outUnsignedLong" type="xsd:unsignedLong"/>
  +    <part name="unsignedLong" type="xsd:unsignedLong"/>
  +  </message>
  +
  +  <message name="inputUnsignedInt">
  +    <part name="inUnsignedInt" type="xsd:unsignedInt"/>
  +    <part name="unsignedInt" type="xsd:unsignedInt"/>
  +  </message>
  +
  +  <message name="outputUnsignedInt">
  +    <part name="outUnsignedInt" type="xsd:unsignedInt"/>
  +    <part name="unsignedInt" type="xsd:unsignedInt"/>
  +  </message>
  +
  +  <message name="inputUnsignedShort">
  +    <part name="inUnsignedShort" type="xsd:unsignedShort"/>
  +    <part name="unsignedShort" type="xsd:unsignedShort"/>
  +  </message>
  +
  +  <message name="outputUnsignedShort">
  +    <part name="outUnsignedShort" type="xsd:unsignedShort"/>
  +    <part name="unsignedShort" type="xsd:unsignedShort"/>
  +  </message>
  +
  +  <message name="inputUnsignedByte">
  +    <part name="inUnsignedByte" type="xsd:unsignedByte"/>
  +    <part name="unsignedByte" type="xsd:unsignedByte"/>
  +  </message>
  +
  +  <message name="outputUnsignedByte">
  +    <part name="outUnsignedByte" type="xsd:unsignedByte"/>
  +    <part name="unsignedByte" type="xsd:unsignedByte"/>
  +  </message>
  +
     <message name="inputSoapString">
       <part name="inSoapString" type="soapenc:string"/>
       <part name="soapencString" type="soapenc:string"/>
  @@ -904,6 +959,26 @@
         <output message="tns:outputHexBinary"/>
       </operation>
       -->
  +    <operation name="methodTime">
  +      <input message="tns:inputTime"/>
  +      <output message="tns:outputTime"/>
  +    </operation>    
  +    <operation name="methodUnsignedLong">
  +      <input message="tns:inputUnsignedLong"/>
  +      <output message="tns:outputUnsignedLong"/>
  +    </operation>    
  +    <operation name="methodUnsignedInt">
  +      <input message="tns:inputUnsignedInt"/>
  +      <output message="tns:outputUnsignedInt"/>
  +    </operation>    
  +    <operation name="methodUnsignedShort">
  +      <input message="tns:inputUnsignedShort"/>
  +      <output message="tns:outputUnsignedShort"/>
  +    </operation>    
  +    <operation name="methodUnsignedByte">
  +      <input message="tns:inputUnsignedByte"/>
  +      <output message="tns:outputUnsignedByte"/>
  +    </operation>    
       <operation name="methodSoapString">
         <input message="tns:inputSoapString"/>
         <output message="tns:outputSoapString"/>
  @@ -1938,6 +2013,81 @@
         </output>
       </operation>
       -->
  +    <operation name="methodTime">
  +      <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="methodUnsignedLong">
  +      <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="methodUnsignedInt">
  +      <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="methodUnsignedShort">
  +      <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="methodUnsignedByte">
  +      <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="methodSoapString">
         <soap:operation soapAction=""/>
         <input>
  
  
  
  1.8       +50 -3     xml-axis/java/test/wsdl/types/DynamicProxyTestCase.java
  
  Index: DynamicProxyTestCase.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/types/DynamicProxyTestCase.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DynamicProxyTestCase.java	27 Jun 2002 18:06:17 -0000	1.7
  +++ DynamicProxyTestCase.java	8 Aug 2002 16:44:14 -0000	1.8
  @@ -48,6 +48,16 @@
   import junit.framework.TestCase;
   
   import test.wsdl.types.comprehensive_service.TypeTest;
  +import org.apache.axis.types.Time;
  +import org.apache.axis.types.UnsignedLong;
  +import org.apache.axis.types.UnsignedInt;
  +import org.apache.axis.types.UnsignedByte;
  +import org.apache.axis.types.UnsignedShort;
  +import org.apache.axis.holders.TimeHolder;
  +import org.apache.axis.holders.UnsignedLongHolder;
  +import org.apache.axis.holders.UnsignedShortHolder;
  +import org.apache.axis.holders.UnsignedByteHolder;
  +import org.apache.axis.holders.UnsignedIntHolder;
   
   public class DynamicProxyTestCase extends TestCase {
       public DynamicProxyTestCase(String name) {
  @@ -88,6 +98,10 @@
       private void allPrimitivesIn(TypeTest binding) {
           assertTrue("binding is null", binding != null);
           try {
  +            UnsignedLong ulong = new UnsignedLong(0);
  +            UnsignedInt uint = new UnsignedInt(0);
  +            UnsignedShort ushort = new UnsignedShort(0);
  +            UnsignedByte ubyte = new UnsignedByte(0);
   
               binding.allPrimitivesIn(
                       new String(),
  @@ -111,12 +125,23 @@
                       new BigDecimal(0),
                       new Integer(0),
                       new Short((short)0),
  -                    new byte[0]);
  +                    new byte[0],
  +                    new Time("12:01:30.150Z"),
  +                    ulong,
  +                    uint,
  +                    ushort,
  +                    ubyte
  +                    );
           }
           catch (RemoteException re) {
               re.printStackTrace();
               throw new AssertionFailedError("Remote Exception caught: " + re);
           }
  +        catch (Exception e) {
  +            // possibly thrown from Unsigned constructors
  +            // wont happen since we know the value are good!
  +        }
  +        
       } // allPrimitivesIn
   
       public void test1TypeTestAllPrimitivesIn() {
  @@ -129,6 +154,11 @@
       private void allPrimitivesInout(TypeTest binding) {
           assertTrue("binding is null", binding != null);
           try {
  +            UnsignedLong ulong = new UnsignedLong(0);
  +            UnsignedInt uint = new UnsignedInt(0);
  +            UnsignedShort ushort = new UnsignedShort(0);
  +            UnsignedByte ubyte = new UnsignedByte(0);
  +
               binding.allPrimitivesInout(
                       new StringHolder(new String()),
                       new BigIntegerHolder(new BigInteger("0")),
  @@ -152,12 +182,23 @@
                       new BigDecimalHolder(new BigDecimal(0)),
                       new IntegerWrapperHolder(new Integer(0)),
                       new ShortWrapperHolder(new Short((short)0)),
  -                    new ByteArrayHolder(new byte[0]));
  +                    new ByteArrayHolder(new byte[0]),
  +                    new TimeHolder(new Time("12:01:30.150Z")),
  +                    new UnsignedLongHolder(ulong),
  +                    new UnsignedIntHolder(uint),
  +                    new UnsignedShortHolder(ushort),
  +                    new UnsignedByteHolder(ubyte)
  +                    
  +            );
           }
           catch (RemoteException re) {
               re.printStackTrace();
               throw new AssertionFailedError("Remote Exception caught: " + re);
           }
  +        catch (Exception e) {
  +            // possibly thrown from Unsigned constructors
  +            // wont happen since we know the value are good!
  +        }
       } // allPrimitivesInout
   
       public void test2TypeTestAllPrimitivesInout() {
  @@ -194,7 +235,13 @@
                       new BigDecimalHolder(), 
                       new IntegerWrapperHolder(), 
                       new ShortWrapperHolder(), 
  -                    new ByteArrayHolder());
  +                    new ByteArrayHolder(),
  +                    new TimeHolder(),
  +                    new UnsignedLongHolder(),
  +                    new UnsignedIntHolder(),
  +                    new UnsignedShortHolder(),
  +                    new UnsignedByteHolder()
  +            );
           }
           catch (RemoteException re) {
               throw new AssertionFailedError("Remote Exception caught: " + re);
  
  
  
  1.28      +99 -3     xml-axis/java/test/wsdl/types/VerifyTestCase.java
  
  Index: VerifyTestCase.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/types/VerifyTestCase.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- VerifyTestCase.java	1 Jul 2002 19:37:53 -0000	1.27
  +++ VerifyTestCase.java	8 Aug 2002 16:44:14 -0000	1.28
  @@ -71,6 +71,15 @@
   
   import test.wsdl.types.comprehensive_service.TypeTest;
   import test.wsdl.types.comprehensive_service.TypeTestServiceLocator;
  +import org.apache.axis.types.UnsignedLong;
  +import org.apache.axis.types.UnsignedInt;
  +import org.apache.axis.types.UnsignedShort;
  +import org.apache.axis.types.UnsignedByte;
  +import org.apache.axis.holders.TimeHolder;
  +import org.apache.axis.holders.UnsignedLongHolder;
  +import org.apache.axis.holders.UnsignedByteHolder;
  +import org.apache.axis.holders.UnsignedShortHolder;
  +import org.apache.axis.holders.UnsignedIntHolder;
   
   public class VerifyTestCase extends junit.framework.TestCase {
       public VerifyTestCase(String name) {
  @@ -86,6 +95,23 @@
               throw new junit.framework.AssertionFailedError("JAX-RPC ServiceException caught:
" + jre);
           }
           assertTrue("binding is null", binding != null);
  +
  +        // setup unsigned
  +        UnsignedLong ulong = null;
  +        UnsignedInt uint = null;
  +        UnsignedShort ushort = null;
  +        UnsignedByte ubyte = null;
  +
  +        try {
  +            ulong = new UnsignedLong(7777);
  +            uint = new UnsignedInt(777);
  +            ushort = new UnsignedShort(77);
  +            ubyte = new UnsignedByte(7);
  +        } catch (Exception e) {
  +            // possibly thrown from Unsigned constructors
  +            // wont happen since we know the value are good!
  +        }
  +
           try {
               binding.allPrimitivesIn(
                       "hi",
  @@ -109,7 +135,13 @@
                       new java.math.BigDecimal(7),
                       new Integer(0),
                       new Short((short) 0),
  -                    new byte[]{(byte) 7});
  +                    new byte[]{(byte) 7},
  +                    new org.apache.axis.types.Time("12:01:30.150Z"),
  +                    ulong,
  +                    uint,
  +                    ushort,
  +                    ubyte
  +            );
           } catch (java.rmi.RemoteException re) {
               throw new junit.framework.AssertionFailedError("Remote Exception caught: "
+ re );
           }
  @@ -136,7 +168,13 @@
                       new BigDecimalHolder(new java.math.BigDecimal(12)),
                       new IntegerWrapperHolder(new Integer(13)),
                       new ShortWrapperHolder(new Short((short) 14)),
  -                    new ByteArrayHolder(new byte[]{(byte) 15}));
  +                    new ByteArrayHolder(new byte[]{(byte) 15}),
  +                    new TimeHolder(new org.apache.axis.types.Time("12:01:30.150Z")),
  +                    new UnsignedLongHolder(ulong),
  +                    new UnsignedIntHolder(uint),
  +                    new UnsignedShortHolder(ushort),
  +                    new UnsignedByteHolder(ubyte)
  +            );
           } catch (java.rmi.RemoteException re) {
               throw new junit.framework.AssertionFailedError("Remote Exception caught: "
+ re );
           }
  @@ -163,7 +201,13 @@
                       new BigDecimalHolder(),
                       new IntegerWrapperHolder(),
                       new ShortWrapperHolder(),
  -                    new ByteArrayHolder());
  +                    new ByteArrayHolder(),
  +                    new TimeHolder(),
  +                    new UnsignedLongHolder(),
  +                    new UnsignedIntHolder(),
  +                    new UnsignedShortHolder(),
  +                    new UnsignedByteHolder()
  +            );
           } catch (java.rmi.RemoteException re) {
               throw new junit.framework.AssertionFailedError("Remote Exception caught: "
+ re );
           }
  @@ -573,6 +617,58 @@
   //        } catch (java.rmi.RemoteException re) {
   //            throw new junit.framework.AssertionFailedError("Remote Exception caught:
" + re );
   //        }
  +        try {
  +            org.apache.axis.types.Time sendValue = new org.apache.axis.types.Time("15:30:45.245Z");
  +            TimeHolder ch = new TimeHolder(sendValue);
  +            org.apache.axis.types.Time actual = binding.methodTime(sendValue, ch);
  +        } catch (java.rmi.RemoteException re) {
  +            throw new junit.framework.AssertionFailedError("Remote Exception caught: "
+ re );
  +        }
  +        try {
  +            UnsignedLong sendValue = null;
  +            try {
  +                sendValue = new UnsignedLong(18446744073709551600D);
  +            } catch (Exception e) {
  +            }
  +            UnsignedLongHolder ch = new UnsignedLongHolder(sendValue);
  +            UnsignedLong actual = binding.methodUnsignedLong(sendValue, ch);
  +        } catch (java.rmi.RemoteException re) {
  +            throw new junit.framework.AssertionFailedError("Remote Exception caught: "
+ re );
  +        }
  +        try {
  +            UnsignedInt sendValue = null;
  +            try {
  +                sendValue = new UnsignedInt(4294967200L);
  +            } catch (Exception e) {
  +            }
  +            UnsignedIntHolder ch = new UnsignedIntHolder(sendValue);
  +            UnsignedInt actual = binding.methodUnsignedInt(sendValue, ch);
  +        } catch (java.rmi.RemoteException re) {
  +            throw new junit.framework.AssertionFailedError("Remote Exception caught: "
+ re );
  +        }
  +        try {
  +            UnsignedShort sendValue = null;
  +            try {
  +                sendValue = new UnsignedShort(65530);
  +            } catch (Exception e) {
  +            }
  +            UnsignedShortHolder ch = new UnsignedShortHolder(sendValue);
  +            UnsignedShort actual = binding.methodUnsignedShort(sendValue, ch);
  +        } catch (java.rmi.RemoteException re) {
  +            throw new junit.framework.AssertionFailedError("Remote Exception caught: "
+ re );
  +        }
  +        try {
  +            UnsignedByte sendValue = null;
  +            try {
  +                sendValue = new UnsignedByte(250);
  +            } catch (Exception e) {
  +            }
  +            UnsignedByteHolder ch = new UnsignedByteHolder(sendValue);
  +            UnsignedByte actual = binding.methodUnsignedByte(sendValue, ch);
  +        } catch (java.rmi.RemoteException re) {
  +            throw new junit.framework.AssertionFailedError("Remote Exception caught: "
+ re );
  +        }
  +        
           try {
               String sendValue = "Sent String"; 
               StringHolder sh = new StringHolder(sendValue);
  
  
  
  1.28      +2 -0      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaImplWriter.java
  
  Index: JavaImplWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaImplWriter.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- JavaImplWriter.java	2 Aug 2002 16:41:41 -0000	1.27
  +++ JavaImplWriter.java	8 Aug 2002 16:44:15 -0000	1.28
  @@ -206,6 +206,8 @@
                   } else if (paramType.endsWith("[]")) {
                       pw.print("new "
                                + JavaUtils.replace(paramType, "[]", "[0]"));
  +                } else if (paramType.equals("org.apache.axis.types.Time")) {
  +                    pw.print("new org.apache.axis.types.Time(\"15:45:45.275Z\")");
                   } else {
                       // We have some constructed type.
                       Vector v = Utils.getEnumerationBaseAndValues(
  
  
  
  1.38      +20 -0     xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java
  
  Index: JavaTestCaseWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- JavaTestCaseWriter.java	8 Aug 2002 15:17:11 -0000	1.37
  +++ JavaTestCaseWriter.java	8 Aug 2002 16:44:15 -0000	1.38
  @@ -165,6 +165,7 @@
               Operation op = (Operation) ops.next();
               OperationType type = op.getStyle();
               Parameters params = bEntry.getParameters(op);
  +            boolean unsigned = false;  // did we emit an Unsigned constructor
   
               // These operation types are not supported.  The signature
               // will be a string stating that fact.
  @@ -279,6 +280,20 @@
                       } else if (paramType.endsWith("[]")) {
                           pw.print("new "
                                    + JavaUtils.replace(paramType, "[]", "[0]"));
  +                    } else if (paramType.equals("org.apache.axis.types.Time")) {
  +                        pw.print("new org.apache.axis.types.Time(\"15:45:45.275Z\")");
  +                    } else if (paramType.equals("org.apache.axis.types.UnsignedLong"))
{
  +                        unsigned = true;
  +                        pw.print("new org.apache.axis.types.UnsignedLong(0)");
  +                    } else if (paramType.equals("org.apache.axis.types.UnsignedInt")) {
  +                        unsigned = true;
  +                        pw.print("new org.apache.axis.types.UnsignedInt(0)");
  +                    } else if (paramType.equals("org.apache.axis.types.UnsignedShort"))
{
  +                        unsigned = true;
  +                        pw.print("new org.apache.axis.types.UnsignedShort(0)");
  +                    } else if (paramType.equals("org.apache.axis.types.UnsignedByte"))
{
  +                        unsigned = true;
  +                        pw.print("new org.apache.axis.types.UnsignedByte(0)");
                       } else {
   
                           // We have some constructed type.
  @@ -327,6 +342,11 @@
               pw.print("            ");
               pw.println("throw new junit.framework.AssertionFailedError(\"Remote Exception
caught: \" + re);");
               pw.println("        }");
  +            if (unsigned) {
  +                pw.println("        catch (Exception e) {");
  +                pw.println("            // Unsigned constructors can throw - ignore");
  +                pw.println("        }");
  +            }
               pw.println("    }");
               pw.println();
           }
  
  
  
  1.52      +2 -10     xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java
  
  Index: SerializationContextImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- SerializationContextImpl.java	7 Aug 2002 21:02:09 -0000	1.51
  +++ SerializationContextImpl.java	8 Aug 2002 16:44:15 -0000	1.52
  @@ -64,6 +64,7 @@
   import org.apache.axis.schema.SchemaVersion;
   import org.apache.axis.soap.SOAPConstants;
   import org.apache.axis.wsdl.symbolTable.SymbolTable;
  +import org.apache.axis.wsdl.symbolTable.SchemaUtils;
   import org.apache.axis.enum.Style;
   import org.apache.axis.handlers.soap.SOAPService;
   import org.apache.axis.attachments.Attachments;
  @@ -549,16 +550,7 @@
           // and multi-ref'd).
           QName qName = getQNameForClass(javaType);
           if (qName != null && Constants.isSchemaXSD(qName.getNamespaceURI())) {
  -            if (qName.equals(Constants.XSD_BOOLEAN) ||
  -                qName.equals(Constants.XSD_DOUBLE) ||
  -                qName.equals(Constants.XSD_FLOAT) ||
  -                qName.equals(Constants.XSD_INT) ||
  -                qName.equals(Constants.XSD_LONG) ||
  -                qName.equals(Constants.XSD_SHORT) ||
  -                qName.equals(Constants.XSD_BYTE) ||
  -                qName.equals(Constants.XSD_STRING) ||
  -                qName.equals(Constants.XSD_INTEGER) ||
  -                qName.equals(Constants.XSD_DECIMAL)) {
  +            if (SchemaUtils.isSimpleSchemaType(qName)) {
                   return true;
               }
           }
  
  
  
  1.2       +1 -1      xml-axis/java/src/org/apache/axis/types/UnsignedInt.java
  
  Index: UnsignedInt.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/UnsignedInt.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UnsignedInt.java	7 Aug 2002 21:02:09 -0000	1.1
  +++ UnsignedInt.java	8 Aug 2002 16:44:15 -0000	1.2
  @@ -68,7 +68,7 @@
    */
   public class UnsignedInt extends java.lang.Number implements java.lang.Comparable {
   
  -    protected Long lValue;
  +    protected Long lValue = new Long(0);
   
       public UnsignedInt() {
       }
  
  
  
  1.2       +1 -1      xml-axis/java/src/org/apache/axis/types/UnsignedLong.java
  
  Index: UnsignedLong.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/types/UnsignedLong.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UnsignedLong.java	7 Aug 2002 21:02:09 -0000	1.1
  +++ UnsignedLong.java	8 Aug 2002 16:44:15 -0000	1.2
  @@ -66,7 +66,7 @@
    */
   public class UnsignedLong extends java.lang.Number implements java.lang.Comparable {
   
  -    Double lValue;
  +    protected Double lValue = new Double(0);
   
       public UnsignedLong() {
   
  
  
  

Mime
View raw message