scheu       02/01/31 20:38:18

  Modified:    java/src/javax/xml/rpc/holders BigDecimalHolder.java
                        BigIntegerHolder.java BooleanHolder.java
                        ByteArrayHolder.java ByteHolder.java
                        CalendarHolder.java DateHolder.java
                        DoubleHolder.java FloatHolder.java IntHolder.java
                        LongHolder.java QNameHolder.java ShortHolder.java
                        StringHolder.java
               java/src/org/apache/axis/encoding
                        DefaultTypeMappingImpl.java
               java/src/org/apache/axis/utils JavaUtils.java
               java/src/org/apache/axis/wsdl/toJava JavaHolderWriter.java
                        Utils.java
               java/test/wsdl/types VerifyTestCase.java
  Log:
  JAXRPC 0.7 Holder changes plus java.util.Map registration per Axis-Dev request
  
  Revision  Changes    Path
  1.7       +2 -2      xml-axis/java/src/javax/xml/rpc/holders/BigDecimalHolder.java
  
  Index: BigDecimalHolder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/holders/BigDecimalHolder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BigDecimalHolder.java     13 Dec 2001 19:07:39 -0000      1.6
  +++ BigDecimalHolder.java     1 Feb 2002 04:38:17 -0000       1.7
  @@ -59,9 +59,9 @@
   /**
    * Class BigDecimalHolder
    *
  - * @version 0.1
  + * @version 0.7
    */
  -public final class BigDecimalHolder implements java.io.Serializable {
  +public final class BigDecimalHolder implements Holder {
   
       /** Field _value */
       public BigDecimal value;
  
  
  
  1.7       +2 -2      xml-axis/java/src/javax/xml/rpc/holders/BigIntegerHolder.java
  
  Index: BigIntegerHolder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/holders/BigIntegerHolder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BigIntegerHolder.java     13 Dec 2001 19:07:39 -0000      1.6
  +++ BigIntegerHolder.java     1 Feb 2002 04:38:17 -0000       1.7
  @@ -59,9 +59,9 @@
   /**
    * Class BigIntegerHolder
    *
  - * @version 0.1
  + * @version 0.7
    */
  -public final class BigIntegerHolder implements java.io.Serializable {
  +public final class BigIntegerHolder implements Holder {
   
       /** Field _value           */
       public BigInteger value;
  
  
  
  1.7       +2 -2      xml-axis/java/src/javax/xml/rpc/holders/BooleanHolder.java
  
  Index: BooleanHolder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/holders/BooleanHolder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BooleanHolder.java        13 Dec 2001 19:07:39 -0000      1.6
  +++ BooleanHolder.java        1 Feb 2002 04:38:17 -0000       1.7
  @@ -57,9 +57,9 @@
   /**
    * Class BooleanHolder
    *
  - * @version 0.1
  + * @version 0.7
    */
  -public final class BooleanHolder implements java.io.Serializable {
  +public final class BooleanHolder implements Holder {
   
       /** Field _value           */
       public boolean value;
  
  
  
  1.3       +2 -2      xml-axis/java/src/javax/xml/rpc/holders/ByteArrayHolder.java
  
  Index: ByteArrayHolder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/holders/ByteArrayHolder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ByteArrayHolder.java      13 Dec 2001 19:07:39 -0000      1.2
  +++ ByteArrayHolder.java      1 Feb 2002 04:38:17 -0000       1.3
  @@ -57,9 +57,9 @@
   /**
    * Class ByteArrayHolder
    *
  - * @version 0.1
  + * @version 0.7
    */
  -public final class ByteArrayHolder implements java.io.Serializable {
  +public final class ByteArrayHolder implements Holder {
   
       /** Field _value           */
       public byte[] value;
  
  
  
  1.7       +2 -2      xml-axis/java/src/javax/xml/rpc/holders/ByteHolder.java
  
  Index: ByteHolder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/holders/ByteHolder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ByteHolder.java   13 Dec 2001 19:07:39 -0000      1.6
  +++ ByteHolder.java   1 Feb 2002 04:38:17 -0000       1.7
  @@ -57,9 +57,9 @@
   /**
    * Class ByteHolder
    *
  - * @version 0.1
  + * @version 0.7
    */
  -public final class ByteHolder implements java.io.Serializable {
  +public final class ByteHolder implements Holder {
   
       /** Field _value           */
       public byte value;
  
  
  
  1.2       +2 -2      xml-axis/java/src/javax/xml/rpc/holders/CalendarHolder.java
  
  Index: CalendarHolder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/holders/CalendarHolder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CalendarHolder.java       20 Dec 2001 17:50:14 -0000      1.1
  +++ CalendarHolder.java       1 Feb 2002 04:38:17 -0000       1.2
  @@ -59,9 +59,9 @@
   /**
    * Class CalendarHolder
    *
  - * @version 0.1
  + * @version 0.7
    */
  -public final class CalendarHolder implements java.io.Serializable {
  +public final class CalendarHolder implements Holder {
   
       /** Field _value           */
       public Calendar value;
  
  
  
  1.7       +2 -2      xml-axis/java/src/javax/xml/rpc/holders/DateHolder.java
  
  Index: DateHolder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/holders/DateHolder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DateHolder.java   13 Dec 2001 19:07:39 -0000      1.6
  +++ DateHolder.java   1 Feb 2002 04:38:17 -0000       1.7
  @@ -59,9 +59,9 @@
   /**
    * Class DateHolder
    *
  - * @version 0.1
  + * @version 0.7
    */
  -public final class DateHolder implements java.io.Serializable {
  +public final class DateHolder implements Holder {
   
       /** Field _value           */
       public Date value;
  
  
  
  1.7       +2 -2      xml-axis/java/src/javax/xml/rpc/holders/DoubleHolder.java
  
  Index: DoubleHolder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/holders/DoubleHolder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DoubleHolder.java 13 Dec 2001 19:07:39 -0000      1.6
  +++ DoubleHolder.java 1 Feb 2002 04:38:17 -0000       1.7
  @@ -57,9 +57,9 @@
   /**
    * Class DoubleHolder
    *
  - * @version 0.1
  + * @version 0.7
    */
  -public final class DoubleHolder implements java.io.Serializable {
  +public final class DoubleHolder implements Holder {
   
       /** Field _value           */
       public double value;
  
  
  
  1.7       +2 -2      xml-axis/java/src/javax/xml/rpc/holders/FloatHolder.java
  
  Index: FloatHolder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/holders/FloatHolder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FloatHolder.java  13 Dec 2001 19:07:39 -0000      1.6
  +++ FloatHolder.java  1 Feb 2002 04:38:17 -0000       1.7
  @@ -57,9 +57,9 @@
   /**
    * Class FloatHolder
    *
  - * @version 0.1
  + * @version 0.7
    */
  -public final class FloatHolder implements java.io.Serializable {
  +public final class FloatHolder implements Holder {
   
       /** Field _value           */
       public float value;
  
  
  
  1.7       +2 -2      xml-axis/java/src/javax/xml/rpc/holders/IntHolder.java
  
  Index: IntHolder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/holders/IntHolder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- IntHolder.java    13 Dec 2001 19:07:39 -0000      1.6
  +++ IntHolder.java    1 Feb 2002 04:38:17 -0000       1.7
  @@ -57,9 +57,9 @@
   /**
    * Class IntHolder
    *
  - * @version 0.1
  + * @version 0.7
    */
  -public final class IntHolder implements java.io.Serializable {
  +public final class IntHolder implements Holder {
   
       /** Field _value           */
       public int value;
  
  
  
  1.7       +2 -2      xml-axis/java/src/javax/xml/rpc/holders/LongHolder.java
  
  Index: LongHolder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/holders/LongHolder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LongHolder.java   13 Dec 2001 19:07:39 -0000      1.6
  +++ LongHolder.java   1 Feb 2002 04:38:17 -0000       1.7
  @@ -57,9 +57,9 @@
   /**
    * Class LongHolder
    *
  - * @version 0.1
  + * @version 0.7
    */
  -public final class LongHolder implements java.io.Serializable {
  +public final class LongHolder implements Holder {
   
       /** Field _value           */
       public long value;
  
  
  
  1.7       +2 -2      xml-axis/java/src/javax/xml/rpc/holders/QNameHolder.java
  
  Index: QNameHolder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/holders/QNameHolder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- QNameHolder.java  13 Dec 2001 19:07:39 -0000      1.6
  +++ QNameHolder.java  1 Feb 2002 04:38:17 -0000       1.7
  @@ -59,9 +59,9 @@
   /**
    * Class QNameHolder
    *
  - * @version 0.1
  + * @version 0.7
    */
  -public final class QNameHolder implements java.io.Serializable {
  +public final class QNameHolder implements Holder {
   
       /** Field _value           */
       public QName value;
  
  
  
  1.7       +2 -2      xml-axis/java/src/javax/xml/rpc/holders/ShortHolder.java
  
  Index: ShortHolder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/holders/ShortHolder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ShortHolder.java  13 Dec 2001 19:07:39 -0000      1.6
  +++ ShortHolder.java  1 Feb 2002 04:38:17 -0000       1.7
  @@ -57,9 +57,9 @@
   /**
    * Class ShortHolder
    *
  - * @version 0.1
  + * @version 0.7
    */
  -public final class ShortHolder implements java.io.Serializable {
  +public final class ShortHolder implements Holder {
   
       /** Field _value           */
       public short value;
  
  
  
  1.7       +2 -2      xml-axis/java/src/javax/xml/rpc/holders/StringHolder.java
  
  Index: StringHolder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/holders/StringHolder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- StringHolder.java 13 Dec 2001 19:07:39 -0000      1.6
  +++ StringHolder.java 1 Feb 2002 04:38:17 -0000       1.7
  @@ -57,9 +57,9 @@
   /**
    * Class StringHolder
    *
  - * @version 0.1
  + * @version 0.7
    */
  -public final class StringHolder implements java.io.Serializable {
  +public final class StringHolder implements Holder {
   
       /** Field _value           */
       public String value;
  
  
  
  1.6       +8 -4      
xml-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java
  
  Index: DefaultTypeMappingImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultTypeMappingImpl.java       31 Jan 2002 03:26:09 -0000      1.5
  +++ DefaultTypeMappingImpl.java       1 Feb 2002 04:38:18 -0000       1.6
  @@ -229,13 +229,17 @@
                      new HexSerializerFactory(),
                      new HexDeserializerFactory(),true);
   
  -        // Use the Map Serialization for both Hashtables and HashMap objects
  -        myRegister(Constants.SOAP_MAP,       java.util.HashMap.class,    
  -                   new 
MapSerializerFactory(java.util.HashMap.class,Constants.SOAP_MAP),
  -                   new 
MapDeserializerFactory(java.util.HashMap.class,Constants.SOAP_MAP), false);
  +        // Use the Map Serialization for both Hashtables, Map and HashMap objects
  +        // The SOAP_MAP will be deserialized into a HashMap
           myRegister(Constants.SOAP_MAP,       java.util.Hashtable.class,    
                      new 
MapSerializerFactory(java.util.Hashtable.class,Constants.SOAP_MAP),
                      new 
MapDeserializerFactory(java.util.Hashtable.class,Constants.SOAP_MAP), false);
  +        myRegister(Constants.SOAP_MAP,       java.util.Map.class,    
  +                   new MapSerializerFactory(java.util.Map.class,Constants.SOAP_MAP),
  +                   new 
MapDeserializerFactory(java.util.Map.class,Constants.SOAP_MAP), false);
  +        myRegister(Constants.SOAP_MAP,       java.util.HashMap.class,    
  +                   new 
MapSerializerFactory(java.util.HashMap.class,Constants.SOAP_MAP),
  +                   new 
MapDeserializerFactory(java.util.HashMap.class,Constants.SOAP_MAP), false);
   
           // Use the Element Serializeration for elements
           myRegister(Constants.SOAP_ELEMENT,   org.w3c.dom.Element.class,    
  
  
  
  1.24      +18 -2     xml-axis/java/src/org/apache/axis/utils/JavaUtils.java
  
  Index: JavaUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- JavaUtils.java    31 Jan 2002 21:53:22 -0000      1.23
  +++ JavaUtils.java    1 Feb 2002 04:38:18 -0000       1.24
  @@ -463,8 +463,18 @@
        * @return class of held type or null
        */
       public static Class getHolderValueType(Class type) {
  -        if (type.getName() != null &&
  -            type.getName().endsWith("Holder")) {
  +        if (type != null) {
  +            Class[] intf = type.getInterfaces();
  +            boolean isHolder = false;
  +            for (int i=0; i<intf.length; i++) {
  +                if (intf[i] == javax.xml.rpc.holders.Holder.class) {
  +                    isHolder = true;
  +                }
  +            }
  +            if (isHolder == false) {
  +                return null;
  +            }
  +
               // Holder is supposed to have a public value field.
               java.lang.reflect.Field field;
               try {
  @@ -485,6 +495,9 @@
        * @return value object 
        */
       public static Object getHolderValue(Object holder) throws HolderException {
  +        if (!(holder instanceof javax.xml.rpc.holders.Holder)) {
  +            throw new HolderException();
  +        }            
           try {
               Field valueField = holder.getClass().getField("value");
               return valueField.get(holder);
  @@ -499,6 +512,9 @@
        * @param value is the object value 
        */
       public static void setHolderValue(Object holder, Object value) throws 
HolderException {
  +        if (!(holder instanceof javax.xml.rpc.holders.Holder)) {
  +            throw new HolderException();
  +        }            
           try {
               Field valueField = holder.getClass().getField("value");
               if (valueField.getType().isPrimitive()) {
  
  
  
  1.7       +1 -1      
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaHolderWriter.java
  
  Index: JavaHolderWriter.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaHolderWriter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JavaHolderWriter.java     26 Jan 2002 05:27:12 -0000      1.6
  +++ JavaHolderWriter.java     1 Feb 2002 04:38:18 -0000       1.7
  @@ -87,7 +87,7 @@
        */
       protected void writeFileBody() throws IOException {
           String holderType = Utils.getJavaLocalName(type.getName());
  -        pw.println("public final class " + className + " implements 
java.io.Serializable {");
  +        pw.println("public final class " + className + " implements 
javax.xml.rpc.holders.Holder {");
           pw.println("    public " + holderType + " value;");
           pw.println();
           pw.println("    public " + className + "() {");
  
  
  
  1.12      +10 -3     xml-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java
  
  Index: Utils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Utils.java        26 Jan 2002 05:27:12 -0000      1.11
  +++ Utils.java        1 Feb 2002 04:38:18 -0000       1.12
  @@ -534,7 +534,7 @@
               return "javax.xml.rpc.holders.ByteArrayHolder";
           }
           else if (typeValue.equals("java.lang.Byte[]")) {
  -            return "javax.xml.rpc.holders.ByteClassArrayHolder";
  +            return "javax.xml.rpc.holders.ByteWrapperArrayHolder";
           }
           // Anything else with [] gets its holder from the qname
           else if (typeValue.endsWith("[]")) {
  @@ -551,6 +551,13 @@
           else if (typeValue.equals("java.lang.String")) {
               return "javax.xml.rpc.holders.StringHolder";
           }
  +        // Object also has a reserved holder
  +        else if (typeValue.equals("Object")) {
  +            return "javax.xml.rpc.holders.ObjectHolder";
  +        }
  +        else if (typeValue.equals("java.lang.Object")) {
  +            return "javax.xml.rpc.holders.ObjectHolder";
  +        }
           // Java primitive types have reserved holders
           else if (typeValue.equals("int")
                    || typeValue.equals("long")
  @@ -565,12 +572,12 @@
           else if (typeValue.startsWith("java.lang.")) {
               return "javax.xml.rpc.holders" + 
                   typeValue.substring(typeValue.lastIndexOf(".")) +
  -                "ClassHolder";
  +                "WrapperHolder";
           }
           else if (typeValue.indexOf(".") < 0) {
               return "javax.xml.rpc.holders" + 
                   typeValue +
  -                "ClassHolder";
  +                "WrapperHolder";
           }
           // The classes have reserved holders because they 
           // represent schema/soap encoding primitives
  
  
  
  1.6       +25 -25    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- VerifyTestCase.java       30 Jan 2002 18:26:50 -0000      1.5
  +++ VerifyTestCase.java       1 Feb 2002 04:38:18 -0000       1.6
  @@ -11,21 +11,21 @@
   
   import javax.xml.rpc.holders.BigDecimalHolder;
   import javax.xml.rpc.holders.BigIntegerHolder;
  -import javax.xml.rpc.holders.BooleanClassHolder;
  +import javax.xml.rpc.holders.BooleanWrapperHolder;
   import javax.xml.rpc.holders.BooleanHolder;
   import javax.xml.rpc.holders.ByteArrayHolder;
  -import javax.xml.rpc.holders.ByteClassArrayHolder;
  +import javax.xml.rpc.holders.ByteWrapperArrayHolder;
   import javax.xml.rpc.holders.ByteHolder;
   import javax.xml.rpc.holders.DateHolder;
  -import javax.xml.rpc.holders.DoubleClassHolder;
  +import javax.xml.rpc.holders.DoubleWrapperHolder;
   import javax.xml.rpc.holders.DoubleHolder;
  -import javax.xml.rpc.holders.FloatClassHolder;
  +import javax.xml.rpc.holders.FloatWrapperHolder;
   import javax.xml.rpc.holders.FloatHolder;
  -import javax.xml.rpc.holders.IntegerClassHolder;
  +import javax.xml.rpc.holders.IntegerWrapperHolder;
   import javax.xml.rpc.holders.IntHolder;
   import javax.xml.rpc.holders.LongHolder;
   import javax.xml.rpc.holders.QNameHolder;
  -import javax.xml.rpc.holders.ShortClassHolder;
  +import javax.xml.rpc.holders.ShortWrapperHolder;
   import javax.xml.rpc.holders.ShortHolder;
   import javax.xml.rpc.holders.StringHolder;
   
  @@ -97,13 +97,13 @@
                       new ByteArrayHolder(new byte[]{(byte) 8}),
                       new ByteArrayHolder(new byte[]{(byte) 9}),
                       new StringHolder("ho hi"),
  -                    new BooleanClassHolder(new Boolean(true)),
  -                    new FloatClassHolder(new Float(10)),
  -                    new DoubleClassHolder(new Double(11)),
  +                    new BooleanWrapperHolder(new Boolean(true)),
  +                    new FloatWrapperHolder(new Float(10)),
  +                    new DoubleWrapperHolder(new Double(11)),
                       new BigDecimalHolder(new java.math.BigDecimal(12)),
  -                    new IntegerClassHolder(new Integer(13)),
  -                    new ShortClassHolder(new Short((short) 14)),
  -                    new ByteClassArrayHolder(new Byte[]{new Byte((byte) 15)}));
  +                    new IntegerWrapperHolder(new Integer(13)),
  +                    new ShortWrapperHolder(new Short((short) 14)),
  +                    new ByteWrapperArrayHolder(new Byte[]{new Byte((byte) 15)}));
           } catch (java.rmi.RemoteException re) {
               throw new junit.framework.AssertionFailedError("Remote Exception 
caught: " + re );
           }
  @@ -124,13 +124,13 @@
                       new ByteArrayHolder(),
                       new ByteArrayHolder(),
                       new StringHolder(),
  -                    new BooleanClassHolder(),
  -                    new FloatClassHolder(),
  -                    new DoubleClassHolder(),
  +                    new BooleanWrapperHolder(),
  +                    new FloatWrapperHolder(),
  +                    new DoubleWrapperHolder(),
                       new BigDecimalHolder(),
  -                    new IntegerClassHolder(),
  -                    new ShortClassHolder(),
  -                    new ByteClassArrayHolder());
  +                    new IntegerWrapperHolder(),
  +                    new ShortWrapperHolder(),
  +                    new ByteWrapperArrayHolder());
           } catch (java.rmi.RemoteException re) {
               throw new junit.framework.AssertionFailedError("Remote Exception 
caught: " + re );
           }
  @@ -266,7 +266,7 @@
               throw new junit.framework.AssertionFailedError("Remote Exception 
caught: " + re );
           }
           try {
  -            binding.anyInout(new javax.xml.rpc.holders.ObjectClassHolder(new 
java.lang.String("yo ho ho")));
  +            binding.anyInout(new javax.xml.rpc.holders.ObjectHolder(new 
java.lang.String("yo ho ho")));
           } catch (java.rmi.RemoteException re) {
               throw new junit.framework.AssertionFailedError("Remote Exception 
caught: " + re );
           }
  @@ -413,21 +413,21 @@
           }
           try {
               java.lang.Boolean sendValue = new java.lang.Boolean(true);
  -            BooleanClassHolder bh = new BooleanClassHolder(sendValue);
  +            BooleanWrapperHolder bh = new BooleanWrapperHolder(sendValue);
               java.lang.Boolean actual = binding.methodSoapBoolean(sendValue, bh);
           } catch (java.rmi.RemoteException re) {
               throw new junit.framework.AssertionFailedError("Remote Exception 
caught: " + re );
           }
           try {
               java.lang.Float sendValue = new java.lang.Float(93049.0394F);
  -            FloatClassHolder fh = new FloatClassHolder(sendValue);
  +            FloatWrapperHolder fh = new FloatWrapperHolder(sendValue);
               java.lang.Float actual = binding.methodSoapFloat(sendValue, fh);
           } catch (java.rmi.RemoteException re) {
               throw new junit.framework.AssertionFailedError("Remote Exception 
caught: " + re );
           }
           try {
               java.lang.Double sendValue = new java.lang.Double(193049.0394D);
  -            DoubleClassHolder dh = new DoubleClassHolder(sendValue);
  +            DoubleWrapperHolder dh = new DoubleWrapperHolder(sendValue);
               java.lang.Double actual = binding.methodSoapDouble(sendValue, dh);
           } catch (java.rmi.RemoteException re) {
               throw new junit.framework.AssertionFailedError("Remote Exception 
caught: " + re );
  @@ -441,14 +441,14 @@
           }
           try {
               java.lang.Integer sendValue = new java.lang.Integer(94);
  -            IntegerClassHolder ich = new IntegerClassHolder(sendValue);
  +            IntegerWrapperHolder ich = new IntegerWrapperHolder(sendValue);
               java.lang.Integer actual = binding.methodSoapInt(sendValue, ich);
           } catch (java.rmi.RemoteException re) {
               throw new junit.framework.AssertionFailedError("Remote Exception 
caught: " + re );
           }
           try {
               java.lang.Short sendValue = new java.lang.Short((short) 5);
  -            ShortClassHolder sch = new ShortClassHolder(sendValue);
  +            ShortWrapperHolder sch = new ShortWrapperHolder(sendValue);
               java.lang.Short actual = binding.methodSoapShort(sendValue, sch);
           } catch (java.rmi.RemoteException re) {
               throw new junit.framework.AssertionFailedError("Remote Exception 
caught: " + re );
  @@ -456,7 +456,7 @@
   // Comment out for now because causes compile errors
   //        try {
   //            Byte[] sendValue = {new java.lang.Byte((byte) 10), new 
java.lang.Byte((byte) 9)};
  -//            ByteClassArrayHolder bach = new ByteClassArrayHolder(sendValue);
  +//            ByteWrapperArrayHolder bach = new ByteWrapperArrayHolder(sendValue);
   //            Byte[] actual = binding.methodSoapBase64(sendValue, bach);
   //        } catch (java.rmi.RemoteException re) {
   //            throw new junit.framework.AssertionFailedError("Remote Exception 
caught: " + re );
  
  
  


Reply via email to