axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdani...@apache.org
Subject cvs commit: ws-axis/java/test/wsdl/doclit_arrays deploy.wsdd
Date Tue, 12 Apr 2005 17:35:47 GMT
gdaniels    2005/04/12 10:35:47

  Modified:    java/src/org/apache/axis/encoding/ser Tag: LiteralArrayWork
                        BeanDeserializer.java
               java/src/org/apache/axis/i18n Tag: LiteralArrayWork
                        resource.properties
               java/src/org/apache/axis/message Tag: LiteralArrayWork
                        RPCHandler.java
               java/test/wsdl/doclit_arrays Tag: LiteralArrayWork
                        deploy.wsdd
  Log:
  Get all-tests working on LiteralArrayWork branch.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.71.2.3  +1 -1      ws-axis/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java
  
  Index: BeanDeserializer.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java,v
  retrieving revision 1.71.2.2
  retrieving revision 1.71.2.3
  diff -u -r1.71.2.2 -r1.71.2.3
  --- BeanDeserializer.java	12 Apr 2005 14:34:20 -0000	1.71.2.2
  +++ BeanDeserializer.java	12 Apr 2005 17:35:47 -0000	1.71.2.3
  @@ -291,7 +291,7 @@
   
           // Fastpath nil checks...
           if (context.isNil(attributes)) {
  -            if (propDesc != null && propDesc.isIndexedOrArray()) {
  +            if (propDesc != null && propDesc.isIndexed()) {
                   if (!((dSer != null) && (dSer instanceof ArrayDeserializer))) {
                       collectionIndex++;
                       dSer.registerValueTarget(new BeanPropertyTarget(value,
  
  
  
  No                   revision
  No                   revision
  1.114.2.2 +1 -2      ws-axis/java/src/org/apache/axis/i18n/resource.properties
  
  Index: resource.properties
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/i18n/resource.properties,v
  retrieving revision 1.114.2.1
  retrieving revision 1.114.2.2
  diff -u -r1.114.2.1 -r1.114.2.2
  --- resource.properties	12 Apr 2005 14:34:20 -0000	1.114.2.1
  +++ resource.properties	12 Apr 2005 17:35:47 -0000	1.114.2.2
  @@ -1071,6 +1071,7 @@
   cannotCreateTextNode00=Exception creating text node
   cannotFindObjectForClass00=No object was found for class type {0}
   NullDelegate=Null delegate passed to TypeMappingDelegate constructor
  +optionUnwrapArrays=Prefers building arrays to beans for wrapped XML array types (defaults
to on).
   
   #                                                                    #
   # In-use keys                                                        #
  @@ -1362,8 +1363,6 @@
   
   optionJaxrpc=Maps XML Schema types to Java types instead of the custom Axis types in org.apache.axis.types,
according to JAX-RPC 1.1.
   
  -optionUnwrapArrays=Prefers building arrays to beans for wrapped XML array types.
  -
   # Found at 'ws-axis/java/src/org/apache/axis/client/Call.java', but commented out
   noParmAndRetReq=Parameter or return type inferred from WSDL and may not be updated.
   
  
  
  
  No                   revision
  No                   revision
  1.81.2.2  +1 -1      ws-axis/java/src/org/apache/axis/message/RPCHandler.java
  
  Index: RPCHandler.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/message/RPCHandler.java,v
  retrieving revision 1.81.2.1
  retrieving revision 1.81.2.2
  diff -u -r1.81.2.1 -r1.81.2.2
  --- RPCHandler.java	12 Apr 2005 12:28:30 -0000	1.81.2.1
  +++ RPCHandler.java	12 Apr 2005 17:35:47 -0000	1.81.2.2
  @@ -254,7 +254,7 @@
           } else {
               dser = context.getDeserializer(destClass, type);
               // !!!
  -            if (dser == null && destClass.isArray() &&
  +            if (dser == null && destClass != null && destClass.isArray()
&&
                       operation.getStyle() == Style.DOCUMENT) {
                   dser = context.getDeserializerForClass(destClass);
               }
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +8 -8      ws-axis/java/test/wsdl/doclit_arrays/deploy.wsdd
  
  Index: deploy.wsdd
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/test/wsdl/doclit_arrays/deploy.wsdd,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- deploy.wsdd	12 Apr 2005 12:23:07 -0000	1.1
  +++ deploy.wsdd	12 Apr 2005 17:35:47 -0000	1.1.2.1
  @@ -1,11 +1,11 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
  - <service name="DocArrays" style="document">
  -  <namespace>http://doclit_arrays.wsdl.test/</namespace>
  -  <parameter name="allowedMethods" value="*"/>
  -  <parameter name="className" value="test.wsdl.doclit_arrays.Service"/>
  -     <beanMapping type="test.wsdl.doclit_arrays.Service$Bean"
  -         xmlns:ns="http://doclit_arrays.wsdl.test/"
  -         qname="ns:Bean"/>
  - </service>
  +    <service name="DocArrays" style="document"
  +        xmlns:ns="http://doclit_arrays.wsdl.test/">
  +        <namespace>http://doclit_arrays.wsdl.test/</namespace>
  +        <parameter name="allowedMethods" value="*"/>
  +        <parameter name="className" value="test.wsdl.doclit_arrays.ArrayService"/>
  +        <beanMapping type="java:test.wsdl.doclit_arrays.ArrayService$Bean"
  +            qname="ns:Bean"/>
  +    </service>
   </deployment>
  \ No newline at end of file
  
  
  

Mime
View raw message