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/src/org/apache/axis/providers/java RPCProvider.java
Date Wed, 10 Dec 2003 15:43:31 GMT
gdaniels    2003/12/10 07:43:31

  Modified:    java/src/org/apache/axis Constants.java
               java/src/org/apache/axis/encoding
                        SerializationContextImpl.java
               java/src/org/apache/axis/encoding/ser BeanSerializer.java
               java/src/org/apache/axis/providers/java RPCProvider.java
  Log:
  Fix bugs 20683 and (again) 25161.
  
  * The dregs of 25161 were due to mapping the SOAP 1.2 types after the
    SOAP 1.1 types, making class->QName lookups find the SOAP 1.2
    types first.  I reversed the order for now, but longer term we'll see the
    same problems here once people start using 1.2 regularly.  We need a
    better way to get the SOAP encoding type for the currently active
    SOAP version.
  
  * We now default to unqualified names for bean children and the RPC
    return element.  This stays in sync with what we generate for schema.
  
  Revision  Changes    Path
  1.130     +1 -1      ws-axis/java/src/org/apache/axis/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/Constants.java,v
  retrieving revision 1.129
  retrieving revision 1.130
  diff -u -r1.129 -r1.130
  --- Constants.java	1 Dec 2003 17:57:31 -0000	1.129
  +++ Constants.java	10 Dec 2003 15:43:31 -0000	1.130
  @@ -170,8 +170,8 @@
           DEFAULT_SOAP_VERSION.getEncodingURI();
   
       public static final String[] URIS_SOAP_ENC = {
  -        URI_SOAP11_ENC,
           URI_SOAP12_ENC,
  +        URI_SOAP11_ENC,
       };
   
       /**
  
  
  
  1.102     +1 -3      ws-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java
  
  Index: SerializationContextImpl.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java,v
  retrieving revision 1.101
  retrieving revision 1.102
  diff -u -r1.101 -r1.102
  --- SerializationContextImpl.java	30 Nov 2003 16:50:46 -0000	1.101
  +++ SerializationContextImpl.java	10 Dec 2003 15:43:31 -0000	1.102
  @@ -1374,9 +1374,7 @@
                           ((BaseSerializerFactory) serFactory).getXMLType();
                   }
                   if (actualXMLType.value == null) {
  -                    actualXMLType.value =
  -                        ((TypeMappingImpl) tm).getXMLType(javaType,
  -                                                          xmlType);
  +                    actualXMLType.value = tm.getXMLType(javaType, xmlType);
                   }
               }
           }
  
  
  
  1.69      +1 -6      ws-axis/java/src/org/apache/axis/encoding/ser/BeanSerializer.java
  
  Index: BeanSerializer.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/ser/BeanSerializer.java,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- BeanSerializer.java	29 Nov 2003 05:15:02 -0000	1.68
  +++ BeanSerializer.java	10 Dec 2003 15:43:31 -0000	1.69
  @@ -187,12 +187,7 @@
                   }
   
                   if (qname == null) {
  -                    // Use the default...
  -                    // The default qname would inherit the namespace of a
  -                    // parent. Setting this namespace to "" causes interop
  -                    // issues when the "literal" style is used - 
  -                    // most of the elements will be serialised with xmlns=""
  -                    qname = new QName(name.getNamespaceURI(), propName);
  +                    qname = new QName("", propName);
                   }
   
                   if (xmlType == null) {
  
  
  
  1.109     +1 -2      ws-axis/java/src/org/apache/axis/providers/java/RPCProvider.java
  
  Index: RPCProvider.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/providers/java/RPCProvider.java,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -r1.108 -r1.109
  --- RPCProvider.java	24 Nov 2003 12:57:13 -0000	1.108
  +++ RPCProvider.java	10 Dec 2003 15:43:31 -0000	1.109
  @@ -337,8 +337,7 @@
               if (operation.getMethod().getReturnType() != Void.TYPE) {
                   QName returnQName = operation.getReturnQName();
                   if (returnQName == null) {
  -                    returnQName = new QName(body.getNamespaceURI(), 
  -                    methodName + "Return");
  +                    returnQName = new QName("", methodName + "Return");
                   }
                   
                   RPCParam param = new RPCParam(returnQName, objRes);
  
  
  

Mime
View raw message