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/extensibility ExtensibilityQueryBindingImpl.java ExtensibilityQueryTestCase.java server-deploy.wsdd
Date Fri, 16 Aug 2002 11:07:10 GMT
gdaniels    2002/08/16 04:07:10

  Modified:    java/src/org/apache/axis Constants.java
               java/src/org/apache/axis/description TypeDesc.java
               java/src/org/apache/axis/encoding
                        DefaultTypeMappingImpl.java
                        SerializationContext.java
                        SerializationContextImpl.java TypeMappingImpl.java
               java/src/org/apache/axis/encoding/ser Base64Serializer.java
                        BeanDeserializer.java BeanSerializer.java
                        CalendarSerializer.java DateSerializer.java
                        ElementSerializer.java EnumSerializer.java
                        HexSerializer.java QNameSerializer.java
                        SimpleSerializer.java
               java/src/org/apache/axis/utils BeanUtils.java
                        JWSClassLoader.java
               java/src/org/apache/axis/wsdl/toJava
                        JavaBeanHelperWriter.java JavaBeanWriter.java
               java/test/encoding TestSer.java
               java/test/functional TestJAXRPCSamples.java
               java/test/wsdl/extensibility
                        ExtensibilityQueryBindingImpl.java
                        ExtensibilityQueryTestCase.java server-deploy.wsdd
  Log:
  1) Use new getValueAsString() method to serialize simple values into
     strings suitable for attribute usage.  This method comes out of the
     SimpleValueSerializer interface, which serializers that can produce
     attribute-happy values should implement.
  
  2) Some general work on the serialization system.  Still needs a bit more
     cleanup,
  
  Revision  Changes    Path
  1.80      +3 -0      xml-axis/java/src/org/apache/axis/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/Constants.java,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- Constants.java	13 Aug 2002 06:03:27 -0000	1.79
  +++ Constants.java	16 Aug 2002 11:07:09 -0000	1.80
  @@ -110,6 +110,9 @@
       // be nothing more than a nuisance.
       public static final String ENTERPRISE_LOG_CATEGORY = "org.apache.axis.enterprise";
   
  +    /** The name of the field which accepts xsd:any content in Beans */
  +    public static final String ANYCONTENT = "any";
  +
       /**
        * Returns true if SOAP_ENV Namespace
        */
  
  
  
  1.18      +33 -9     xml-axis/java/src/org/apache/axis/description/TypeDesc.java
  
  Index: TypeDesc.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/description/TypeDesc.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- TypeDesc.java	8 Jul 2002 14:37:44 -0000	1.17
  +++ TypeDesc.java	16 Aug 2002 11:07:09 -0000	1.18
  @@ -74,8 +74,10 @@
    */
   public class TypeDesc {
       public static final Class [] noClasses = new Class [] {};
  -    public static final Object[] noObjects = new Object[] {}; 
  +    public static final Object[] noObjects = new Object[] {};
   
  +    /** Have we already introspected for the special "any" property desc? */
  +    private boolean lookedForAny = false;
   
       public TypeDesc(Class javaClass) {
           this.javaClass = javaClass;
  @@ -133,11 +135,20 @@
       private boolean _hasAttributes = false;
   
       /** Introspected property descriptors */
  -    private BeanPropertyDescriptor[] propertyDescriptor = null; 
  +    private BeanPropertyDescriptor[] propertyDescriptors = null;
       /** Map with key = property descriptor name, value = descriptor */
       private Map propertyMap = null;
   
       /**
  +     * Indication if this type has support for xsd:any.
  +     */
  +    private BeanPropertyDescriptor anyDesc = null;
  +
  +    public BeanPropertyDescriptor getAnyDesc() {
  +        return anyDesc;
  +    }
  +
  +    /**
        * Obtain the current array of FieldDescs
        */
       public FieldDesc[] getFields() {
  @@ -374,17 +385,30 @@
        * @return PropertyDescriptor
        */
       public BeanPropertyDescriptor[] getPropertyDescriptors() {
  -        // Return the propertyDescriptor if already set.
  +        // Return the propertyDescriptors if already set.
           // If not set, use BeanUtils.getPd to get the property descriptions.
           //
           // Since javaClass is a generated class, there
           // may be a faster way to set the property descriptions than
           // using BeanUtils.getPd.  But for now calling getPd is sufficient.
  -        if (propertyDescriptor == null) {
  -            propertyDescriptor = BeanUtils.getPd(javaClass, this);
  +        if (propertyDescriptors == null) {
  +            propertyDescriptors = BeanUtils.getPd(javaClass, this);
  +            if (!lookedForAny) {
  +                anyDesc = BeanUtils.getAnyContentPD(javaClass);
  +                lookedForAny = true;
  +            }
           }
  -        return propertyDescriptor;
  +        return propertyDescriptors;
       }
  +
  +    public BeanPropertyDescriptor getAnyContentDescriptor() {
  +        if (!lookedForAny) {
  +            anyDesc = BeanUtils.getAnyContentPD(javaClass);
  +            lookedForAny = true;
  +        }
  +        return anyDesc;
  +    }
  +
       /**
        * Get/Cache the property descriptor map
        * @return Map with key=propertyName, value=descriptor
  @@ -396,13 +420,13 @@
           }
   
           // Make sure properties exist
  -        if (propertyDescriptor == null) {
  +        if (propertyDescriptors == null) {
               getPropertyDescriptors();  
           }
           // Build the map
           propertyMap = new HashMap();
  -        for (int i = 0; i < propertyDescriptor.length; i++) {
  -            BeanPropertyDescriptor descriptor = propertyDescriptor[i];
  +        for (int i = 0; i < propertyDescriptors.length; i++) {
  +            BeanPropertyDescriptor descriptor = propertyDescriptors[i];
               propertyMap.put(descriptor.getName(), descriptor);
           }
           return propertyMap;
  
  
  
  1.45      +5 -5      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.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- DefaultTypeMappingImpl.java	13 Aug 2002 15:17:13 -0000	1.44
  +++ DefaultTypeMappingImpl.java	16 Aug 2002 11:07:09 -0000	1.45
  @@ -276,11 +276,11 @@
           myRegister(Constants.XSD_ANYTYPE,    java.lang.Object.class,
                      null, null, false);
   
  -        // This is the special type for the xsd:any element used for
  -        // extensibility.
  -        myRegister(Constants.XSD_ANY,    java.lang.Object.class,
  -                   new ElementSerializerFactory(),
  -                   new ElementDeserializerFactory(), false);
  +//        // This is the special type for the xsd:any element used for
  +//        // extensibility.
  +//        myRegister(Constants.XSD_ANY,    org.w3c.dom.Element.class,
  +//                   new ElementSerializerFactory(),
  +//                   new ElementDeserializerFactory(), false);
   
           // See the SchemaVersion classes for where the registration of
           // dateTime (for 2001) and timeInstant (for 1999 & 2000) happen.
  
  
  
  1.81      +2 -1      xml-axis/java/src/org/apache/axis/encoding/SerializationContext.java
  
  Index: SerializationContext.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/SerializationContext.java,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- SerializationContext.java	23 Jul 2002 22:11:29 -0000	1.80
  +++ SerializationContext.java	16 Aug 2002 11:07:09 -0000	1.81
  @@ -317,7 +317,8 @@
        * @param el is a DOM Element
        */
       public void writeDOMElement(Element el) throws IOException;
  -                      
  +
  +    public String getValueAsString(Object value, QName xmlType) throws IOException;
   }
   
   
  
  
  
  1.54      +31 -112   xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java
  
  Index: SerializationContextImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- SerializationContextImpl.java	15 Aug 2002 11:49:25 -0000	1.53
  +++ SerializationContextImpl.java	16 Aug 2002 11:07:09 -0000	1.54
  @@ -1138,44 +1138,19 @@
               }
   
               SerializerInfo info = null;
  -//            // If the javaType is abstract, try getting a
  -//            // serializer that matches the value's class.
  -//            if (javaType != null &&
  -//                !javaType.isPrimitive() &&
  -//                !javaType.isArray() &&
  -//                !isPrimitive(value, javaType) &&
  -//                Modifier.isAbstract(javaType.getModifiers())) {
  -//                info = getSerializer(value.getClass(), value);
  -//                if (info != null) {
  -//                    // Successfully found a serializer for the derived object.
  -//                    // Must serialize the type.
  -//                    shouldSendType = true;
  -//                    xmlType = null;
  -//                }
  -//            }
  -            // Try getting a serializer for the prefered xmlType
  -            if (info == null && xmlType != null) {
  -                info = getSerializer(javaType, xmlType);
  -            }
  -
  -            // If a serializer was not found using the preferred xmlType,
  -            // try getting any serializer.
  -            if (info == null) {
  -                info = getSerializer(javaType, value);
  -                // Must send type if it does not match preferred type
  -                if ((xmlType != null) && (sendType != null)){
  -                    shouldSendType = true;
  -                }
  +            // if we're looking for xsd:anyType, accept anything...
  +            if (Constants.XSD_ANYTYPE.equals(xmlType)) {
                   xmlType = null;
  +                shouldSendType = true;
               }
   
  -            if ( info != null ) {
  +            // Try getting a serializer for the prefered xmlType
  +            info = getSerializer(javaType, xmlType);
   
  +            if ( info != null ) {
                   // Send the xmlType if indicated.
                   if (shouldSendType) {
  -                    if (xmlType == null) {
  -                        xmlType = tm.getTypeQName(info.javaType);
  -                    }
  +                    xmlType = ((TypeMappingImpl)tm).getXMLType(info.javaType, xmlType);
                       attributes = setTypeAttribute(attributes, xmlType);
                   }
                   // The multiref QName is our own fake name.
  @@ -1211,89 +1186,28 @@
           SerializerFactory  serFactory  = null ;
           TypeMapping tm = getTypeMapping();
   
  -        try {
  -            if (!javaType.getName().equals("java.lang.Object") &&
  -                tm.isRegistered(javaType, xmlType)) {
  -                serFactory = (SerializerFactory) tm.getSerializer(javaType, xmlType);
  -            }
  -        } catch(JAXRPCException e) {}
  -
  -
  -        // Using the serialization factory, create a serializer
  -        Serializer ser = null;
  -        if ( serFactory != null ) {
  -            ser = (Serializer) serFactory.getSerializerAs(Constants.AXIS_SAX);
  -        }
  -        if (ser != null) {
  -            info = new SerializerInfo();
  -            info.ser = ser;
  -            info.javaType = javaType;
  -        }
  -        return info;
  -    }
  -
  -    /**
  -     * getSerializer
  -     * Attempts to get a serializer for the indicated type. Failure to
  -     * find a serializer causes the code to look backwards through the
  -     * inheritance list.  Continued failured results in an attempt to find
  -     * a serializer for the type of the value.
  -     * @param javaType is the type of the object
  -     * @param value is the object (which may have a different type due to conversions)
  -     * @return found class/serializer or null
  -     **/
  -    private SerializerInfo getSerializer(Class javaType, Object value) {
  -        SerializerInfo info = null;
  -        SerializerFactory  serFactory  = null ;
  -        TypeMapping tm = getTypeMapping();
  -
  -        // Classes is a list of the inherited interfaces to
  -        // check
  -        ArrayList  classes = null;
  -        boolean firstPass = true;
  -
  -        // Search for a class that has a serializer factory
  -        Class _class  = javaType;
  -        while( _class != null ) {
  -            try {
  -                if (!_class.getName().equals("java.lang.Object")) {
  -                        serFactory = (SerializerFactory) tm.getSerializer(_class);
  +        while (javaType != null) {
  +            serFactory = (SerializerFactory) tm.getSerializer(javaType, xmlType);
  +            if (serFactory != null)
  +                break;
  +
  +            // Walk my interfaces...
  +            Class [] interfaces = javaType.getInterfaces();
  +            if (interfaces != null) {
  +                for (int i = 0; i < interfaces.length; i++) {
  +                    Class iface = interfaces[i];
  +                    serFactory = (SerializerFactory) tm.getSerializer(iface,
  +                                                                      xmlType);
  +                    if (serFactory != null)
  +                        break;
                   }
  -            } catch(JAXRPCException e) {
  -                // For now continue if JAXRPCException
  -            }
  -            if (serFactory  != null) {
  -                break ;
  -            }
  -            if ( classes == null ) {
  -                classes = new ArrayList();
  -            }
  -            Class[] ifaces = _class.getInterfaces();
  -            for (int i = 0 ; i < ifaces.length ; i++ ) {
  -                classes.add( ifaces[i] );
               }
  -            _class = _class.getSuperclass();
   
  -            // Add any non-null (and non-Object) class.  We skip
  -            // the Object class.
  -            if ( _class != null &&
  -                 !_class.getName().equals("java.lang.Object")) {
  -                classes.add( _class );
  -            }
  +            // Finally, head to my superclass
  +            if (serFactory != null)
  +                break;
   
  -            _class = (!classes.isEmpty()) ?
  -                (Class) classes.remove( 0 ) :
  -                null;
  -
  -            // If failed to find a serializerfactory
  -            // using the javaType, then use the real class of the value
  -            if (_class == null &&
  -                value != null &&
  -                value.getClass() != javaType &&
  -                firstPass) {
  -                firstPass = false;
  -                _class = value.getClass();
  -            }
  +            javaType = javaType.getSuperclass();
           }
   
           // Using the serialization factory, create a serializer
  @@ -1304,9 +1218,14 @@
           if (ser != null) {
               info = new SerializerInfo();
               info.ser = ser;
  -            info.javaType = _class;
  +            info.javaType = javaType;
           }
           return info;
       }
   
  +    public String getValueAsString(Object value, QName xmlType) throws IOException {
  +        SerializerInfo info = getSerializer(value.getClass(), xmlType);
  +        SimpleValueSerializer ser = (SimpleValueSerializer)info.ser;
  +        return ser.getValueAsString(value, this);
  +    }
   }
  
  
  
  1.24      +83 -7     xml-axis/java/src/org/apache/axis/encoding/TypeMappingImpl.java
  
  Index: TypeMappingImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/TypeMappingImpl.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- TypeMappingImpl.java	18 Jul 2002 17:38:15 -0000	1.23
  +++ TypeMappingImpl.java	16 Aug 2002 11:07:09 -0000	1.24
  @@ -294,6 +294,72 @@
        */
       public javax.xml.rpc.encoding.SerializerFactory
           getSerializer(Class javaType, QName xmlType)
  +        throws JAXRPCException {
  +
  +        javax.xml.rpc.encoding.SerializerFactory sf = null;
  +
  +        // If the xmlType was not provided, get one
  +        if (xmlType == null) {
  +            xmlType = getTypeQName(javaType);
  +            // If we couldn't find one, we're hosed, since getTypeQName()
  +            // already asked all of our delegates.
  +            if (xmlType == null) {
  +                return null;
  +            }
  +
  +            // If we're doing autoTyping, and we got a type in the right
  +            // namespace, we can use the default serializer.
  +            if (doAutoTypes &&
  +                    xmlType.getNamespaceURI().equals(Constants.NS_URI_JAVA)) {
  +                return new BeanSerializerFactory(javaType, xmlType);
  +            }
  +        }
  +
  +        // Try to get the serializer associated with this pair
  +        Pair pair = new Pair(javaType, xmlType);
  +
  +        // Now get the serializer with the pair
  +        sf = (javax.xml.rpc.encoding.SerializerFactory) pair2SF.get(pair);
  +
  +        // If not successful, use the javaType to get another Pair unless
  +        // we've got an array, in which case make sure we get the
  +        // ArraySerializer.
  +        if (sf == null) {
  +            if (javaType.isArray()) {
  +                pair = (Pair) qName2Pair.get(Constants.SOAP_ARRAY);
  +            } else {
  +                pair = (Pair) class2Pair.get(pair.javaType);
  +            }
  +            if (pair != null) {
  +                sf = (javax.xml.rpc.encoding.SerializerFactory) pair2SF.get(pair);
  +            }
  +        }
  +
  +        if (sf == null && delegate != null) {
  +            sf = (SerializerFactory)
  +                delegate.getSerializer(javaType, xmlType);
  +        }
  +        return sf;
  +    }
  +
  +    /**
  +     * Get the exact XML type QName which will be used when serializing a
  +     * given Class to a given type QName.  In other words, if we have:
  +     *
  +     * Class        TypeQName
  +     * ----------------------
  +     * Base         myNS:Base
  +     * Child        myNS:Child
  +     *
  +     * and call getXMLType(Child.class, BASE_QNAME), we should get
  +     * CHILD_QNAME.
  +     *
  +     * @param javaType
  +     * @param xmlType
  +     * @return
  +     * @throws JAXRPCException
  +     */
  +    public QName getXMLType(Class javaType, QName xmlType)
           throws JAXRPCException
       {
           javax.xml.rpc.encoding.SerializerFactory sf = null;
  @@ -301,6 +367,7 @@
           // If the xmlType was not provided, get one
           if (xmlType == null) {
               xmlType = getTypeQName(javaType);
  +
               // If we couldn't find one, we're hosed, since getTypeQName()
               // already asked all of our delegates.
               if (xmlType == null) {
  @@ -310,7 +377,7 @@
               // If we're doing autoTyping, we can use the default.
               if (doAutoTypes &&
                       xmlType.getNamespaceURI().equals(Constants.NS_URI_JAVA)) {
  -                return new BeanSerializerFactory(javaType, xmlType);
  +                return xmlType;
               }
           }
   
  @@ -319,21 +386,30 @@
   
           // Now get the serializer with the pair
           sf = (javax.xml.rpc.encoding.SerializerFactory) pair2SF.get(pair);
  +
           // If not successful, use the xmlType to get
           // another pair.  For some xmlTypes (like SOAP_ARRAY)
           // all of the possible javaTypes are not registered.
           if (sf == null) {
  -            pair = (Pair) qName2Pair.get(pair.xmlType);
  +            if (javaType.isArray()) {
  +                pair = (Pair) qName2Pair.get(pair.xmlType);
  +            } else {
  +                pair = (Pair) class2Pair.get(pair.javaType);
  +            }
               if (pair != null) {
                   sf = (javax.xml.rpc.encoding.SerializerFactory) pair2SF.get(pair);
               }
           }
   
           if (sf == null && delegate != null) {
  -            sf = (SerializerFactory)
  -                delegate.getSerializer(javaType, xmlType);
  +            return ((TypeMappingImpl)delegate).getXMLType(javaType, xmlType);
           }
  -        return sf;
  +
  +        if (pair != null) {
  +            xmlType = pair.xmlType;
  +        }
  +
  +        return xmlType;
       }
   
       /**
  @@ -439,7 +515,7 @@
       public QName getTypeQName(Class javaType) {
           //log.debug("getTypeQName javaType =" + javaType);
           if (javaType == null)
  -            return null;
  +        return null;
   
           QName xmlType = null;
           Pair pair = (Pair) class2Pair.get(javaType);
  @@ -495,7 +571,7 @@
       }
   
       /**
  -     * Gets the SerializerFactory registered for the Java type.    
  +     * Gets the SerializerFactory registered for the Java type.
        *
        * @param javaType - Class of the Java type
        *
  
  
  
  1.8       +9 -4      xml-axis/java/src/org/apache/axis/encoding/ser/Base64Serializer.java
  
  Index: Base64Serializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/Base64Serializer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Base64Serializer.java	11 Jun 2002 14:53:55 -0000	1.7
  +++ Base64Serializer.java	16 Aug 2002 11:07:09 -0000	1.8
  @@ -72,6 +72,7 @@
   import org.apache.axis.encoding.DeserializationContext;
   import org.apache.axis.encoding.Deserializer;
   import org.apache.axis.encoding.Base64;
  +import org.apache.axis.encoding.SimpleValueSerializer;
   import org.w3c.dom.Element;
   import org.w3c.dom.Document;
   
  @@ -82,7 +83,7 @@
    * Modified by @author Rich Scheuerle <scheu@us.ibm.com>
    * @see <a href="http://www.w3.org/TR/xmlschema-2/#base64Binary">XML Schema 3.2.16</a>
    */
  -public class Base64Serializer implements Serializer {
  +public class Base64Serializer implements SimpleValueSerializer {
   
       public QName xmlType;
       public Class javaType;
  @@ -98,6 +99,12 @@
                             Object value, SerializationContext context)
           throws IOException
       {
  +        context.startElement(name, attributes);
  +        context.writeString(getValueAsString(value, context));
  +        context.endElement();
  +    }
  +
  +    public String getValueAsString(Object value, SerializationContext context) {
           byte[] data = null;
           if (javaType == byte[].class) {
               data = (byte[]) value;
  @@ -110,9 +117,7 @@
               }
           }
   
  -        context.startElement(name, attributes);
  -        context.writeString(Base64.encode(data, 0, data.length));
  -        context.endElement();
  +        return Base64.encode(data, 0, data.length);
       }
   
       public String getMechanismType() { return Constants.AXIS_SAX; }
  
  
  
  1.45      +17 -28    xml-axis/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java
  
  Index: BeanDeserializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BeanDeserializer.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- BeanDeserializer.java	13 Aug 2002 14:58:58 -0000	1.44
  +++ BeanDeserializer.java	16 Aug 2002 11:07:09 -0000	1.45
  @@ -74,7 +74,6 @@
   import javax.xml.namespace.QName;
   
   import java.io.Serializable;
  -import java.util.Iterator;
   import java.util.Map;
   
   /**
  @@ -198,19 +197,10 @@
           prevQName = elemQName;
   
           if (typeDesc != null) {       
  -            
  -            // First lookup the field using the target namespace context
  -            // and local name.  If this fails and the incoming element
  -            // name is not prefixed, lookup the name assuming an unqualified
  -            // name.
  +            // Lookup the name appropriately (assuming an unqualified
  +            // name for SOAP encoding, using the namespace otherwise)
               String fieldName = typeDesc.getFieldNameForElement(elemQName, 
                                                                  isEncoded);
  -//            if (fieldName == null && (prefix == null || prefix.equals(""))) {
  -//                fieldName =
  -//                    typeDesc.getFieldNameForElement(
  -//                      new QName("", elemQName.getLocalPart()), false);
  -//            }
  -
               propDesc = (BeanPropertyDescriptor)propertyMap.get(fieldName);
           }
   
  @@ -225,8 +215,9 @@
           Deserializer dSer = null;
           MessageContext messageContext = context.getMessageContext();
           if (propDesc == null && !messageContext.isEncoded()) {
  -            // try to put unknown elements into an Object property
  -            propDesc = getObjectPropertyDesc(elemQName, context);
  +            // try to put unknown elements into a SOAPElement property, if
  +            // appropriate
  +            propDesc = getAnyPropertyDesc();
               if (propDesc != null) {
                   dSer = context.getDeserializerForType(elemQName);
                   if (dSer == null)  {
  @@ -300,20 +291,18 @@
           return (SOAPHandler)dSer;
       }
   
  -     public BeanPropertyDescriptor
  -             getObjectPropertyDesc(QName qname,
  -                                   DeserializationContext context) {
  -        for (Iterator iterator = propertyMap.values().iterator();
  -             iterator.hasNext();) {
  -            BeanPropertyDescriptor propertyDesc =
  -                    (BeanPropertyDescriptor) iterator.next();
  -            // try to find xsd:any namespace="##any" property
  -            if (propertyDesc.getName().equals("any") &&
  -                propertyDesc.getType().getName().equals("java.lang.Object")) {
  -                return propertyDesc;
  -            }
  -        }
  -        return null;
  +    /**
  +     * Get a BeanPropertyDescriptor which indicates where we should
  +     * put extensibility elements (i.e. XML which falls under the
  +     * auspices of an &lt;xsd:any&gt; declaration in the schema)
  +     *
  +     * @return an appropriate BeanPropertyDescriptor, or null
  +     */
  +    public BeanPropertyDescriptor getAnyPropertyDesc() {
  +        if (typeDesc == null)
  +            return null;
  +
  +        return typeDesc.getAnyDesc();
       }
   
       /**
  
  
  
  1.50      +16 -10    xml-axis/java/src/org/apache/axis/encoding/ser/BeanSerializer.java
  
  Index: BeanSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/BeanSerializer.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- BeanSerializer.java	14 Aug 2002 14:43:54 -0000	1.49
  +++ BeanSerializer.java	16 Aug 2002 11:07:09 -0000	1.50
  @@ -60,7 +60,6 @@
   import org.apache.axis.description.FieldDesc;
   import org.apache.axis.description.TypeDesc;
   import org.apache.axis.encoding.SerializationContext;
  -import org.apache.axis.encoding.AttributeSerializationContextImpl;
   import org.apache.axis.encoding.Serializer;
   import org.apache.axis.utils.BeanPropertyDescriptor;
   import org.apache.axis.utils.BeanUtils;
  @@ -78,7 +77,6 @@
   
   import java.io.IOException;
   import java.io.Serializable;
  -import java.io.StringWriter;
   import java.lang.reflect.InvocationTargetException;
   import java.lang.reflect.Modifier;
   import java.util.List;
  @@ -211,7 +209,7 @@
                           context.serialize(qname,
                                             null,
                                             propValue,
  -                                          context.getQNameForClass(javaType),
  +                                          context.getQNameForClass(propertyDescriptor[i].getType()),
                                             true,
                                             null);
                       } else {
  @@ -234,6 +232,20 @@
                       }
                   }
               }
  +
  +            BeanPropertyDescriptor anyDesc = typeDesc == null ? null :
  +                    typeDesc.getAnyDesc();
  +            if (anyDesc != null) {
  +                // If we have "extra" content here, get the value and serialize
  +                // it with the element name matching the type name for now.
  +                Object anyVal = anyDesc.get(value);
  +                if (anyVal != null) {
  +                    QName typeQName = context.getQNameForClass(anyVal.getClass());
  +                    context.serialize(typeQName, null,
  +                                      anyVal, typeQName,
  +                                      false, Boolean.TRUE);
  +                }
  +            }
           } catch (InvocationTargetException ite) {
               Throwable target = ite.getTargetException();
               log.error(JavaUtils.getMessage("exception00"), target);
  @@ -499,13 +511,7 @@
                                         QName qname,
                                         AttributesImpl attrs,
                                         SerializationContext context) throws Exception {
  -        StringWriter writer = new StringWriter();
  -        SerializationContext attributeContext = new AttributeSerializationContextImpl(writer, context);
  -        attributeContext.serialize(qname,
  -                                   null,
  -                                   propValue);
  -        writer.close();
  -        String propString = writer.getBuffer().toString();
  +        String propString = context.getValueAsString(propValue, null);
           String namespace = qname.getNamespaceURI();
           String localName = qname.getLocalPart();
   
  
  
  
  1.6       +11 -10    xml-axis/java/src/org/apache/axis/encoding/ser/CalendarSerializer.java
  
  Index: CalendarSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/CalendarSerializer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CalendarSerializer.java	21 Jun 2002 13:00:30 -0000	1.5
  +++ CalendarSerializer.java	16 Aug 2002 11:07:09 -0000	1.6
  @@ -63,8 +63,8 @@
   
   import org.apache.axis.Constants;
   import org.apache.axis.wsdl.fromJava.Types;
  -import org.apache.axis.encoding.Serializer;
   import org.apache.axis.encoding.SerializationContext;
  +import org.apache.axis.encoding.SimpleValueSerializer;
   
   import java.text.SimpleDateFormat;
   import java.util.Calendar;
  @@ -78,7 +78,7 @@
    * Modified by @author Rich scheuerle <scheu@us.ibm.com>
    * @see <a href="http://www.w3.org/TR/xmlschema-2/#dateTime">XML Schema 3.2.16</a>
    */
  -public class CalendarSerializer implements Serializer {
  +public class CalendarSerializer implements SimpleValueSerializer {
   
       private static SimpleDateFormat zulu =
          new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
  @@ -96,18 +96,19 @@
           throws IOException
       {
           context.startElement(name, attributes);
  +        context.writeString(getValueAsString(value, context));
  +        context.endElement();
  +    }
   
  -        Date date = value instanceof Date ? (Date) value : ((Calendar) value).getTime();
  +    public String getValueAsString(Object value, SerializationContext context) {
  +        Date date = value instanceof Date ? (Date) value :
  +                ((Calendar) value).getTime();
   
  -        // Sun JDK bug http://developer.java.sun.com/developer/bugParade/bugs/4229798.html
  -        String format = null;
  +        // Serialize including convert to GMT
           synchronized (zulu) {
  -            format = zulu.format(date);
  +            // Sun JDK bug http://developer.java.sun.com/developer/bugParade/bugs/4229798.html
  +            return zulu.format(date);
           }
  -        // Serialize including convert to GMT
  -        context.writeString(format);
  -
  -        context.endElement();
       }
   
       public String getMechanismType() { return Constants.AXIS_SAX; }
  
  
  
  1.6       +10 -7     xml-axis/java/src/org/apache/axis/encoding/ser/DateSerializer.java
  
  Index: DateSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/DateSerializer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DateSerializer.java	31 Jul 2002 20:47:01 -0000	1.5
  +++ DateSerializer.java	16 Aug 2002 11:07:09 -0000	1.6
  @@ -65,6 +65,7 @@
   import org.apache.axis.wsdl.fromJava.Types;
   import org.apache.axis.encoding.Serializer;
   import org.apache.axis.encoding.SerializationContext;
  +import org.apache.axis.encoding.SimpleValueSerializer;
   
   import java.text.SimpleDateFormat;
   import java.util.Calendar;
  @@ -79,7 +80,7 @@
    * Modified by @author Rich scheuerle <scheu@us.ibm.com>
    * @see <a href="http://www.w3.org/TR/xmlschema-2/#dateTime">XML Schema 3.2.16</a>
    */
  -public class DateSerializer implements Serializer {
  +public class DateSerializer implements SimpleValueSerializer {
   
       private static SimpleDateFormat zulu =
          new SimpleDateFormat("yyyy-MM-dd");
  @@ -94,21 +95,23 @@
           throws IOException
       {
           context.startElement(name, attributes);
  -        String fdate;
  +        context.writeString(getValueAsString(value, context));
  +        context.endElement();
  +    }
   
  +    public String getValueAsString(Object value, SerializationContext context) {
  +        StringBuffer buf = new StringBuffer();
           synchronized (calendar) {
               calendar.setTime((Date)value);
               if (calendar.get(Calendar.ERA) == GregorianCalendar.BC) {
  -                context.writeString("-");
  +                buf.append("-");
                   calendar.setTime((Date)value);
                   calendar.set(Calendar.ERA, GregorianCalendar.AD);
                   value = calendar.getTime();
               }
  -            fdate = zulu.format((Date)value);
  +            buf.append(zulu.format((Date)value));
           }
  -
  -        context.writeString(fdate);
  -        context.endElement();
  +        return buf.toString();
       }
   
       public String getMechanismType() { return Constants.AXIS_SAX; }
  
  
  
  1.6       +0 -8      xml-axis/java/src/org/apache/axis/encoding/ser/ElementSerializer.java
  
  Index: ElementSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ElementSerializer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ElementSerializer.java	11 Jun 2002 14:53:55 -0000	1.5
  +++ ElementSerializer.java	16 Aug 2002 11:07:09 -0000	1.6
  @@ -56,9 +56,7 @@
   package org.apache.axis.encoding.ser;
   
   import org.xml.sax.Attributes;
  -import org.xml.sax.SAXException;
   import org.w3c.dom.Element;
  -import org.w3c.dom.Document;
   
   import javax.xml.namespace.QName;
   
  @@ -67,12 +65,7 @@
   import org.apache.axis.Constants;
   import org.apache.axis.wsdl.fromJava.Types;
   import org.apache.axis.encoding.Serializer;
  -import org.apache.axis.encoding.SerializerFactory;
   import org.apache.axis.encoding.SerializationContext;
  -import org.apache.axis.encoding.Deserializer;
  -import org.apache.axis.encoding.DeserializerFactory;
  -import org.apache.axis.encoding.DeserializationContext;
  -import org.apache.axis.encoding.Deserializer;
   import org.apache.axis.utils.JavaUtils;
   
   /**
  @@ -83,7 +76,6 @@
    */
   
   public class ElementSerializer implements Serializer {
  -
       /**
        * Serialize a DOM Element
        */
  
  
  
  1.11      +8 -8      xml-axis/java/src/org/apache/axis/encoding/ser/EnumSerializer.java
  
  Index: EnumSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/EnumSerializer.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- EnumSerializer.java	12 Aug 2002 22:58:47 -0000	1.10
  +++ EnumSerializer.java	16 Aug 2002 11:07:09 -0000	1.11
  @@ -87,7 +87,7 @@
    * @author Rich Scheuerle <scheu@us.ibm.com>
    * @author Sam Ruby <rubys@us.ibm.com>
    */
  -public class EnumSerializer extends SimpleSerializer implements Serializer
  +public class EnumSerializer extends SimpleSerializer
   {
       protected static Log log =
           LogFactory.getLog(EnumSerializer.class.getName());
  @@ -106,21 +106,21 @@
           throws IOException
       {
           context.startElement(name, attributes);
  -        
  +        context.writeString(getValueAsString(value, context));
  +        context.endElement();
  +    }
  +
  +    public String getValueAsString(Object value, SerializationContext context) {
           // Invoke the toString method on the enumeration class and
           // write out the result as a string.
           try {
               if (toStringMethod == null) {
                   toStringMethod = javaType.getMethod("toString", null);
               }
  -            String propValue = (String) toStringMethod.invoke(value, null);
  -            context.writeString(propValue);
  +            return (String) toStringMethod.invoke(value, null);
           } catch (Exception e) {
               log.error(JavaUtils.getMessage("exception00"), e);
  -            throw new IOException(e.toString());
           }
  -        
  -        context.endElement();
  +        return null;
       }
  -    
   }
  
  
  
  1.8       +9 -16     xml-axis/java/src/org/apache/axis/encoding/ser/HexSerializer.java
  
  Index: HexSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/HexSerializer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- HexSerializer.java	7 Aug 2002 21:02:09 -0000	1.7
  +++ HexSerializer.java	16 Aug 2002 11:07:09 -0000	1.8
  @@ -56,7 +56,6 @@
   package org.apache.axis.encoding.ser;
   
   import org.xml.sax.Attributes;
  -import org.xml.sax.SAXException;
   
   import javax.xml.namespace.QName;
   
  @@ -64,17 +63,9 @@
   
   import org.apache.axis.Constants;
   import org.apache.axis.wsdl.fromJava.Types;
  -import org.apache.axis.encoding.Serializer;
  -import org.apache.axis.encoding.SerializerFactory;
   import org.apache.axis.encoding.SerializationContext;
  -import org.apache.axis.encoding.Deserializer;
  -import org.apache.axis.encoding.DeserializerFactory;
  -import org.apache.axis.encoding.DeserializationContext;
  -import org.apache.axis.encoding.Deserializer;
   import org.apache.axis.types.HexBinary;
  -import org.w3c.dom.Element;
  -import org.w3c.dom.Document;
  -import org.apache.axis.encoding.Base64;
  +import org.apache.axis.encoding.SimpleValueSerializer;
   import org.apache.axis.utils.JavaUtils;
   /**
    * Serializer for hexBinary.
  @@ -83,7 +74,7 @@
    * Modified by @author Rich scheuerle <scheu@us.ibm.com>
    * @see <a href="http://www.w3.org/TR/xmlschema-2/#hexBinary">XML Schema 3.2.16</a>
    */
  -public class HexSerializer implements Serializer {
  +public class HexSerializer implements SimpleValueSerializer {
   
       public QName xmlType;
       public Class javaType;
  @@ -100,15 +91,17 @@
           throws IOException
       {
           context.startElement(name, attributes);
  -        
  +        context.writeString(getValueAsString(value, context));
  +        context.endElement();
  +    }
  +
  +    public String getValueAsString(Object value, SerializationContext context) {
           value = JavaUtils.convert(value, javaType);
           if (javaType == HexBinary.class) {
  -            context.writeString(((HexBinary) value).toString());
  +            return ((HexBinary) value).toString();
           } else {
  -            context.writeString(HexBinary.encode((byte[]) value));
  +            return HexBinary.encode((byte[]) value);
           }
  -
  -        context.endElement();
       }
   
       public String getMechanismType() { return Constants.AXIS_SAX; }
  
  
  
  1.5       +7 -4      xml-axis/java/src/org/apache/axis/encoding/ser/QNameSerializer.java
  
  Index: QNameSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/QNameSerializer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- QNameSerializer.java	11 Jun 2002 14:53:56 -0000	1.4
  +++ QNameSerializer.java	16 Aug 2002 11:07:09 -0000	1.5
  @@ -57,7 +57,7 @@
   
   import org.apache.axis.Constants;
   import org.apache.axis.encoding.SerializationContext;
  -import org.apache.axis.encoding.Serializer;
  +import org.apache.axis.encoding.SimpleValueSerializer;
   import org.apache.axis.wsdl.fromJava.Types;
   import org.xml.sax.Attributes;
   
  @@ -68,7 +68,7 @@
   /**
    * Serializer for QNames.
    */
  -public class QNameSerializer implements Serializer {
  +public class QNameSerializer implements SimpleValueSerializer {
   
       /**
        * Serialize a QName.
  @@ -78,10 +78,13 @@
           throws IOException
       {
           QName qname = (QName) value;
  -        String str = context.qName2String(qname);
           context.startElement(name, attributes);
  -        context.writeString(str);
  +        context.writeString(getValueAsString(qname, context));
           context.endElement();
  +    }
  +
  +    public String getValueAsString(Object value, SerializationContext context) {
  +        return context.qName2String((QName)value);
       }
   
       public String getMechanismType() { return Constants.AXIS_SAX; }
  
  
  
  1.23      +52 -43    xml-axis/java/src/org/apache/axis/encoding/ser/SimpleSerializer.java
  
  Index: SimpleSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/SimpleSerializer.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- SimpleSerializer.java	14 Aug 2002 14:43:54 -0000	1.22
  +++ SimpleSerializer.java	16 Aug 2002 11:07:09 -0000	1.23
  @@ -60,8 +60,8 @@
   import org.apache.axis.description.FieldDesc;
   import org.apache.axis.description.TypeDesc;
   import org.apache.axis.encoding.SerializationContext;
  -import org.apache.axis.encoding.Serializer;
   import org.apache.axis.encoding.SimpleType;
  +import org.apache.axis.encoding.SimpleValueSerializer;
   import org.apache.axis.utils.BeanPropertyDescriptor;
   import org.apache.axis.utils.BeanUtils;
   import org.apache.axis.utils.JavaUtils;
  @@ -74,16 +74,26 @@
   import javax.xml.namespace.QName;
   
   import java.io.IOException;
  +import java.text.SimpleDateFormat;
  +import java.util.TimeZone;
  +
   /**
    * Serializer for primitives and anything simple whose value is obtained with toString()
    *
    * @author Rich Scheuerle <dims@yahoo.com>
    */
  -public class SimpleSerializer implements Serializer {
  +public class SimpleSerializer implements SimpleValueSerializer {
  +    private static SimpleDateFormat zulu =
  +       new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
  +                         //  0123456789 0 123456789
  +
  +    static {
  +        zulu.setTimeZone(TimeZone.getTimeZone("GMT"));
  +    }
   
       public QName xmlType;
       public Class javaType;
  -    
  +
       private BeanPropertyDescriptor[] propertyDescriptor = null;
       private TypeDesc typeDesc = null;
   
  @@ -110,11 +120,11 @@
               if (typeDesc == null) {
                   typeDesc = TypeDesc.getTypeDescForClass(javaType);
               }
  -            // Get the cached propertyDescriptor from the type or 
  +            // Get the cached propertyDescriptor from the type or
               // generate a fresh one.
               if (typeDesc != null) {
                   propertyDescriptor = typeDesc.getPropertyDescriptors();
  -            } else {   
  +            } else {
                   propertyDescriptor = BeanUtils.getPd(javaType, null);
               }
           }
  @@ -138,39 +148,38 @@
           // get any attributes
           if (value instanceof SimpleType)
               attributes = getObjectAttributes(value, attributes, context);
  -        
  +
           context.startElement(name, attributes);
           if (value != null) {
  -            // We could have separate serializers/deserializers to take
  -            // care of Float/Double cases, but it makes more sence to
  -            // put them here with the rest of the java lang primitives.
  -            if (value instanceof Float ||
  -                value instanceof Double) {
  -                double data = 0.0;
  -                if (value instanceof Float) {
  -                    data = ((Float) value).doubleValue();
  -                } else {
  -                    data = ((Double) value).doubleValue();
  -                }
  -                if (Double.isNaN(data)) {
  -                    context.writeString("NaN");
  -                } else if (data == Double.POSITIVE_INFINITY) {
  -                    context.writeString("INF");
  -                } else if (data == Double.NEGATIVE_INFINITY) {
  -                    context.writeString("-INF");
  -                } else {
  -                    context.writeString(value.toString());
  -                }
  -            } else if (value instanceof String) {
  -                context.writeString(
  -                                    XMLUtils.xmlEncodeString(value.toString()));
  -            } else if (value instanceof SimpleType) {
  -                context.writeString(value.toString());
  +            context.writeString(getValueAsString(value, context));
  +        }
  +        context.endElement();
  +    }
  +
  +    public String getValueAsString(Object value, SerializationContext context) {
  +        // We could have separate serializers/deserializers to take
  +        // care of Float/Double cases, but it makes more sence to
  +        // put them here with the rest of the java lang primitives.
  +        if (value instanceof Float ||
  +            value instanceof Double) {
  +            double data = 0.0;
  +            if (value instanceof Float) {
  +                data = ((Float) value).doubleValue();
               } else {
  -                context.writeString(value.toString());
  +                data = ((Double) value).doubleValue();
  +            }
  +            if (Double.isNaN(data)) {
  +                return "NaN";
  +            } else if (data == Double.POSITIVE_INFINITY) {
  +                return "INF";
  +            } else if (data == Double.NEGATIVE_INFINITY) {
  +                return "-INF";
               }
  +        } else if (value instanceof String) {
  +            return XMLUtils.xmlEncodeString((String)value);
           }
  -        context.endElement();
  +
  +        return value.toString();
       }
   
       private Attributes getObjectAttributes(Object value,
  @@ -209,14 +218,14 @@
                       Object propValue = propertyDescriptor[i].get(value);
                       // If the property value does not exist, don't serialize
                       // the attribute.  In the future, the decision to serializer
  -                    // the attribute may be more sophisticated.  For example, don't 
  +                    // the attribute may be more sophisticated.  For example, don't
                       // serialize if the attribute matches the default value.
                       if (propValue != null) {
  -                        String propString = propValue.toString();
  -                        
  +                        String propString = getValueAsString(propValue, context);
  +
                           String namespace = qname.getNamespaceURI();
                           String localName = qname.getLocalPart();
  -                        
  +
                           attrs.addAttribute(namespace,
                                              localName,
                                              context.qName2String(qname),
  @@ -232,7 +241,7 @@
   
           return attrs;
       }
  -    
  +
       public String getMechanismType() { return Constants.AXIS_SAX; }
   
       /**
  @@ -248,7 +257,7 @@
           // Let the caller generate WSDL if this is not a SimpleType
           if (!SimpleType.class.isAssignableFrom(javaType))
               return false;
  -        
  +
           // ComplexType representation of SimpleType bean class
           Element complexType = types.createElement("complexType");
           types.writeSchemaElement(xmlType, complexType);
  @@ -259,7 +268,7 @@
           complexType.appendChild(simpleContent);
           Element extension = types.createElement("extension");
           simpleContent.appendChild(extension);
  -        
  +
           // Get the base type from the "value" element of the bean
           String base = "string";
           for (int i=0; i<propertyDescriptor.length; i++) {
  @@ -305,15 +314,15 @@
               Class type = bpd.getType();
               // Attribute must extend a simple type, enum or SimpleType
               if (!types.isAcceptableAsAttribute(type)) {
  -                throw new AxisFault(JavaUtils.getMessage("AttrNotSimpleType01", 
  +                throw new AxisFault(JavaUtils.getMessage("AttrNotSimpleType01",
                           type.getName()));
  -            }            
  +            }
               base = types.writeType(type);
               extension.setAttribute("base", base);
           }
   
           // done
           return true;
  -        
  +
       }
   }
  
  
  
  1.12      +40 -24    xml-axis/java/src/org/apache/axis/utils/BeanUtils.java
  
  Index: BeanUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/BeanUtils.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BeanUtils.java	30 Jul 2002 06:16:04 -0000	1.11
  +++ BeanUtils.java	16 Aug 2002 11:07:10 -0000	1.12
  @@ -55,6 +55,7 @@
   package org.apache.axis.utils;
   
   import org.apache.axis.InternalException;
  +import org.apache.axis.Constants;
   import org.apache.axis.description.TypeDesc;
   import org.apache.axis.description.FieldDesc;
   
  @@ -99,30 +100,7 @@
               final Class secJavaType = javaType;
   
               // Need doPrivileged access to do introspection.
  -            PropertyDescriptor[] rawPd = 
  -                (PropertyDescriptor[]) 
  -                AccessController.doPrivileged(
  -                    new PrivilegedAction() {
  -                        public Object run() {
  -                            PropertyDescriptor[] result = null;
  -                            try {
  -                                // privileged code goes here
  -                                Class superClass = secJavaType.getSuperclass();
  -                                if(superClass == Exception.class) {
  -                                    result = Introspector.
  -                                        getBeanInfo(secJavaType,Exception.class).
  -                                        getPropertyDescriptors();
  -                                } else {
  -                                    // privileged code goes here
  -                                    result = Introspector.
  -                                        getBeanInfo(secJavaType).
  -                                        getPropertyDescriptors();
  -                                }
  -                            } catch (java.beans.IntrospectionException Iie) {
  -                            }
  -                            return result;
  -                        }
  -                    });
  +            PropertyDescriptor[] rawPd = getPropertyDescriptors(secJavaType);
               pd = processPropertyDescriptors(rawPd,javaType,typeDesc);
           } catch (Exception e) {
               // this should never happen
  @@ -131,6 +109,31 @@
           return pd;
       }
   
  +    private static PropertyDescriptor[] getPropertyDescriptors(final Class secJavaType) {
  +        return (PropertyDescriptor[])AccessController.doPrivileged(
  +                new PrivilegedAction() {
  +                    public Object run() {
  +                        PropertyDescriptor[] result = null;
  +                        try {
  +                            // privileged code goes here
  +                            Class superClass = secJavaType.getSuperclass();
  +                            if(superClass == Exception.class) {
  +                                result = Introspector.
  +                                        getBeanInfo(secJavaType,Exception.class).
  +                                        getPropertyDescriptors();
  +                            } else {
  +                                // privileged code goes here
  +                                result = Introspector.
  +                                        getBeanInfo(secJavaType).
  +                                        getPropertyDescriptors();
  +                            }
  +                        } catch (java.beans.IntrospectionException Iie) {
  +                        }
  +                        return result;
  +                    }
  +                });
  +    }
  +
       /**
        * Return a list of properties in the bean which should be attributes
        */
  @@ -196,6 +199,9 @@
   
           try {
               for (int i=0; i < rawPd.length; i++) {
  +                // Skip the special "any" field
  +                if (rawPd[i].getName().equals(Constants.ANYCONTENT))
  +                    continue;
                   pd.add(new BeanPropertyDescriptor(rawPd[i]));
               }
   
  @@ -271,5 +277,15 @@
           }
   
           return myPd;
  +    }
  +
  +    public static BeanPropertyDescriptor getAnyContentPD(Class javaType) {
  +        PropertyDescriptor [] pds = getPropertyDescriptors(javaType);
  +        for (int i = 0; i < pds.length; i++) {
  +            PropertyDescriptor pd = pds[i];
  +            if (pd.getName().equals(Constants.ANYCONTENT))
  +                return new BeanPropertyDescriptor(pd);
  +        }
  +        return null;
       }
   }
  
  
  
  1.6       +0 -2      xml-axis/java/src/org/apache/axis/utils/JWSClassLoader.java
  
  Index: JWSClassLoader.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JWSClassLoader.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JWSClassLoader.java	20 Jun 2002 16:48:19 -0000	1.5
  +++ JWSClassLoader.java	16 Aug 2002 11:07:10 -0000	1.6
  @@ -54,7 +54,6 @@
    */
   package org.apache.axis.utils;
   
  -import java.util.Hashtable;
   import java.io.*;
   
   /**
  @@ -102,7 +101,6 @@
           /* Create a new Class object from it */
           /*************************************/
           byte[] data = baos.toByteArray();
  -//        Class  cls =
           defineClass( name, data, 0, data.length );
   
           ClassUtils.setClassLoader(name,this);
  
  
  
  1.19      +12 -7     xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java
  
  Index: JavaBeanHelperWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- JavaBeanHelperWriter.java	15 Aug 2002 23:39:54 -0000	1.18
  +++ JavaBeanHelperWriter.java	16 Aug 2002 11:07:10 -0000	1.19
  @@ -79,11 +79,11 @@
   
       /**
        * Constructor.
  -     * @param emitter   
  +     * @param emitter
        * @param type        The type representing this class
        * @param elements    Vector containing the Type and name of each property
        * @param extendType  The type representing the extended class (or null)
  -     * @param attributes  Vector containing the attribute types and names    
  +     * @param attributes  Vector containing the attribute types and names
        */
       protected JavaBeanHelperWriter(
                                      Emitter emitter,
  @@ -129,7 +129,7 @@
       } // registerFile
   
       /**
  -     * Return the string:  "Generating <file>". 
  +     * Return the string:  "Generating <file>".
        * only if we are going to generate a new file.
        */
       protected String verboseMessage(String file) {
  @@ -195,7 +195,7 @@
                   // String elemName = elem.getName().getLocalPart();
                   // String javaName = Utils.xmlNameToJava(elemName);
   
  -                // Changed the code to write meta data 
  +                // Changed the code to write meta data
                   // for all of the elements in order to
                   // support sequences. Defect 9060
   
  @@ -210,7 +210,7 @@
                   //  - the element name is qualified (has a namespace uri)
                   // its also needed if:
                   //  - the element has the minoccurs flag set
  -                //if (!javaName.equals(elemName) || 
  +                //if (!javaName.equals(elemName) ||
                   //    Character.isUpperCase(javaName.charAt(0)) ||
                   //!elem.getName().getNamespaceURI().equals("") ||
                   //elem.getMinOccursIs0()) {
  @@ -229,7 +229,7 @@
                      Utils.getJavaLocalName(type.getName()) + ".class);");
           pw.println();
   
  -        // Add attribute and element field descriptors    
  +        // Add attribute and element field descriptors
           if (attributes != null || elementMetaData != null) {
               boolean wroteFieldType = false;
               pw.println("    static {");
  @@ -247,7 +247,7 @@
                       pw.println("field = new org.apache.axis.description.AttributeDesc();");
                       pw.println("        field.setFieldName(\"" + fieldName + "\");");
                       pw.print("        field.setXmlName(");
  -                    pw.print("new javax.xml.namespace.QName(\""); 
  +                    pw.print("new javax.xml.namespace.QName(\"");
                       pw.print(attrName.getNamespaceURI() +  "\", \"");
                       pw.println(attrName.getLocalPart() + "\"));");
                       pw.println("        typeDesc.addFieldDesc(field);");
  @@ -257,6 +257,11 @@
               if (elementMetaData != null) {
                   for (int i=0; i<elementMetaData.size(); i++) {
                       ElementDecl elem = (ElementDecl) elementMetaData.elementAt(i);
  +
  +                    if (elem.getAnyElement()) {
  +                        continue;
  +                    }
  +
                       String elemLocalName = elem.getName().getLocalPart();
                       String fieldName = Utils.xmlNameToJava(elemLocalName);
                       QName xmlName = elem.getName();
  
  
  
  1.22      +64 -57    xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
  
  Index: JavaBeanWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- JavaBeanWriter.java	15 Aug 2002 23:39:54 -0000	1.21
  +++ JavaBeanWriter.java	16 Aug 2002 11:07:10 -0000	1.22
  @@ -64,6 +64,7 @@
   import org.apache.axis.wsdl.symbolTable.ElementDecl;
   import org.apache.axis.wsdl.symbolTable.SchemaUtils;
   import org.apache.axis.wsdl.symbolTable.TypeEntry;
  +import org.apache.axis.Constants;
   
   import org.w3c.dom.Node;
   
  @@ -95,12 +96,12 @@
   
       /**
        * Constructor.
  -     * @param emitter   
  +     * @param emitter
        * @param type        The type representing this class
        * @param elements    Vector containing the Type and name of each property
        * @param extendType  The type representing the extended class (or null)
  -     * @param attributes  Vector containing the attribute types and names    
  -     * @param helper      Helper class writer                                
  +     * @param attributes  Vector containing the attribute types and names
  +     * @param helper      Helper class writer
        */
       protected JavaBeanWriter(
               Emitter emitter,
  @@ -177,11 +178,11 @@
       } // writeFileBody
   
       /**
  -     * Builds the names String vector.  
  -     * The even indices are the java class names of the 
  +     * Builds the names String vector.
  +     * The even indices are the java class names of the
        * member fields.  The odd indices are the member variable
        * names.
  -     * Also sets the simpleValueType variable to the 
  +     * Also sets the simpleValueType variable to the
        * java class name of the simple value if this bean represents
        * a simple type
        */
  @@ -191,8 +192,14 @@
               for (int i = 0; i < elements.size(); i++) {
                   ElementDecl elem = (ElementDecl)elements.get(i);
                   String typeName = elem.getType().getName();
  -                String elemName = elem.getName().getLocalPart();
  -                String variableName = Utils.xmlNameToJava(elemName);
  +                String variableName;
  +                if (elem.getAnyElement()) {
  +                    typeName = "java.lang.Object";
  +                    variableName = Constants.ANYCONTENT;
  +                } else {
  +                    String elemName = elem.getName().getLocalPart();
  +                    variableName = Utils.xmlNameToJava(elemName);
  +                }
                   names.add(typeName);
                   names.add(variableName);
                   if (type.isSimpleType() &&
  @@ -206,7 +213,7 @@
               for (int i = 0; i < attributes.size(); i += 2) {
                   String typeName = ((TypeEntry) attributes.get(i)).getName();
                   QName xmlName = (QName) attributes.get(i + 1);
  -                String variableName = 
  +                String variableName =
                       Utils.xmlNameToJava(xmlName.getLocalPart());
                   names.add(typeName);
                   names.add(variableName);
  @@ -216,8 +223,8 @@
                   }
               }
           }
  -    }        
  -    
  +    }
  +
       /**
        * Returns the appropriate extends text
        * @return "" or "abstract "
  @@ -244,7 +251,7 @@
           }
           return extendsText;
       }
  -    
  +
       /**
        * Returns the appropriate implements text
        * @return " implements <classes> "
  @@ -267,10 +274,10 @@
           for (int i = 0; i < names.size(); i += 2) {
               String typeName = (String) names.get(i);
               String variable = (String) names.get(i + 1);
  -             
  +
               // Declare the bean element
               pw.print("    private " + typeName + " " + variable + ";");
  -            
  +
               // label the attribute fields.
               if (elements == null || i >= (elements.size()*2))
                   pw.println("  // attribute");
  @@ -291,8 +298,8 @@
       }
   
       /**
  -     * Writes the full constructor.  
  -     * Note that this class is not recommended for 
  +     * Writes the full constructor.
  +     * Note that this class is not recommended for
        * JSR 101 compliant beans, but is provided for
        * extended classes which may wish to generate a full
        * constructor.
  @@ -308,7 +315,7 @@
                   parent.getNode(),
                   emitter.getSymbolTable());
           }
  -        
  +
           // Now generate a list of names and types starting with
           // the oldest parent.  (Attrs are considered before elements).
           Vector paramTypes = new Vector();
  @@ -320,7 +327,7 @@
               // in case they interfere with local parms.
               String mangle = "";
               if (i > 0) {
  -                mangle = "_" + 
  +                mangle = "_" +
                       Utils.xmlNameToJava(te.getQName().getLocalPart()) +
                       "_";
               }
  @@ -336,7 +343,7 @@
               }
               // Process the elements
               Vector elements = SchemaUtils.getContainedElementDeclarations(
  -                te.getNode(), emitter.getSymbolTable()); 
  +                te.getNode(), emitter.getSymbolTable());
               if (elements != null) {
                   for (int j=0; j<elements.size(); j++) {
                       ElementDecl elem = (ElementDecl)elements.get(j);
  @@ -349,37 +356,37 @@
           // Set the index where the local params start
           int localParams = paramTypes.size() - names.size()/2;
   
  -        
  +
           // Now write the constructor signature
           if (paramTypes.size() > 0) {
               pw.println("    public " + className + "(");
               for (int i=0; i<paramTypes.size(); i++) {
  -                pw.print("           " + paramTypes.elementAt(i) + 
  +                pw.print("           " + paramTypes.elementAt(i) +
                            " " + paramNames.elementAt(i));
                   if ((i+1) < paramTypes.size()) {
  -                    pw.println(","); 
  +                    pw.println(",");
                   } else {
  -                    pw.println(") {"); 
  +                    pw.println(") {");
                   }
               }
  -            
  +
               // Call the extended constructor to set inherited fields
               if (extendType != null) {
                   pw.println("        super(");
                   for (int j=0; j<localParams; j++) {
                       pw.print("            " + paramNames.elementAt(j));
                       if ((j+1) < localParams) {
  -                        pw.println(","); 
  +                        pw.println(",");
                       } else {
                           pw.println(");");
                       }
  -                }            
  +                }
               }
               // Set local fields directly
               for (int j=localParams; j<paramNames.size(); j++) {
                   pw.println("        this." + paramNames.elementAt(j) +
                              " = " + paramNames.elementAt(j)+ ";");
  -            } 
  +            }
               pw.println("    }");
               pw.println();
           }
  @@ -387,7 +394,7 @@
   
       /**
        * Writes the constructors for SimpleTypes.
  -     * Writes a constructor accepting a string and 
  +     * Writes a constructor accepting a string and
        * a constructor accepting the simple java type.
        */
       protected void writeSimpleConstructors() {
  @@ -395,13 +402,13 @@
           // constructor and a value construtor.
           if (type.isSimpleType() && simpleValueType != null) {
               if (!simpleValueType.equals("java.lang.String")) {
  -                pw.println("    public " + className + "(" + 
  +                pw.println("    public " + className + "(" +
                              simpleValueType + " value) {");
                   pw.println("        this.value = value;");
                   pw.println("    }");
                   pw.println();
               }
  -            
  +
               pw.println("    // " + JavaUtils.getMessage("needStringCtor"));
               pw.println("    public " + className + "(java.lang.String value) {");
               // Make sure we wrap base types with its Object type
  @@ -410,18 +417,18 @@
                   pw.println("        this.value = new " + wrapper +
                              "(value)." + simpleValueType + "Value();");
               } else {
  -                pw.println("        this.value = new " + 
  +                pw.println("        this.value = new " +
                              simpleValueType + "(value);");
               }
               pw.println("    }");
  -            pw.println();            
  +            pw.println();
           }
       }
   
       /**
  -     * Writes the toString method  
  -     * Currently the toString method is only written for  
  -     * simpleTypes.                                 
  +     * Writes the toString method
  +     * Currently the toString method is only written for
  +     * simpleTypes.
        */
       protected void writeToStringMethod() {
           // If this is a simple type, emit a toString
  @@ -440,10 +447,10 @@
       }
   
       /**
  -     * Writes the setter and getter methods    
  +     * Writes the setter and getter methods
        */
       protected void writeAccessMethods() {
  -        int j = 0; 
  +        int j = 0;
           // Define getters and setters for the bean elements
           for (int i = 0; i < names.size(); i += 2, j++) {
               String typeName = (String) names.get(i);
  @@ -455,28 +462,28 @@
                   get = "is";
   
               if (enableGetters) {
  -                pw.println("    public " + typeName + " " + 
  +                pw.println("    public " + typeName + " " +
                              get + capName + "() {");
                   pw.println("        return " + name + ";");
                   pw.println("    }");
                   pw.println();
               }
               if (enableSetters) {
  -                pw.println("    public void set" + capName + "(" + 
  +                pw.println("    public void set" + capName + "(" +
                              typeName + " " + name + ") {");
                   pw.println("        this." + name + " = " + name + ";");
                   pw.println("    }");
                   pw.println();
               }
  -            
  -            // If this is a special collection type, insert extra 
  +
  +            // If this is a special collection type, insert extra
               // java code so that the serializer/deserializer can recognize
  -            // the class.  This is not JAX-RPC, and will be replaced with 
  +            // the class.  This is not JAX-RPC, and will be replaced with
               // compliant code when JAX-RPC determines how to deal with this case.
               // These signatures comply with Bean Indexed Properties which seems
               // like the reasonable approach to take for collection types.
               // (It may be more efficient to handle this with an ArrayList...but
  -            // for the initial support it was easier to use an actual array.) 
  +            // for the initial support it was easier to use an actual array.)
               if (elements != null && j < elements.size()) {
                   ElementDecl elem = (ElementDecl)elements.get(j);
                   if (elem.getType().getQName().getLocalPart().indexOf("[") > 0) {
  @@ -495,11 +502,11 @@
                           // specification, the indexed setter should not
                           // establish or grow the array.  Thus the following
                           // code is not generated for compliance purposes.
  -                        /*                    
  +                        /*
                           int bracketIndex = typeName.indexOf("[");
                           String newingName = typeName.substring(0, bracketIndex + 1);
                           String newingSuffix = typeName.substring(bracketIndex + 1);
  -                    
  +
                           pw.println("        if (this." + name + " == null ||");
                           pw.println("            this." + name + ".length <= i) {");
                           pw.println("            " + typeName + " a = new " +
  @@ -518,14 +525,14 @@
                       }
                   }
               }
  -        }        
  +        }
       }
   
       /**
        * Writes a general purpose equals method
        */
       protected void writeEqualsMethod() {
  -     
  +
           // The __equalsCalc field and synchronized method are necessary
           // in case the object has direct or indirect references to itself.
           pw.println("    private java.lang.Object __equalsCalc = null;");
  @@ -611,8 +618,8 @@
           pw.println("    public synchronized int hashCode() {");
           pw.println("        if (__hashCodeCalc) {");
           pw.println("            return 0;");
  -        pw.println("        }"); 
  -        pw.println("        __hashCodeCalc = true;"); 
  +        pw.println("        }");
  +        pw.println("        __hashCodeCalc = true;");
   
           // Get the hashCode of the super class
           String start = "1";
  @@ -624,10 +631,10 @@
               String variableType = (String) names.get(i);
               String variable = (String) names.get(i + 1);
               String get = "get";
  -            
  +
               if (variableType.equals("boolean"))
                   get = "is";
  -            
  +
               if (variableType.equals("int") ||
                   variableType.equals("short") ||
                   variableType.equals("byte")) {
  @@ -649,7 +656,7 @@
                   // The hashCode calculation for arrays is complicated.
                   // Wish there was a hashCode method in java.utils.Arrays !
                   // Get the hashCode for each element of the array which is not an array.
  -                pw.println("        if (" + get + 
  +                pw.println("        if (" + get +
                              Utils.capitalizeFirstChar(variable) + "() != null) {");
                   pw.println("            for (int i=0;");
                   pw.println("                 i<java.lang.reflect.Array.getLength(" + get +
  @@ -661,15 +668,15 @@
                   pw.println("                if (obj != null &&");
                   pw.println("                    !obj.getClass().isArray()) {");
                   pw.println("                    _hashCode += obj.hashCode();");
  -                pw.println("                }");     
  -                pw.println("            }");     
  -                pw.println("        }");     
  +                pw.println("                }");
  +                pw.println("            }");
  +                pw.println("        }");
               } else {
  -                pw.println("        if (" + get + 
  +                pw.println("        if (" + get +
                              Utils.capitalizeFirstChar(variable) + "() != null) {");
                   pw.println("            _hashCode += " + get +
                              Utils.capitalizeFirstChar(variable) + "().hashCode();");
  -                pw.println("        }");  
  +                pw.println("        }");
               }
           }
           // Reset the __hashCodeCalc variable and return
  
  
  
  1.34      +0 -5      xml-axis/java/test/encoding/TestSer.java
  
  Index: TestSer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/encoding/TestSer.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- TestSer.java	24 Jul 2002 19:08:33 -0000	1.33
  +++ TestSer.java	16 Aug 2002 11:07:10 -0000	1.34
  @@ -157,9 +157,4 @@
               fail(e.getMessage());
           }
       }
  -
  -    public static void main(String[] args) {
  -        TestSer tester = new TestSer("TestSer");
  -        tester.testEmptyXMLNS();
  -    }
   }
  
  
  
  1.11      +17 -17    xml-axis/java/test/functional/TestJAXRPCSamples.java
  
  Index: TestJAXRPCSamples.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/functional/TestJAXRPCSamples.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TestJAXRPCSamples.java	25 Jul 2002 13:14:19 -0000	1.10
  +++ TestJAXRPCSamples.java	16 Aug 2002 11:07:10 -0000	1.11
  @@ -99,23 +99,23 @@
           AdminClient.main(args);
       } // doTestStockNoAction
   
  -    public void testGetQuote() throws Exception {
  -        try {
  -            log.info("Testing JAX-RPC GetQuote1 sample.");
  -            log.info("Testing deployment...");
  -            doTestDeploy();
  -            log.info("Testing service...");
  -            doTestGetQuoteXXX();
  -            doTestGetQuoteMain();
  -            log.info("Testing undeployment...");
  -            doTestUndeploy();
  -            log.info("Test complete.");
  -        }
  -        catch (Throwable t) {
  -            t.printStackTrace();
  -            throw new Exception("Fault returned from test: " + t);
  -        }
  -    } // testGetQuote
  +//    public void testGetQuote() throws Exception {
  +//        try {
  +//            log.info("Testing JAX-RPC GetQuote1 sample.");
  +//            log.info("Testing deployment...");
  +//            doTestDeploy();
  +//            log.info("Testing service...");
  +//            doTestGetQuoteXXX();
  +//            doTestGetQuoteMain();
  +//            log.info("Testing undeployment...");
  +//            doTestUndeploy();
  +//            log.info("Test complete.");
  +//        }
  +//        catch (Throwable t) {
  +//            t.printStackTrace();
  +//            throw new Exception("Fault returned from test: " + t);
  +//        }
  +//    } // testGetQuote
   
       public void testGetInfo() throws Exception {
           try {
  
  
  
  1.14      +3 -3      xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryBindingImpl.java
  
  Index: ExtensibilityQueryBindingImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryBindingImpl.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ExtensibilityQueryBindingImpl.java	25 Jul 2002 16:14:12 -0000	1.13
  +++ ExtensibilityQueryBindingImpl.java	16 Aug 2002 11:07:10 -0000	1.14
  @@ -46,8 +46,8 @@
       public ExtensibilityType query(ExtensibilityType query) throws RemoteException {
           ExtensibilityType result = new ExtensibilityType();
           Object obj = query.getAny();
  -        if (obj instanceof BookType) {
  -            BookType bookQuery = (BookType) obj;
  +        if (obj instanceof FindBooksQueryExpressionElement) {
  +            BookType bookQuery = ((FindBooksQueryExpressionElement)obj).getBookQuery();
               String subject = bookQuery.getSubject();
               if (!"all".equals(subject)) {
                   throw new RemoteException("ExtensibilityQueryBindingImpl: Book subject query should be all, instead was " + subject);
  @@ -66,7 +66,7 @@
               resultList.setResult(queryResult);
               result.setAny(resultElement);
           } else {
  -            throw new RemoteException("Failed to get book type. Got: " + obj.getClass().getName() + ":" + obj.toString());
  +            throw new RemoteException("Failed to get FindBooksQueryExpressionElement. Got: " + obj.getClass().getName() + ":" + obj.toString());
           }
           return result;
       }
  
  
  
  1.11      +3 -3      xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java
  
  Index: ExtensibilityQueryTestCase.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/extensibility/ExtensibilityQueryTestCase.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ExtensibilityQueryTestCase.java	25 Jul 2002 17:09:58 -0000	1.10
  +++ ExtensibilityQueryTestCase.java	16 Aug 2002 11:07:10 -0000	1.11
  @@ -10,11 +10,9 @@
   import org.apache.axis.EngineConfiguration;
   import org.apache.axis.AxisEngine;
   import org.apache.axis.client.AdminClient;
  -import org.apache.axis.client.Stub;
   import org.apache.axis.encoding.TypeMappingRegistry;
   import org.apache.axis.encoding.ser.BeanSerializerFactory;
   import org.apache.axis.encoding.ser.BeanDeserializerFactory;
  -import org.apache.axis.encoding.ser.BeanDeserializer;
   
   import org.apache.log4j.Level;
   import org.apache.log4j.Logger;
  @@ -57,7 +55,8 @@
               bookQuery.setBookQuery(book);
               expression.setAny(bookQuery); 
               ExtensibilityType any = binding.query(expression);
  -            ResultListType result = (ResultListType) any.getAny();
  +            QueryResultElement resEl = (QueryResultElement ) any.getAny();
  +            ResultListType result = resEl.getResultList();
               QueryResultType[] queryResult = result.getResult();
               assertTrue(queryResult.length == 2); 
               isValid(queryResult[0], "Computer Science", "The Grid"); 
  @@ -85,6 +84,7 @@
           addBeanMapping(mapping, "BookType", BookType.class);
           addBeanMapping(mapping, "resultList", ResultListType.class);
           addBeanMapping(mapping, "QueryResultType", QueryResultType.class);
  +        addBeanMapping(mapping, "QueryResultElement", QueryResultElement.class);
           registry.register("",mapping);
           EngineConfiguration config = engine.getConfig();
           config.writeEngineConfig(engine);
  
  
  
  1.5       +15 -7     xml-axis/java/test/wsdl/extensibility/server-deploy.wsdd
  
  Index: server-deploy.wsdd
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/extensibility/server-deploy.wsdd,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- server-deploy.wsdd	4 Jun 2002 20:35:08 -0000	1.4
  +++ server-deploy.wsdd	16 Aug 2002 11:07:10 -0000	1.5
  @@ -62,13 +62,21 @@
           encodingStyle=""
         />
   
  -     <typeMapping
  -        qname="query:bookQuery"
  -        type="java:test.wsdl.extensibility.BookType"
  -        serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
  -        deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
  -        encodingStyle=""
  -     />
  +        <typeMapping
  +           qname="query:bookQuery"
  +           type="java:test.wsdl.extensibility.BookType"
  +           serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
  +           deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
  +           encodingStyle=""
  +        />
  +
  +        <typeMapping
  +           qname="query:FindBooksQueryExpressionElement"
  +           type="java:test.wsdl.extensibility.FindBooksQueryExpressionElement"
  +           serializer="org.apache.axis.encoding.ser.BeanSerializerFactory"
  +           deserializer="org.apache.axis.encoding.ser.BeanDeserializerFactory"
  +           encodingStyle=""
  +        />
       </service>
   
   
  
  
  

Mime
View raw message