axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdani...@apache.org
Subject cvs commit: xml-axis/java/test/wsdl/interop4/groupH/simpleDocLit SimpleDocLitBindingImpl.java SimpleDocLitServiceTestCase.java build.xml
Date Mon, 07 Oct 2002 03:42:28 GMT
gdaniels    2002/10/06 20:42:28

  Modified:    java/src/org/apache/axis/encoding Tag: interop4
                        DeserializerImpl.java
               java/src/org/apache/axis/encoding/ser Tag: interop4
                        ArrayDeserializer.java SimpleDeserializer.java
               java/test/wsdl/interop4/groupH/simpleDocLit Tag: interop4
                        build.xml
  Added:       java/test/wsdl/interop4/groupH/complexRPCenc Tag: interop4
                        ComplexRpcEncBindingImpl.java
                        ComplexRpcEncServiceTestCase.java
               java/test/wsdl/interop4/groupH/simpleDocLit Tag: interop4
                        SimpleDocLitBindingImpl.java
                        SimpleDocLitServiceTestCase.java
  Log:
  Add test code for complex RPC and simple doc lit
  
  Fix componentsReady() logic a bit more.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.30.2.4  +2 -5      xml-axis/java/src/org/apache/axis/encoding/DeserializerImpl.java
  
  Index: DeserializerImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializerImpl.java,v
  retrieving revision 1.30.2.3
  retrieving revision 1.30.2.4
  diff -u -r1.30.2.3 -r1.30.2.4
  --- DeserializerImpl.java	7 Oct 2002 02:23:27 -0000	1.30.2.3
  +++ DeserializerImpl.java	7 Oct 2002 03:42:27 -0000	1.30.2.4
  @@ -99,7 +99,6 @@
       protected Vector targets = null;
   
       protected QName defaultType = null;
  -    protected boolean componentsReady = true;
       
       /**
        * A set of sub-deserializers whose values must complete before our
  @@ -162,9 +161,8 @@
               
               // If we're past the end of our XML, and this is the last one,
               // our value has been assembled completely.
  -            if (isEnded && activeDeserializers.isEmpty()) {
  +            if (componentsReady()) {
                   // Got everything we need, call valueComplete()
  -                componentsReady = true;
                   valueComplete();
               }
           }        
  @@ -259,7 +257,7 @@
        * The default (true) is useful for most Deserializers.
        */
       public boolean componentsReady() {
  -        return componentsReady;
  +        return (!isHref && isEnded && activeDeserializers.isEmpty());
       }
   
       /** 
  @@ -392,7 +390,6 @@
               if (ref == null) {
                   // Nothing yet... register for later interest.
                   context.registerFixup(href, this);
  -                componentsReady = false;
                   return;
               }
               
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.30.2.2  +2 -1      xml-axis/java/src/org/apache/axis/encoding/ser/ArrayDeserializer.java
  
  Index: ArrayDeserializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ArrayDeserializer.java,v
  retrieving revision 1.30.2.1
  retrieving revision 1.30.2.2
  diff -u -r1.30.2.1 -r1.30.2.2
  --- ArrayDeserializer.java	7 Oct 2002 02:23:28 -0000	1.30.2.1
  +++ ArrayDeserializer.java	7 Oct 2002 03:42:28 -0000	1.30.2.2
  @@ -529,7 +529,8 @@
                  // We must ignore exceptions from convert for Arrays with null - why?
              }
           }     
  -         super.valueComplete();
  +        
  +        super.valueComplete();
       }
   
       /**
  
  
  
  1.28.2.3  +0 -1      xml-axis/java/src/org/apache/axis/encoding/ser/SimpleDeserializer.java
  
  Index: SimpleDeserializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/SimpleDeserializer.java,v
  retrieving revision 1.28.2.2
  retrieving revision 1.28.2.3
  diff -u -r1.28.2.2 -r1.28.2.3
  --- SimpleDeserializer.java	7 Oct 2002 02:23:28 -0000	1.28.2.2
  +++ SimpleDeserializer.java	7 Oct 2002 03:42:28 -0000	1.28.2.3
  @@ -212,7 +212,6 @@
           }
           try {
               value = makeValue(val.toString());
  -            componentsReady = true;
           } catch (InvocationTargetException ite) {
               Throwable realException = ite.getTargetException();
               if (realException instanceof Exception)
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +39 -0     xml-axis/java/test/wsdl/interop4/groupH/complexRPCenc/Attic/ComplexRpcEncBindingImpl.java
  
  
  
  
  1.1.2.1   +196 -0    xml-axis/java/test/wsdl/interop4/groupH/complexRPCenc/Attic/ComplexRpcEncServiceTestCase.java
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +1 -1      xml-axis/java/test/wsdl/interop4/groupH/simpleDocLit/Attic/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/interop4/groupH/simpleDocLit/Attic/build.xml,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- build.xml	7 Oct 2002 02:23:28 -0000	1.1.2.2
  +++ build.xml	7 Oct 2002 03:42:28 -0000	1.1.2.3
  @@ -53,7 +53,7 @@
           
           <!-- generate skeletons -->
           <wsdl2java url="${axis.home}/test/wsdl/interop4/groupH/simpleDocLit/simple-doc-literal.wsdl"
  -            output="${root.dir}/build/work" skeletonDeploy="no"
  +            output="${root.dir}/build/work" skeletonDeploy="no" testCase="yes"
               serverSide="yes">
               <mapping namespace="http://soapinterop.org/wsdl" package="test.wsdl.interop4.groupH.simpleDocLit"/>
               <mapping namespace="http://soapinterop.org/types" package="test.wsdl.interop4.groupH.simpleDocLit"/>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +63 -0     xml-axis/java/test/wsdl/interop4/groupH/simpleDocLit/Attic/SimpleDocLitBindingImpl.java
  
  
  
  
  1.1.2.1   +263 -0    xml-axis/java/test/wsdl/interop4/groupH/simpleDocLit/Attic/SimpleDocLitServiceTestCase.java
  
  
  
  

Mime
View raw message