axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bu...@apache.org
Subject cvs commit: xml-axis/java/test/multiref MultiRefTestSOAPBindingImpl.java
Date Thu, 13 Dec 2001 19:07:40 GMT
butek       01/12/13 11:07:40

  Modified:    java/src/javax/xml/rpc/holders BigDecimalHolder.java
                        BigIntegerHolder.java BooleanHolder.java
                        ByteArrayHolder.java ByteHolder.java
                        DateHolder.java DoubleHolder.java FloatHolder.java
                        IntHolder.java LongHolder.java QNameHolder.java
                        ShortHolder.java StringHolder.java
               java/src/org/apache/axis/wsdl/toJava JavaHolderWriter.java
                        JavaImplWriter.java JavaSkelWriter.java
                        JavaStubWriter.java
               java/test/inout DetailedInoutTestCase.java
                        InoutSOAPBindingImpl.java
               java/test/multiref MultiRefTestSOAPBindingImpl.java
  Log:
  According to the latest JAX-RPC spec, holder instance variables must be named
  "value".  An older version of the spec, which our code still followed, dictated
  "_value'.
  
  Revision  Changes    Path
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BigDecimalHolder.java	2001/10/30 16:46:33	1.5
  +++ BigDecimalHolder.java	2001/12/13 19:07:39	1.6
  @@ -64,7 +64,7 @@
   public final class BigDecimalHolder implements java.io.Serializable {
   
       /** Field _value */
  -    public BigDecimal _value;
  +    public BigDecimal value;
   
       /**
        * Constructor BigDecimalHolder
  @@ -77,7 +77,7 @@
        * @param value
        */
       public BigDecimalHolder(BigDecimal value) {
  -        this._value = value;
  +        this.value = value;
       }
   }
   
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BigIntegerHolder.java	2001/10/30 16:46:33	1.5
  +++ BigIntegerHolder.java	2001/12/13 19:07:39	1.6
  @@ -64,7 +64,7 @@
   public final class BigIntegerHolder implements java.io.Serializable {
   
       /** Field _value           */
  -    public BigInteger _value;
  +    public BigInteger value;
   
       /**
        * Constructor BigIntegerHolder
  @@ -77,7 +77,7 @@
        * @param value
        */
       public BigIntegerHolder(BigInteger value) {
  -        this._value = value;
  +        this.value = value;
       }
   }
   
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BooleanHolder.java	2001/10/30 16:46:33	1.5
  +++ BooleanHolder.java	2001/12/13 19:07:39	1.6
  @@ -62,7 +62,7 @@
   public final class BooleanHolder implements java.io.Serializable {
   
       /** Field _value           */
  -    public boolean _value;
  +    public boolean value;
   
       /**
        * Constructor BooleanHolder
  @@ -75,7 +75,7 @@
        * @param value
        */
       public BooleanHolder(boolean value) {
  -        this._value = value;
  +        this.value = value;
       }
   }
   
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ByteArrayHolder.java	2001/12/07 18:32:43	1.1
  +++ ByteArrayHolder.java	2001/12/13 19:07:39	1.2
  @@ -62,7 +62,7 @@
   public final class ByteArrayHolder implements java.io.Serializable {
   
       /** Field _value           */
  -    public byte[] _value;
  +    public byte[] value;
   
       /**
        * Constructor ByteArrayHolder
  @@ -75,7 +75,7 @@
        * @param value
        */
       public ByteArrayHolder(byte[] value) {
  -        this._value = value;
  +        this.value = value;
       }
   }
   
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ByteHolder.java	2001/10/30 16:46:33	1.5
  +++ ByteHolder.java	2001/12/13 19:07:39	1.6
  @@ -62,7 +62,7 @@
   public final class ByteHolder implements java.io.Serializable {
   
       /** Field _value           */
  -    public byte _value;
  +    public byte value;
   
       /**
        * Constructor ByteHolder
  @@ -75,7 +75,7 @@
        * @param value
        */
       public ByteHolder(byte value) {
  -        this._value = value;
  +        this.value = value;
       }
   }
   
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DateHolder.java	2001/10/30 16:46:33	1.5
  +++ DateHolder.java	2001/12/13 19:07:39	1.6
  @@ -64,7 +64,7 @@
   public final class DateHolder implements java.io.Serializable {
   
       /** Field _value           */
  -    public Date _value;
  +    public Date value;
   
       /**
        * Constructor DateHolder
  @@ -77,7 +77,7 @@
        * @param value
        */
       public DateHolder(Date value) {
  -        this._value = value;
  +        this.value = value;
       }
   }
   
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DoubleHolder.java	2001/10/30 16:46:33	1.5
  +++ DoubleHolder.java	2001/12/13 19:07:39	1.6
  @@ -62,7 +62,7 @@
   public final class DoubleHolder implements java.io.Serializable {
   
       /** Field _value           */
  -    public double _value;
  +    public double value;
   
       /**
        * Constructor DoubleHolder
  @@ -75,7 +75,7 @@
        * @param value
        */
       public DoubleHolder(double value) {
  -        this._value = value;
  +        this.value = value;
       }
   }
   
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FloatHolder.java	2001/10/30 16:46:33	1.5
  +++ FloatHolder.java	2001/12/13 19:07:39	1.6
  @@ -62,7 +62,7 @@
   public final class FloatHolder implements java.io.Serializable {
   
       /** Field _value           */
  -    public float _value;
  +    public float value;
   
       /**
        * Constructor FloatHolder
  @@ -75,7 +75,7 @@
        * @param value
        */
       public FloatHolder(float value) {
  -        this._value = value;
  +        this.value = value;
       }
   }
   
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- IntHolder.java	2001/10/30 16:46:33	1.5
  +++ IntHolder.java	2001/12/13 19:07:39	1.6
  @@ -62,7 +62,7 @@
   public final class IntHolder implements java.io.Serializable {
   
       /** Field _value           */
  -    public int _value;
  +    public int value;
   
       /**
        * Constructor IntHolder
  @@ -75,7 +75,7 @@
        * @param value
        */
       public IntHolder(int value) {
  -        this._value = value;
  +        this.value = value;
       }
   }
   
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LongHolder.java	2001/10/30 16:46:33	1.5
  +++ LongHolder.java	2001/12/13 19:07:39	1.6
  @@ -62,7 +62,7 @@
   public final class LongHolder implements java.io.Serializable {
   
       /** Field _value           */
  -    public long _value;
  +    public long value;
   
       /**
        * Constructor LongHolder
  @@ -75,7 +75,7 @@
        * @param value
        */
       public LongHolder(long value) {
  -        this._value = value;
  +        this.value = value;
       }
   }
   
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- QNameHolder.java	2001/10/30 16:46:33	1.5
  +++ QNameHolder.java	2001/12/13 19:07:39	1.6
  @@ -64,7 +64,7 @@
   public final class QNameHolder implements java.io.Serializable {
   
       /** Field _value           */
  -    public QName _value;
  +    public QName value;
   
       /**
        * Constructor QNameHolder
  @@ -77,7 +77,7 @@
        * @param value
        */
       public QNameHolder(QName value) {
  -        this._value = value;
  +        this.value = value;
       }
   }
   
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ShortHolder.java	2001/10/30 16:46:33	1.5
  +++ ShortHolder.java	2001/12/13 19:07:39	1.6
  @@ -62,7 +62,7 @@
   public final class ShortHolder implements java.io.Serializable {
   
       /** Field _value           */
  -    public short _value;
  +    public short value;
   
       /**
        * Constructor ShortHolder
  @@ -75,7 +75,7 @@
        * @param value
        */
       public ShortHolder(short value) {
  -        this._value = value;
  +        this.value = value;
       }
   }
   
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StringHolder.java	2001/10/30 16:46:33	1.5
  +++ StringHolder.java	2001/12/13 19:07:39	1.6
  @@ -62,7 +62,7 @@
   public final class StringHolder implements java.io.Serializable {
   
       /** Field _value           */
  -    public String _value;
  +    public String value;
   
       /**
        * Constructor StringHolder
  @@ -75,7 +75,7 @@
        * @param value
        */
       public StringHolder(String value) {
  -        this._value = value;
  +        this.value = value;
       }
   }
   
  
  
  
  1.4       +2 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavaHolderWriter.java	2001/12/13 17:33:17	1.3
  +++ JavaHolderWriter.java	2001/12/13 19:07:39	1.4
  @@ -87,13 +87,13 @@
       protected void writeFileBody() throws IOException {
           String holderType = Utils.getJavaLocalName(type.getName());
           pw.println("public final class " + className + " implements java.io.Serializable {");
  -        pw.println("    public " + holderType + " _value;");
  +        pw.println("    public " + holderType + " value;");
           pw.println();
           pw.println("    public " + className + "() {");
           pw.println("    }");
           pw.println();
           pw.println("    public " + className + "(" + holderType + " value) {");
  -        pw.println("        this._value = value;");
  +        pw.println("        this.value = value;");
           pw.println("    }");
           pw.println();
           pw.println("    // ?++?");
  
  
  
  1.2       +1 -1      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JavaImplWriter.java	2001/12/11 15:08:47	1.1
  +++ JavaImplWriter.java	2001/12/13 19:07:39	1.2
  @@ -136,7 +136,7 @@
   
               if (param.mode == Parameter.OUT) {
                   pw.print("        " + Utils.xmlNameToJava(param.name)
  -                        + "._value = ");
  +                        + ".value = ");
                   if ( isPrimitiveType(param.type) ) {
                       if ( "boolean".equals(paramType) ) {
                           pw.print("false");
  
  
  
  1.3       +2 -2      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java
  
  Index: JavaSkelWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaSkelWriter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavaSkelWriter.java	2001/12/13 17:11:56	1.2
  +++ JavaSkelWriter.java	2001/12/13 19:07:39	1.3
  @@ -219,7 +219,7 @@
                   Parameter p = (Parameter) parms.list.get(i);
                   while (p.mode != Parameter.INOUT)
                       p = (Parameter) parms.list.get(++i);
  -                pw.println("        return " + wrapPrimitiveType(p.type, p.name + "Holder._value") + ";");
  +                pw.println("        return " + wrapPrimitiveType(p.type, p.name + "Holder.value") + ";");
               }
               else {
                   // There are more than 1 output parts, so create a Vector to put them into.
  @@ -230,7 +230,7 @@
                       Parameter p = (Parameter) parms.list.get(i);
   
                       if (p.mode != Parameter.IN)
  -                        pw.println("        list.add(new org.apache.axis.message.RPCParam(\"" + p.name + "\", " + wrapPrimitiveType(p.type, p.name + "Holder._value") +"));");
  +                        pw.println("        list.add(new org.apache.axis.message.RPCParam(\"" + p.name + "\", " + wrapPrimitiveType(p.type, p.name + "Holder.value") +"));");
                   }
                   pw.println("        return list;");
               }
  
  
  
  1.4       +6 -6      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java
  
  Index: JavaStubWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavaStubWriter.java	2001/12/13 17:33:17	1.3
  +++ JavaStubWriter.java	2001/12/13 19:07:39	1.4
  @@ -424,7 +424,7 @@
               if (p.mode == Parameter.IN)
                   pw.print(wrapPrimitiveType(p.type, javifiedName));
               else if (p.mode == Parameter.INOUT)
  -                pw.print(wrapPrimitiveType(p.type, javifiedName + "._value"));
  +                pw.print(wrapPrimitiveType(p.type, javifiedName + ".value"));
           }
           pw.println("});");
           pw.println();
  @@ -450,12 +450,12 @@
                       if (p.type.getName().endsWith("[]")) {
                           pw.println("             // REVISIT THIS!");
                           pw.println ("            " + javifiedName
  -                                    + "._value = (" + p.type.getName()
  +                                    + ".value = (" + p.type.getName()
                                       + ") org.apache.axis.utils.JavaUtils.convert(resp, "
                                       + p.type.getName() + ".class);");
                       }
                       else {
  -                        pw.println ("            " + javifiedName + "._value = "
  +                        pw.println ("            " + javifiedName + ".value = "
                                   + getResponseString(p.type, "resp"));
                       }
                   }
  @@ -494,19 +494,19 @@
                               if (p.type.getName().endsWith("[]")) {
                                   pw.println("             // REVISIT THIS!");
                                   pw.println ("            " + javifiedName
  -                                        + "._value = (" + p.type.getName()
  +                                        + ".value = (" + p.type.getName()
                                           + ") org.apache.axis.utils.JavaUtils.convert(resp, "
                                           + p.type.getName() + ".class);");
                               }
                               else {
                                   pw.println ("            " + javifiedName +
  -                                            "._value = " +
  +                                            ".value = " +
                                               getResponseString(p.type,  "resp"));
                               }
                           }
                           else {
                               pw.println ("            " + javifiedName
  -                                    + "._value = " + getResponseString(p.type,
  +                                    + ".value = " + getResponseString(p.type,
                                       "((org.apache.axis.message.RPCParam) output.get("
                                       + outdex++ + ")).getValue()"));
                           }
  
  
  
  1.8       +70 -70    xml-axis/java/test/inout/DetailedInoutTestCase.java
  
  Index: DetailedInoutTestCase.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/inout/DetailedInoutTestCase.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DetailedInoutTestCase.java	2001/12/05 21:45:09	1.7
  +++ DetailedInoutTestCase.java	2001/12/13 19:07:40	1.8
  @@ -115,13 +115,13 @@
           try
           {
               io.out0Inout1In0 (ph);
  -            assertTrue("out0Inout1In0 returned bad value", equals(ph._value, returnPhone));
  +            assertTrue("out0Inout1In0 returned bad value", equals(ph.value, returnPhone));
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  out0Inout1In0\nexpected phone = "
                                              + printPhone (returnPhone) + "\nactual phone = "
  -                                           + printPhone (ph._value) + t.getMessage());
  +                                           + printPhone (ph.value) + t.getMessage());
           }
       }
   
  @@ -131,12 +131,12 @@
           try
           {
               io.out0Inout1In1 (sh, expectedAddress);
  -            assertEquals("StringHolder returned bad value", "out0Inout1In1 yo ho ho!", sh._value);
  +            assertEquals("StringHolder returned bad value", "out0Inout1In1 yo ho ho!", sh.value);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  out0Inout1In1\nexpected string = out0Inout1In1 yo ho ho!\nactual string = "
  -                                           + sh._value + t.getMessage());
  +                                           + sh.value + t.getMessage());
           }
       }
   
  @@ -146,13 +146,13 @@
           try
           {
               io.out0Inout1InMany ("out0Inout1InMany", expectedAddress, ph);
  -            assertTrue("out0Inout1InMany returned bad value", equals(ph._value, returnPhone));
  +            assertTrue("out0Inout1InMany returned bad value", equals(ph.value, returnPhone));
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  out0Inout1InMany\nexpected phone = "
                                              + printPhone (returnPhone) + "\nactual phone = "
  -                                           + printPhone (ph._value) + t.getMessage());
  +                                           + printPhone (ph.value) + t.getMessage());
           }
       }
   
  @@ -163,14 +163,14 @@
           try
           {
               io.out0InoutManyIn0 (sh, ah);
  -            assertEquals("out0InoutManyIn0 yo ho ho!", sh._value);
  -            assertTrue("out0InoutManyIn0 returned bad value", equals (ah._value, returnAddress));
  +            assertEquals("out0InoutManyIn0 yo ho ho!", sh.value);
  +            assertTrue("out0InoutManyIn0 returned bad value", equals (ah.value, returnAddress));
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  out0InoutManyIn0\nexpected string = out0InoutManyIn0 yo ho ho!\nactual string = "
  -                                           + sh._value + "\nexpected address =\n" + printAddress (returnAddress)
  -                                           + "\nactual address =\n" + printAddress (ah._value) + t.getMessage());
  +                                           + sh.value + "\nexpected address =\n" + printAddress (returnAddress)
  +                                           + "\nactual address =\n" + printAddress (ah.value) + t.getMessage());
           }
       }
   
  @@ -181,8 +181,8 @@
               StringHolder sh = new StringHolder ("out0InoutManyIn1");
               AddressHolder ah = new AddressHolder (expectedAddress);
               io.out0InoutManyIn1 (sh, ah, expectedPhone);
  -            assertEquals("out0InoutManyIn1 yo ho ho!", sh._value);
  -            assertTrue("testOut0InoutManyIn1 returned bad value", equals (ah._value, returnAddress));
  +            assertEquals("out0InoutManyIn1 yo ho ho!", sh.value);
  +            assertTrue("testOut0InoutManyIn1 returned bad value", equals (ah.value, returnAddress));
           }
           catch (Throwable t)
           {
  @@ -197,14 +197,14 @@
           try
           {
               io.out0InoutManyInMany (sh, ah, expectedPhone, expectedNumber);
  -            assertEquals("out0InoutManyInMany yo ho ho!", sh._value);
  -            assertTrue(equals (ah._value, returnAddress));
  +            assertEquals("out0InoutManyInMany yo ho ho!", sh.value);
  +            assertTrue(equals (ah.value, returnAddress));
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  out0InoutManyInMany\nexpected string = out0InoutManyInMany yo ho ho!\nactual string = "
  -                                           + sh._value + "\nexpected address =\n" + printAddress (returnAddress)
  -                                           + "\nactual address =\n" + printAddress (ah._value) + t.getMessage());
  +                                           + sh.value + "\nexpected address =\n" + printAddress (returnAddress)
  +                                           + "\nactual address =\n" + printAddress (ah.value) + t.getMessage());
           }
       }
   
  @@ -260,13 +260,13 @@
           try
           {
               ret = io.out1Inout1In0 (sh);
  -            assertEquals("out1Inout1In0 yo ho ho!", sh._value);
  +            assertEquals("out1Inout1In0 yo ho ho!", sh.value);
               assertTrue(equals (ret, returnAddress));
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  out1Inout1In0\nexpected string = out1Inout1In0 yo ho ho!\nactual string = "
  -                                           + sh._value + "\nexpected address =\n" + printAddress (returnAddress)
  +                                           + sh.value + "\nexpected address =\n" + printAddress (returnAddress)
                                              + "\nactual address =\n" + printAddress (ret) + t.getMessage());
           }
       }
  @@ -278,13 +278,13 @@
           try
           {
               ret = io.out1Inout1In1 (sh, expectedAddress);
  -            assertEquals("out1Inout1In1 yo ho ho!", sh._value);
  +            assertEquals("out1Inout1In1 yo ho ho!", sh.value);
               assertEquals("out1Inout1In1 arghhh!", ret);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  out1Inout1In1\nexpected string1 = out1Inout1In1 yo ho ho!\nactual string1 = "
  -                                           + sh._value + "\nexpected string2 = out1Inout1In1 arghhh!\nactual string2 = " + ret);
  +                                           + sh.value + "\nexpected string2 = out1Inout1In1 arghhh!\nactual string2 = " + ret);
           }
       }
   
  @@ -295,13 +295,13 @@
           try
           {
               ret = io.out1Inout1InMany (sh, expectedAddress, expectedPhone);
  -            assertEquals("out1Inout1InMany yo ho ho!", sh._value);
  +            assertEquals("out1Inout1InMany yo ho ho!", sh.value);
               assertEquals("out1Inout1InMany arghhh!", ret);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  out1Inout1InMany\nexpected string1 = out1Inout1InMany yo ho ho!\nactual string1 = "
  -                                           + sh._value + "\nexpected string2 = out1Inout1InMany arghhh!\nactual string2 = " + ret + t.getMessage());
  +                                           + sh.value + "\nexpected string2 = out1Inout1InMany arghhh!\nactual string2 = " + ret + t.getMessage());
           }
       }
   
  @@ -313,15 +313,15 @@
           try
           {
               ret = io.out1InoutManyIn0 (sh, ah);
  -            assertEquals("out1InoutManyIn0 yo ho ho!", sh._value);
  -            assertTrue(equals (ah._value, returnAddress));
  +            assertEquals("out1InoutManyIn0 yo ho ho!", sh.value);
  +            assertTrue(equals (ah.value, returnAddress));
               assertEquals("out1InoutManyIn0 arghhh!", ret);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  out1InoutManyIn0\nexpected string1 = out1InoutManyIn0 yo ho ho!\nactual string1 = "
  -                                           + sh._value + "\nexpected address = " + printAddress (returnAddress)
  -                                           + "\nactual address = " + printAddress (ah._value)
  +                                           + sh.value + "\nexpected address = " + printAddress (returnAddress)
  +                                           + "\nactual address = " + printAddress (ah.value)
                                              + "\nexpected string2 = out1InoutManyIn0 arghhh!\nactual string2 = " + ret + t.getMessage());
           }
       }
  @@ -334,15 +334,15 @@
           try
           {
               ret = io.out1InoutManyIn1 (sh, ah, expectedPhone);
  -            assertEquals("out1InoutManyIn1 yo ho ho!", sh._value);
  -            assertTrue(equals (ah._value, returnAddress));
  +            assertEquals("out1InoutManyIn1 yo ho ho!", sh.value);
  +            assertTrue(equals (ah.value, returnAddress));
               assertEquals("out1InoutManyIn1 arghhh!", ret);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  out1InoutManyIn1\nexpected string1 = out1InoutManyIn1 yo ho ho!\nactual string1 = "
  -                                           + sh._value + "\nexpected address = " + printAddress (returnAddress)
  -                                           + "\nactual address = " + printAddress (ah._value)
  +                                           + sh.value + "\nexpected address = " + printAddress (returnAddress)
  +                                           + "\nactual address = " + printAddress (ah.value)
                                              + "\nexpected string2 = out1InoutManyIn1 arghhh!\nactual string2 = " + ret + t.getMessage());
           }
       }
  @@ -355,15 +355,15 @@
           try
           {
               ret = io.out1InoutManyInMany (sh, ah, expectedPhone, expectedNumber);
  -            assertEquals("out1InoutManyInMany yo ho ho!", sh._value);
  -            assertTrue(equals (ah._value, returnAddress));
  +            assertEquals("out1InoutManyInMany yo ho ho!", sh.value);
  +            assertTrue(equals (ah.value, returnAddress));
               assertEquals("out1InoutManyInMany arghhh!", ret);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  out1InoutManyInMany\nexpected string1 = out1InoutManyInMany yo ho ho!\nactual string1 = "
  -                                           + sh._value + "\nexpected address = " + printAddress (returnAddress)
  -                                           + "\nactual address = " + printAddress (ah._value)
  +                                           + sh.value + "\nexpected address = " + printAddress (returnAddress)
  +                                           + "\nactual address = " + printAddress (ah.value)
                                              + "\nexpected string2 = out1InoutManyInMany arghhh!\nactual string2 = " + ret + t.getMessage());
           }
       }
  @@ -375,14 +375,14 @@
           try
           {
               ret = io.outManyInout0In0 (ah);
  -            assertTrue(equals (ah._value, returnAddress));
  +            assertTrue(equals (ah.value, returnAddress));
               assertEquals(" arghhh!", ret);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  outManyInout0In0\nexpected address = "
                                              + printAddress (returnAddress) + "\nactual address = "
  -                                           + printAddress (ah._value) + "\nexpected string =  arghhh!\nactual string = "
  +                                           + printAddress (ah.value) + "\nexpected string =  arghhh!\nactual string = "
                                              + ret + t.getMessage());
           }
       }
  @@ -394,13 +394,13 @@
           try
           {
               ret = io.outManyInout0In1 ("outManyInout0In1", sh);
  -            assertEquals(" yo ho ho!", sh._value);
  +            assertEquals(" yo ho ho!", sh.value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  outManyInout0In1\nexpected string =  yo ho ho!\nactual string = "
  -                                           + sh._value + "\nexpected number = " + returnNumber
  +                                           + sh.value + "\nexpected number = " + returnNumber
                                              + "\nactual number = " + ret + t.getMessage());
           }
       }
  @@ -412,13 +412,13 @@
           try
           {
               ret = io.outManyInout0InMany ("outManyInout0InMany", expectedAddress, sh);
  -            assertEquals(" yo ho ho!", sh._value);
  +            assertEquals(" yo ho ho!", sh.value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  outManyInout0InMany\nexpected string =  yo ho ho!\nactual string = "
  -                                           + sh._value + "\nexpected number = " + returnNumber
  +                                           + sh.value + "\nexpected number = " + returnNumber
                                              + "\nactual number = " + ret + t.getMessage());
           }
       }
  @@ -431,15 +431,15 @@
           try
           {
               ret = io.outManyInout1In0 (shinout, shout);
  -            assertEquals("outManyInout1In0 yo ho ho!", shinout._value);
  -            assertEquals(" yo ho ho!", shout._value);
  +            assertEquals("outManyInout1In0 yo ho ho!", shinout.value);
  +            assertEquals(" yo ho ho!", shout.value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  outManyInout1In0\nexpected string1 = outManyInout1In0 yo ho ho!\nactual string1 = "
  -                                           + shinout._value + "\nexpected string2 =  yo ho ho!\nactual string2 = "
  -                                           + shout._value + "\nexpected number = " + returnNumber
  +                                           + shinout.value + "\nexpected string2 =  yo ho ho!\nactual string2 = "
  +                                           + shout.value + "\nexpected number = " + returnNumber
                                              + "\nactual number = " + ret + t.getMessage());
           }
       }
  @@ -452,15 +452,15 @@
           try
           {
               ret = io.outManyInout1In1 (shinout, expectedAddress, shout);
  -            assertEquals("outManyInout1In1 yo ho ho!", shinout._value);
  -            assertEquals(" yo ho ho!", shout._value);
  +            assertEquals("outManyInout1In1 yo ho ho!", shinout.value);
  +            assertEquals(" yo ho ho!", shout.value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  outManyInout1In1\nexpected string1 = outManyInout1In1 yo ho ho!\nactual string = "
  -                                           + shinout._value + "\nexpected string2 =  yo ho ho!\nactual string2 = "
  -                                           + shout._value + "\nexpected number = " + returnNumber
  +                                           + shinout.value + "\nexpected string2 =  yo ho ho!\nactual string2 = "
  +                                           + shout.value + "\nexpected number = " + returnNumber
                                              + "\nactual number = " + ret + t.getMessage());
           }
       }
  @@ -473,16 +473,16 @@
           try
           {
               ret = io.outManyInout1InMany ("outManyInout1InMany", expectedAddress, ph, sh);
  -            assertTrue(equals (ph._value, returnPhone));
  -            assertEquals(" yo ho ho!", sh._value);
  +            assertTrue(equals (ph.value, returnPhone));
  +            assertEquals(" yo ho ho!", sh.value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  outManyInout1InMany\nexpected phone = "
                                              + printPhone (returnPhone) + "\nactual phone = "
  -                                           + printPhone (ph._value) + "\nexpected string =  yo ho ho!\nactual string = "
  -                                           + sh._value + "\nexpected number = " + returnNumber
  +                                           + printPhone (ph.value) + "\nexpected string =  yo ho ho!\nactual string = "
  +                                           + sh.value + "\nexpected number = " + returnNumber
                                              + "\nactual number = " + ret + t.getMessage());
           }
       }
  @@ -496,17 +496,17 @@
           try
           {
               ret = io.outManyInoutManyIn0 (shinout, ah, shout);
  -            assertEquals("outManyInoutManyIn0 yo ho ho!", shinout._value);
  -            assertTrue(equals (ah._value, returnAddress));
  -            assertEquals(" yo ho ho!", shout._value);
  +            assertEquals("outManyInoutManyIn0 yo ho ho!", shinout.value);
  +            assertTrue(equals (ah.value, returnAddress));
  +            assertEquals(" yo ho ho!", shout.value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  outManyInoutManyIn0\nexpected string1 = outManyInoutManyIn0 yo ho ho!\nactual string1 = "
  -                                           + shinout._value + "\nexpected address = " + printAddress (returnAddress)
  -                                           + "\nactual address = " + printAddress (ah._value) + "\nexpected string2 =  yo ho ho!\nactual string2 = "
  -                                           + shout._value + "\nexpected number = " + returnNumber + "\nactual number = "
  +                                           + shinout.value + "\nexpected address = " + printAddress (returnAddress)
  +                                           + "\nactual address = " + printAddress (ah.value) + "\nexpected string2 =  yo ho ho!\nactual string2 = "
  +                                           + shout.value + "\nexpected number = " + returnNumber + "\nactual number = "
                                              + ret + t.getMessage());
           }
       }
  @@ -520,17 +520,17 @@
           try
           {
               ret = io.outManyInoutManyIn1 (shinout, ah, expectedPhone, shout);
  -            assertEquals("outManyInoutManyIn1 yo ho ho!", shinout._value);
  -            assertTrue(equals (ah._value, returnAddress));
  -            assertEquals(" yo ho ho!", shout._value);
  +            assertEquals("outManyInoutManyIn1 yo ho ho!", shinout.value);
  +            assertTrue(equals (ah.value, returnAddress));
  +            assertEquals(" yo ho ho!", shout.value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  outManyInoutManyIn1\nexpected string1 = outManyInoutManyIn1 yo ho ho!\nactual string1 = "
  -                                           + shinout._value + "\nexpected address = " + printAddress (returnAddress)
  -                                           + "\nactual address = " + printAddress (ah._value)
  -                                           + "\nexpected string2 =  yo ho ho!\nactual string2 = " + shout._value
  +                                           + shinout.value + "\nexpected address = " + printAddress (returnAddress)
  +                                           + "\nactual address = " + printAddress (ah.value)
  +                                           + "\nexpected string2 =  yo ho ho!\nactual string2 = " + shout.value
                                              + "\nexpected number = " + returnNumber
                                              + "\nactual number = " + ret + t.getMessage());
           }
  @@ -545,17 +545,17 @@
           try
           {
               ret = io.outManyInoutManyInMany (shinout, ah, expectedPhone, expectedNumber, shout);
  -            assertEquals("outManyInoutManyInMany yo ho ho!", shinout._value);
  -            assertTrue(equals (ah._value, returnAddress));
  -            assertEquals(" yo ho ho!", shout._value);
  +            assertEquals("outManyInoutManyInMany yo ho ho!", shinout.value);
  +            assertTrue(equals (ah.value, returnAddress));
  +            assertEquals(" yo ho ho!", shout.value);
               assertEquals(returnNumber, ret);
           }
           catch (Throwable t)
           {
               throw new AssertionFailedError("Test failure:  outManyInoutManyInMany\nexpected string1 = outManyInoutManyInMany yo ho ho!\nactual string1 = "
  -                                           + shinout._value + "\nexpected address = " + printAddress (returnAddress)
  -                                           + "\nactual address = " + printAddress (ah._value)
  -                                           + "\nexpected string2 =  yo ho ho!\nactual string2 = " + shout._value
  +                                           + shinout.value + "\nexpected address = " + printAddress (returnAddress)
  +                                           + "\nactual address = " + printAddress (ah.value)
  +                                           + "\nexpected string2 =  yo ho ho!\nactual string2 = " + shout.value
                                              + "\nexpected number = " + returnNumber
                                              + "\nactual number = " + ret + t.getMessage());
           }
  
  
  
  1.8       +86 -86    xml-axis/java/test/inout/InoutSOAPBindingImpl.java
  
  Index: InoutSOAPBindingImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/inout/InoutSOAPBindingImpl.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- InoutSOAPBindingImpl.java	2001/12/05 21:45:09	1.7
  +++ InoutSOAPBindingImpl.java	2001/12/13 19:07:40	1.8
  @@ -87,36 +87,36 @@
   
       public void out0Inout1In0 (PhoneHolder phone) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (phone._value, expectedPhone))
  -            phone._value = returnPhone;
  +        if (equals (phone.value, expectedPhone))
  +            phone.value = returnPhone;
           else
           {
               System.err.println ("Test failure:  out0Inout1In0");
               System.err.println ("expected phone = " + printPhone (expectedPhone));
  -            System.err.println ("actual phone = " + printPhone (phone._value));
  +            System.err.println ("actual phone = " + printPhone (phone.value));
               throw new TestFailed ();
           }
       }
   
       public void out0Inout1In1 (StringHolder name, Address address) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (address, expectedAddress) && "out0Inout1In1".equals (name._value))
  -            name._value = name._value + " yo ho ho!";
  +        if (equals (address, expectedAddress) && "out0Inout1In1".equals (name.value))
  +            name.value = name.value + " yo ho ho!";
           else
           {
               System.err.println ("Test failure:  out0Inout1In1");
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address));
               System.err.println ("expected name = out0Inout1In1");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               throw new TestFailed ();
           }
       }
   
       public void out0Inout1InMany (String name, Address address, PhoneHolder phone) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("out0Inout1InMany".equals (name) && equals (address, expectedAddress) && equals (phone._value, expectedPhone))
  -            phone._value = returnPhone;
  +        if ("out0Inout1InMany".equals (name) && equals (address, expectedAddress) && equals (phone.value, expectedPhone))
  +            phone.value = returnPhone;
           else
           {
               System.err.println ("Test failure:  out0Inout1InMany");
  @@ -125,35 +125,35 @@
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address));
               System.err.println ("expected phone = " + printPhone (expectedPhone));
  -            System.err.println ("actual phone = " + printPhone (phone._value));
  +            System.err.println ("actual phone = " + printPhone (phone.value));
               throw new TestFailed ();
           }
       }
   
       public void out0InoutManyIn0 (StringHolder name, AddressHolder address) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("out0InoutManyIn0".equals (name._value) && equals (address._value, expectedAddress))
  +        if ("out0InoutManyIn0".equals (name.value) && equals (address.value, expectedAddress))
           {
  -            name._value = name._value + " yo ho ho!";
  -            address._value = returnAddress;
  +            name.value = name.value + " yo ho ho!";
  +            address.value = returnAddress;
           }
           else
           {
               System.err.println ("Test failure:  out0InoutManyIn0");
               System.err.println ("expected name = out0InoutManyIn0");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
  -            System.err.println ("actual address =\n" + printAddress (address._value));
  +            System.err.println ("actual address =\n" + printAddress (address.value));
               throw new TestFailed ();
           }
       }
   
       public void out0InoutManyIn1 (StringHolder name, AddressHolder address, Phone phone) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (phone, expectedPhone) && "out0InoutManyIn1".equals (name._value) && equals (address._value, expectedAddress))
  +        if (equals (phone, expectedPhone) && "out0InoutManyIn1".equals (name.value) && equals (address.value, expectedAddress))
           {
  -            name._value = name._value + " yo ho ho!";
  -            address._value = returnAddress;
  +            name.value = name.value + " yo ho ho!";
  +            address.value = returnAddress;
           }
           else
           {
  @@ -161,9 +161,9 @@
               System.err.println ("expected phone = " + printPhone (expectedPhone));
               System.err.println ("actual phone = " + printPhone (phone));
               System.err.println ("expected name = out0InoutManyIn1");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
  -            System.err.println ("actual address =\n" + printAddress (address._value));
  +            System.err.println ("actual address =\n" + printAddress (address.value));
               throw new TestFailed ();
           }
       }
  @@ -171,10 +171,10 @@
   
       public void out0InoutManyInMany (StringHolder name, AddressHolder address, Phone phone, int number) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (phone, expectedPhone) && expectedNumber == number && "out0InoutManyInMany".equals (name._value) && equals (address._value, expectedAddress))
  +        if (equals (phone, expectedPhone) && expectedNumber == number && "out0InoutManyInMany".equals (name.value) && equals (address.value, expectedAddress))
           {
  -            name._value = name._value + " yo ho ho!";
  -            address._value = returnAddress;
  +            name.value = name.value + " yo ho ho!";
  +            address.value = returnAddress;
           }
           else
           {
  @@ -184,9 +184,9 @@
               System.err.println ("expected number = " + expectedNumber);
               System.err.println ("actual number = " + number);
               System.err.println ("expected name = out0InoutManyInMany");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
  -            System.err.println ("actual address =\n" + printAddress (address._value));
  +            System.err.println ("actual address =\n" + printAddress (address.value));
               throw new TestFailed ();
           }
       }
  @@ -233,25 +233,25 @@
   
       public Address out1Inout1In0 (StringHolder name) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("out1Inout1In0".equals (name._value))
  +        if ("out1Inout1In0".equals (name.value))
           {
  -            name._value = name._value + " yo ho ho!";
  +            name.value = name.value + " yo ho ho!";
               return returnAddress;
           }
           else
           {
               System.err.println ("Test failure:  out1Inout1In0");
               System.err.println ("expected name = out1Inout1In0");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               throw new TestFailed ();
           }
       }
   
       public String out1Inout1In1 (StringHolder name, Address address) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (address, expectedAddress) && "out1Inout1In1".equals (name._value))
  +        if (equals (address, expectedAddress) && "out1Inout1In1".equals (name.value))
           {
  -            name._value = name._value + " yo ho ho!";
  +            name.value = name.value + " yo ho ho!";
               return "out1Inout1In1 arghhh!";
           }
           else
  @@ -260,7 +260,7 @@
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address));
               System.err.println ("expected name = out1Inout1In1");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               throw new TestFailed ();
           }
       }
  @@ -268,9 +268,9 @@
   
       public String out1Inout1InMany (StringHolder name, Address address, Phone phone) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (address, expectedAddress) && equals (phone, expectedPhone) && "out1Inout1InMany".equals (name._value))
  +        if (equals (address, expectedAddress) && equals (phone, expectedPhone) && "out1Inout1InMany".equals (name.value))
           {
  -            name._value = name._value + " yo ho ho!";
  +            name.value = name.value + " yo ho ho!";
               return "out1Inout1InMany arghhh!";
           }
           else
  @@ -281,7 +281,7 @@
               System.err.println ("expected phone = " + printPhone (expectedPhone));
               System.err.println ("actual phone = " + printPhone (phone));
               System.err.println ("expected name = out1Inout1InMany");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               throw new TestFailed ();
           }
       }
  @@ -289,19 +289,19 @@
   
       public String out1InoutManyIn0 (StringHolder name, AddressHolder address) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("out1InoutManyIn0".equals (name._value) && equals (address._value, expectedAddress))
  +        if ("out1InoutManyIn0".equals (name.value) && equals (address.value, expectedAddress))
           {
  -            name._value = name._value + " yo ho ho!";
  -            address._value = returnAddress;
  +            name.value = name.value + " yo ho ho!";
  +            address.value = returnAddress;
               return "out1InoutManyIn0 arghhh!";
           }
           else
           {
               System.err.println ("Test failure:  out1InoutManyIn0");
               System.err.println ("expected name = out1InoutManyIn0");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
  -            System.err.println ("actual address =\n" + printAddress (address._value));
  +            System.err.println ("actual address =\n" + printAddress (address.value));
               throw new TestFailed ();
           }
       }
  @@ -309,10 +309,10 @@
   
       public String out1InoutManyIn1 (StringHolder name, AddressHolder address, Phone phone) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (phone, expectedPhone) && "out1InoutManyIn1".equals (name._value) && equals (address._value, expectedAddress))
  +        if (equals (phone, expectedPhone) && "out1InoutManyIn1".equals (name.value) && equals (address.value, expectedAddress))
           {
  -            name._value = name._value + " yo ho ho!";
  -            address._value = returnAddress;
  +            name.value = name.value + " yo ho ho!";
  +            address.value = returnAddress;
               return "out1InoutManyIn1 arghhh!";
           }
           else
  @@ -321,9 +321,9 @@
               System.err.println ("expected phone = " + printPhone (expectedPhone));
               System.err.println ("actual phone = " + printPhone (phone));
               System.err.println ("expected name = out1InoutManyIn1");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
  -            System.err.println ("actual address =\n" + printAddress (address._value));
  +            System.err.println ("actual address =\n" + printAddress (address.value));
               throw new TestFailed ();
           }
       }
  @@ -331,10 +331,10 @@
   
       public String out1InoutManyInMany (StringHolder name, AddressHolder address, Phone phone, int number) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (phone, expectedPhone) && expectedNumber == number && "out1InoutManyInMany".equals (name._value) && equals (address._value, expectedAddress))
  +        if (equals (phone, expectedPhone) && expectedNumber == number && "out1InoutManyInMany".equals (name.value) && equals (address.value, expectedAddress))
           {
  -            name._value = name._value + " yo ho ho!";
  -            address._value = returnAddress;
  +            name.value = name.value + " yo ho ho!";
  +            address.value = returnAddress;
               return "out1InoutManyInMany arghhh!";
           }
           else
  @@ -345,9 +345,9 @@
               System.err.println ("expected number = " + expectedNumber);
               System.err.println ("actual number = " + number);
               System.err.println ("expected name = out1InoutManyInMany");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
  -            System.err.println ("actual address =\n" + printAddress (address._value));
  +            System.err.println ("actual address =\n" + printAddress (address.value));
               throw new TestFailed ();
           }
       }
  @@ -355,9 +355,9 @@
   
       public String outManyInout0In0 (AddressHolder address) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (address._value == null)
  +        if (address.value == null)
           {
  -            address._value = returnAddress;
  +            address.value = returnAddress;
               return " arghhh!";
           }
           else
  @@ -367,9 +367,9 @@
   
       public int outManyInout0In1 (String name, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("outManyInout0In1".equals (name) && otherName._value == null)
  +        if ("outManyInout0In1".equals (name) && otherName.value == null)
           {
  -            otherName._value = " yo ho ho!";
  +            otherName.value = " yo ho ho!";
               return returnNumber;
           }
           else
  @@ -384,9 +384,9 @@
   
       public int outManyInout0InMany (String name, Address address, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("outManyInout0InMany".equals (name) && equals (address, expectedAddress) && otherName._value == null)
  +        if ("outManyInout0InMany".equals (name) && equals (address, expectedAddress) && otherName.value == null)
           {
  -            otherName._value = " yo ho ho!";
  +            otherName.value = " yo ho ho!";
               return returnNumber;
           }
           else
  @@ -403,17 +403,17 @@
   
       public int outManyInout1In0 (StringHolder name, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("outManyInout1In0".equals (name._value) && otherName._value == null)
  +        if ("outManyInout1In0".equals (name.value) && otherName.value == null)
           {
  -            name._value = name._value + " yo ho ho!";
  -            otherName._value = " yo ho ho!";
  +            name.value = name.value + " yo ho ho!";
  +            otherName.value = " yo ho ho!";
               return returnNumber;
           }
           else
           {
               System.err.println ("Test failure:  outManyInout1In0");
               System.err.println ("expected name = outManyInout1In0");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               throw new TestFailed ();
           }
       }
  @@ -421,10 +421,10 @@
   
       public int outManyInout1In1 (StringHolder name, Address address, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (address, expectedAddress) && "outManyInout1In1".equals (name._value) && otherName._value == null)
  +        if (equals (address, expectedAddress) && "outManyInout1In1".equals (name.value) && otherName.value == null)
           {
  -            name._value = name._value + " yo ho ho!";
  -            otherName._value = " yo ho ho!";
  +            name.value = name.value + " yo ho ho!";
  +            otherName.value = " yo ho ho!";
               return returnNumber;
           }
           else
  @@ -433,9 +433,9 @@
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address));
               System.err.println ("expected name = out1InoutManyInMany");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               System.err.println ("expected otherName = null");
  -            System.err.println ("actual otherName = " + otherName._value);
  +            System.err.println ("actual otherName = " + otherName.value);
               throw new TestFailed ();
           }
       }
  @@ -443,10 +443,10 @@
   
       public int outManyInout1InMany (String name, Address address, PhoneHolder phone, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("outManyInout1InMany".equals (name) && equals (address, expectedAddress) && equals (phone._value, expectedPhone) && otherName._value == null)
  +        if ("outManyInout1InMany".equals (name) && equals (address, expectedAddress) && equals (phone.value, expectedPhone) && otherName.value == null)
           {
  -            phone._value = returnPhone;
  -            otherName._value = " yo ho ho!";
  +            phone.value = returnPhone;
  +            otherName.value = " yo ho ho!";
               return returnNumber;
           }
           else
  @@ -457,7 +457,7 @@
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
               System.err.println ("actual address =\n" + printAddress (address));
               System.err.println ("expected phone = " + printPhone (expectedPhone));
  -            System.err.println ("actual phone = " + printPhone (phone._value));
  +            System.err.println ("actual phone = " + printPhone (phone.value));
               throw new TestFailed ();
           }
       }
  @@ -465,20 +465,20 @@
   
       public int outManyInoutManyIn0 (StringHolder name, AddressHolder address, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if ("outManyInoutManyIn0".equals (name._value) && equals (address._value, expectedAddress) && otherName._value == null)
  +        if ("outManyInoutManyIn0".equals (name.value) && equals (address.value, expectedAddress) && otherName.value == null)
           {
  -            name._value = name._value + " yo ho ho!";
  -            address._value = returnAddress;
  -            otherName._value = " yo ho ho!";
  +            name.value = name.value + " yo ho ho!";
  +            address.value = returnAddress;
  +            otherName.value = " yo ho ho!";
               return returnNumber;
           }
           else
           {
               System.err.println ("Test failure:  outManyInoutManyIn0");
               System.err.println ("expected name = outManyInoutManyIn0");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
  -            System.err.println ("actual address =\n" + printAddress (address._value));
  +            System.err.println ("actual address =\n" + printAddress (address.value));
               throw new TestFailed ();
           }
       }
  @@ -486,11 +486,11 @@
   
       public int outManyInoutManyIn1 (StringHolder name, AddressHolder address, Phone phone, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (phone, expectedPhone) && "outManyInoutManyIn1".equals (name._value) && equals (address._value, expectedAddress) && otherName._value == null)
  +        if (equals (phone, expectedPhone) && "outManyInoutManyIn1".equals (name.value) && equals (address.value, expectedAddress) && otherName.value == null)
           {
  -            name._value = name._value + " yo ho ho!";
  -            address._value = returnAddress;
  -            otherName._value = " yo ho ho!";
  +            name.value = name.value + " yo ho ho!";
  +            address.value = returnAddress;
  +            otherName.value = " yo ho ho!";
               return returnNumber;
           }
           else
  @@ -499,9 +499,9 @@
               System.err.println ("expected phone = " + printPhone (expectedPhone));
               System.err.println ("actual phone = " + printPhone (phone));
               System.err.println ("expected name = out1InoutManyInMany");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
  -            System.err.println ("actual address =\n" + printAddress (address._value));
  +            System.err.println ("actual address =\n" + printAddress (address.value));
               throw new TestFailed ();
           }
       }
  @@ -509,11 +509,11 @@
   
       public int outManyInoutManyInMany (StringHolder name, AddressHolder address, Phone phone, int otherNumber, StringHolder otherName) throws org.apache.axis.AxisFault, TestFailed
       {
  -        if (equals (phone, expectedPhone) && expectedNumber == otherNumber && "outManyInoutManyInMany".equals (name._value) && equals (address._value, expectedAddress) && otherName._value == null)
  +        if (equals (phone, expectedPhone) && expectedNumber == otherNumber && "outManyInoutManyInMany".equals (name.value) && equals (address.value, expectedAddress) && otherName.value == null)
           {
  -            name._value = name._value + " yo ho ho!";
  -            address._value = returnAddress;
  -            otherName._value = " yo ho ho!";
  +            name.value = name.value + " yo ho ho!";
  +            address.value = returnAddress;
  +            otherName.value = " yo ho ho!";
               return returnNumber;
           }
           else
  @@ -524,10 +524,10 @@
               System.err.println ("expected number = " + expectedNumber);
               System.err.println ("actual number = " + otherNumber);
               System.err.println ("expected name = outManyInoutManyInMany");
  -            System.err.println ("actual name = " + name._value);
  +            System.err.println ("actual name = " + name.value);
               System.err.println ("expected address =\n" + printAddress (expectedAddress));
  -            System.err.println ("actual address =\n" + printAddress (address._value));
  +            System.err.println ("actual address =\n" + printAddress (address.value));
               throw new TestFailed ();
           }
       }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.2       +10 -10    xml-axis/java/test/multiref/MultiRefTestSOAPBindingImpl.java
  
  Index: MultiRefTestSOAPBindingImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/multiref/MultiRefTestSOAPBindingImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MultiRefTestSOAPBindingImpl.java	2001/11/06 21:41:55	1.1
  +++ MultiRefTestSOAPBindingImpl.java	2001/12/13 19:07:40	1.2
  @@ -71,7 +71,7 @@
        *      1   2
        */
       public int testSimpleTree(test.multiref.NodeHolder root) throws java.rmi.RemoteException {
  -        Node t = root._value;    // Root of tree 
  +        Node t = root.value;    // Root of tree 
           Node l = t.getLeft();    // Left side
           Node r = t.getRight();   // Right side
   
  @@ -95,7 +95,7 @@
        *        3
        */
       public int testDiamond(test.multiref.NodeHolder root) throws java.rmi.RemoteException {
  -        Node t = root._value;    // Root of tree 
  +        Node t = root.value;    // Root of tree 
           Node l = t.getLeft();    // Left side
           Node r = t.getRight();   // Right side
   
  @@ -117,7 +117,7 @@
        *      1   2   and the children of 1 & 2 are backward references to 0
        */
       public int testLoop(test.multiref.NodeHolder root) throws java.rmi.RemoteException {
  -        Node t = root._value;    // Root of tree 
  +        Node t = root.value;    // Root of tree 
           Node l = t.getLeft();    // Left side
           Node r = t.getRight();   // Right side
   
  @@ -137,7 +137,7 @@
        *        and the children of 0 are backward references to 0
        */
       public int testSelfRef(test.multiref.NodeHolder root) throws java.rmi.RemoteException {
  -        Node t = root._value;    // Root of tree 
  +        Node t = root.value;    // Root of tree 
           Node l = t.getLeft();    // Left side
           Node r = t.getRight();   // Right side
   
  @@ -153,8 +153,8 @@
        */
       public int testSameArgs(test.multiref.NodeHolder root1,test.multiref.NodeHolder root2)
           throws java.rmi.RemoteException {
  -        Node t1 = root1._value;    // Root1 of tree 
  -        Node t2 = root2._value;    // Root2 of tree 
  +        Node t1 = root1.value;    // Root1 of tree 
  +        Node t2 = root2.value;    // Root2 of tree 
   
           if (t1 != null && t2 != null  &&
               t1 == t2 &&
  @@ -173,8 +173,8 @@
        */
       public int testArgsRefSameNode(test.multiref.NodeHolder root1,test.multiref.NodeHolder root2)
           throws java.rmi.RemoteException {
  -        Node t1 = root1._value;    // Root1 of tree 
  -        Node t2 = root2._value;    // Root2 of tree 
  +        Node t1 = root1.value;    // Root1 of tree 
  +        Node t2 = root2.value;    // Root2 of tree 
   
           if (t1 != null && t2 != null &&
               t1 != t2 &&
  @@ -193,8 +193,8 @@
        */
       public int testArgsRefEachOther(test.multiref.NodeHolder root1,test.multiref.NodeHolder root2)
           throws java.rmi.RemoteException {
  -        Node t1 = root1._value;    // Root1 of tree 
  -        Node t2 = root2._value;    // Root2 of tree 
  +        Node t1 = root1.value;    // Root1 of tree 
  +        Node t2 = root2.value;    // Root2 of tree 
   
           if (t1 != null && t2 != null &&
               t1 != t2 &&
  
  
  

Mime
View raw message