You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sc...@apache.org on 2002/01/15 16:56:30 UTC

cvs commit: xml-axis/java/src/javax/xml/rpc/encoding DeserializationContext.java Deserializer.java DeserializerFactory.java SerializationContext.java Serializer.java SerializerFactory.java TypeMapping.java TypeMappingRegistry.java

scheu       02/01/15 07:56:30

  Modified:    java/src/javax/xml/rpc/encoding DeserializationContext.java
                        Deserializer.java DeserializerFactory.java
                        SerializationContext.java Serializer.java
                        SerializerFactory.java TypeMapping.java
                        TypeMappingRegistry.java
  Log:
  The javax.xml.rpc.encoding interfaces are changed to the 0.6 version of JAX-RPC.
  
  Revision  Changes    Path
  1.6       +1 -1      xml-axis/java/src/javax/xml/rpc/encoding/DeserializationContext.java
  
  Index: DeserializationContext.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/encoding/DeserializationContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DeserializationContext.java	30 Oct 2001 16:46:33 -0000	1.5
  +++ DeserializationContext.java	15 Jan 2002 15:56:30 -0000	1.6
  @@ -60,7 +60,7 @@
    * processing mechanism specific manner. A deserializer uses this interface to access and maintain context information 
    * during the deserialization.. 
    *
  - * @version 0.1
  + * @version 0.6
    */
   public interface DeserializationContext {}
   
  
  
  
  1.6       +4 -9      xml-axis/java/src/javax/xml/rpc/encoding/Deserializer.java
  
  Index: Deserializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/encoding/Deserializer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Deserializer.java	30 Oct 2001 16:46:33 -0000	1.5
  +++ Deserializer.java	15 Jan 2002 15:56:30 -0000	1.6
  @@ -56,19 +56,14 @@
   package javax.xml.rpc.encoding;
   
   /**
  - * The javax.xml.rpc.encoding.Deserializer interface defines a base interface for deserializers. A Deserializer 
  - * converts an XML representation to a Java object using a specific XML processing mechanism and based on the 
  + * The javax.xml.rpc.encoding.Deserializer interface defines a base interface for deserializers. 
  + * A Deserializer converts an XML representation to a Java object 
  + * using a specific XML processing mechanism and based on the 
    * specified type mapping and encoding style.
    *
  - * @version 0.1
  + * @version 0.6
    */
   public interface Deserializer {
  -
  -    /**
  -     * Gets the type of the XML processing mechanism and representation used by this Deserializer.
  -     *
  -     * @return XML processing mechanism type
  -     */
       public String getMechanismType();
   }
   
  
  
  
  1.6       +3 -2      xml-axis/java/src/javax/xml/rpc/encoding/DeserializerFactory.java
  
  Index: DeserializerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/encoding/DeserializerFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DeserializerFactory.java	30 Oct 2001 16:46:33 -0000	1.5
  +++ DeserializerFactory.java	15 Jan 2002 15:56:30 -0000	1.6
  @@ -61,7 +61,7 @@
    * The javax.xml.rpc.encoding.DeserializerFactory is a factory of deserializers. A DeserializerFactory is 
    * registered with a TypeMapping instance as part of the TypeMappingRegistry. 
    *
  - * @version 0.1
  + * @version 0.6
    */
   public interface DeserializerFactory extends java.io.Serializable {
   
  @@ -72,7 +72,8 @@
        *
        * @return Returns a Deserializer for the specified XML processing mechanism type.
        *
  -     * @throws JAXRPCException - If DeserializerFactory does not support the specified XML processing mechanism
  +     * @throws JAXRPCException - If DeserializerFactory does not support 
  +     * the specified XML processing mechanism
        * java.lang.IllegalArgumentException - If an invalid mechanism type is specified.
        */
       public Deserializer getDeserializerAs(String mechanismType)
  
  
  
  1.6       +7 -4      xml-axis/java/src/javax/xml/rpc/encoding/SerializationContext.java
  
  Index: SerializationContext.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/encoding/SerializationContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SerializationContext.java	30 Oct 2001 16:46:33 -0000	1.5
  +++ SerializationContext.java	15 Jan 2002 15:56:30 -0000	1.6
  @@ -56,11 +56,14 @@
   package javax.xml.rpc.encoding;
   
   /**
  - * The javax.xml.rpc.encoding.SerializationContext interface is implemented by the JAX-RPC runtime system in an XML 
  - * processing mechanism specific manner. A serializer uses the SerializationContext interface during the serialization 
  - * to get the context information related to the XML processing mechanism and to manage information specific to serialization. 
  + * The javax.xml.rpc.encoding.SerializationContext interface is 
  + * implemented by the JAX-RPC runtime system in an XML 
  + * processing mechanism specific manner. A serializer uses the 
  + * SerializationContext interface during the serialization 
  + * to get the context information related to the XML processing mechanism
  + * and to manage information specific to serialization. 
    *
  - * @version 0.1
  + * @version 0.6
    */
   public interface SerializationContext {}
   
  
  
  
  1.6       +5 -3      xml-axis/java/src/javax/xml/rpc/encoding/Serializer.java
  
  Index: Serializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/encoding/Serializer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Serializer.java	30 Oct 2001 16:46:33 -0000	1.5
  +++ Serializer.java	15 Jan 2002 15:56:30 -0000	1.6
  @@ -56,11 +56,13 @@
   package javax.xml.rpc.encoding;
   
   /**
  - * The javax.xml.rpc.encoding.Serializer interface defines a base interface for serializers. A Serializer serializes 
  - * a Java object to an XML representation using a specific XML processing mechanism and based on the specified type 
  + * The javax.xml.rpc.encoding.Serializer interface defines 
  + * a base interface for serializers. A Serializer serializes 
  + * a Java object to an XML representation using a specific 
  + * XML processing mechanism and based on the specified type 
    * mapping and encoding style. 
    *
  - * @version 0.1
  + * @version 0.6
    */
   public interface Serializer extends java.io.Serializable {
   
  
  
  
  1.6       +3 -2      xml-axis/java/src/javax/xml/rpc/encoding/SerializerFactory.java
  
  Index: SerializerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/encoding/SerializerFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SerializerFactory.java	30 Oct 2001 16:46:33 -0000	1.5
  +++ SerializerFactory.java	15 Jan 2002 15:56:30 -0000	1.6
  @@ -59,10 +59,11 @@
   import java.util.Iterator;
   
   /**
  - * The javax.xml.rpc.encoding.SerializerFactory is a factory of the serializers. A SerializerFactory is registered 
  + * The javax.xml.rpc.encoding.SerializerFactory is a factory of the serializers.
  + * A SerializerFactory is registered 
    * with a TypeMapping object as part of the TypeMappingRegistry.
    *
  - * @version 0.1
  + * @version 0.6
    */
   public interface SerializerFactory extends java.io.Serializable {
   
  
  
  
  1.6       +32 -15    xml-axis/java/src/javax/xml/rpc/encoding/TypeMapping.java
  
  Index: TypeMapping.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/encoding/TypeMapping.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TypeMapping.java	30 Oct 2001 16:46:33 -0000	1.5
  +++ TypeMapping.java	15 Jan 2002 15:56:30 -0000	1.6
  @@ -59,25 +59,36 @@
   import javax.xml.rpc.namespace.QName;
   
   /**
  - * The javax.xml.rpc.encoding.TypeMapping is the base interface for representation of a type mapping. A TypeMapping 
  - * implementation class may support one or more encoding styles and XML schema namespaces. 
  + * The javax.xml.rpc.encoding.TypeMapping is the base interface for 
  + * representation of a type mapping.  A TypeMapping implementation class 
  + * may support one or more encoding styles and XML schema namespaces. 
    * 
  - * For its supported encoding styles and XML schema namespaces, a TypeMapping instance maintains a set of tuples of 
  + * For its supported encoding styles and XML schema namespaces, 
  + * a TypeMapping instance maintains a set of tuples of 
    * the type {Java type, SerializerFactory, DeserializerFactory, XML data type}. 
    *
  - * @version 0.1
  + * @version 0.6
    */
   public interface TypeMapping {
   
       /**
        * Gets the list of encoding styles supported by this TypeMapping object.
        *
  -     * @return  Iterator for the list of namespace URIs for the supported encoding styles and XML schema namespaces.
  +     * @return  String[] of namespace URIs for the supported encoding 
  +     * styles and XML schema namespaces.
        */
  -    public java.util.Iterator getSupportedEncodings();
  +    public String[] getSupportedEncodings();
   
       /**
  -     * Registers SerializerFactory and DeserializerFactory for a specific type mapping between an XML type and Java type.
  +     * Sets the list of encoding styles supported by this TypeMapping object.
  +     *
  +     * @param namespaceURIs String[] of namespace URI's                
  +     */
  +    public String[] setSupportedEncodings(String[] namespaceURIs);
  +
  +    /**
  +     * Registers SerializerFactory and DeserializerFactory for a 
  +     * specific type mapping between an XML type and Java type.
        *
        * @param javaType - Class of the Java type
        * @param xmlType - Qualified name of the XML data type
  @@ -91,35 +102,40 @@
               DeserializerFactory dsf) throws JAXRPCException;
   
       /**
  -     * Gets the SerializerFactory registered for the specified pair of Java type and XML data type.
  +     * Gets the SerializerFactory registered for the specified pair
  +     * of Java type and XML data type.
        *
        * @param javaType - Class of the Java type
        * @param xmlType - Qualified name of the XML data type
        *
        * @return Registered SerializerFactory
        *
  -     * @throws JAXRPCException - If there is no registered SerializerFactory for this pair of Java type and XML data 
  -     * type java.lang.IllegalArgumentException - If invalid or unsupported XML/Java type is specified
  +     * @throws JAXRPCException - If there is no registered SerializerFactory 
  +     * for this pair of Java type and XML data type 
  +     * java.lang.IllegalArgumentException - If invalid or unsupported XML/Java type is specified
        */
       public SerializerFactory getSerializer(Class javaType, QName xmlType)
           throws JAXRPCException;
   
       /**
  -     * Gets the DeserializerFactory registered for the specified pair of Java type and XML data type.
  +     * Gets the DeserializerFactory registered for the specified pair 
  +     * of Java type and XML data type.
        *
        * @param javaType - Class of the Java type
        * @param xmlType - Qualified name of the XML data type
        *
        * @return Registered DeserializerFactory
        *
  -     * @throws JAXRPCException - If there is no registered DeserializerFactory for this pair of Java type and 
  -     * XML data type java.lang.IllegalArgumentException - If invalid or unsupported XML/Java type is specified
  +     * @throws JAXRPCException - If there is no registered DeserializerFactory
  +     * for this pair of Java type and  XML data type 
  +     * java.lang.IllegalArgumentException - If invalid or unsupported XML/Java type is specified
        */
       public DeserializerFactory getDeserializer(Class javaType, QName xmlType)
           throws JAXRPCException;
   
       /**
  -     * Removes the SerializerFactory registered for the specified pair of Java type and XML data type.
  +     * Removes the SerializerFactory registered for the specified 
  +     * pair of Java type and XML data type.
        *
        * @param javaType - Class of the Java type
        * @param xmlType - Qualified name of the XML data type
  @@ -131,7 +147,8 @@
           throws JAXRPCException;
   
       /**
  -     * Removes the DeserializerFactory registered for the specified pair of Java type and XML data type.
  +     * Removes the DeserializerFactory registered for the specified 
  +     * pair of Java type and XML data type.
        *
        * @param javaType - Class of the Java type
        * @param xmlType - Qualified name of the XML data type
  
  
  
  1.6       +45 -24    xml-axis/java/src/javax/xml/rpc/encoding/TypeMappingRegistry.java
  
  Index: TypeMappingRegistry.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/javax/xml/rpc/encoding/TypeMappingRegistry.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TypeMappingRegistry.java	30 Oct 2001 16:46:33 -0000	1.5
  +++ TypeMappingRegistry.java	15 Jan 2002 15:56:30 -0000	1.6
  @@ -33,7 +33,7 @@
    *    nor may "Apache" appear in their name, without prior written
    *    permission of the Apache Software Foundation.
    *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 
    * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
    * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
    * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  @@ -59,61 +59,82 @@
   import java.util.Iterator;
   
   /**
  - * The interface javax.xml.rpc.encoding.TypeMappingRegistry defines a registry for TypeMapping instances for 
  + * The interface javax.xml.rpc.encoding.TypeMappingRegistry 
  + * defines a registry for TypeMapping instances for 
    * the different encoding styles. 
    *
  - * @version 0.1
  + * @version 0.6
    */
   public interface TypeMappingRegistry extends java.io.Serializable {
   
       /**
  -     * The method register adds a TypeMapping instance for a specific encoding style or XML schema namespace to the 
  +     * The method register adds a TypeMapping instance for a specific 
  +     * encoding style or XML schema namespace to the 
        * type mapping registry.
        *
        * @param mapping - TypeMapping for a specific encoding style or XML schema namespace
  -     * @param namespaceURI - Encoding style or XML schema namespace specified as an URI. An example is 
  +     * @param namespaceURIs - Encoding styles or XML schema namespaces specified as an URI.
  +     * An example is 
        * "http://schemas.xmlsoap.org/soap/encoding/"
        *
  -     * @throws JAXRPCException - If there is any error in the registration of the TypeMapping for the specified namespace URI
  +     * @throws JAXRPCException - If there is any error in the registration
  +     * of the TypeMapping for the specified namespace URI
        * java.lang.IllegalArgumentException - if an invalid namespace URI is specified
        */
  -    public void registry(TypeMapping mapping, String namespaceURI)
  +    public void registry(TypeMapping mapping, String[] namespaceURIs)
           throws JAXRPCException;
   
       /**
  -     * Gets a list of all TypeMapping objects registered with this TypeMappingRegistry.
  +     * The method register adds a default TypeMapping instance.  If a specific
  +     * TypeMapping is not found, the default TypeMapping is used.  
        *
  -     * @return java.util.Iterator for the list of registered TypeMapping objects
  +     * @param mapping - TypeMapping for a specific encoding style or XML schema namespace
  +     *
  +     * @throws JAXRPCException - If there is any error in the registration
  +     * of the TypeMapping for the specified namespace URI
  +     * java.lang.IllegalArgumentException - if an invalid namespace URI is specified
        */
  -    public Iterator getTypeMappings();
  +    public void registryDefault(TypeMapping mapping)
  +        throws JAXRPCException;
   
       /**
  -     * Gets a list of namespace URIs registered with this TypeMappingRegistry.
  +     * Gets the TypeMapping for the namespace.  If not found, the default TypeMapping 
  +     * is returned.
        *
  -     * @return java.util.Iterator for the list of all registered namespace URIs
  +     * @param namespaceURI - The namespace URI of a type
  +     * @return The registered TypeMapping (which may be the default TypeMapping) or null.
        */
  -    public Iterator getEncodingStyle();
  +    public TypeMapping getTypeMapping(String namespaceURI);
   
       /**
  -     * Returns the registered TypeMapping for the specified encoding style or XML schema namespace.
  -     *
  -     * @param namespaceURI - Encoding style or XML schema namespace specified as an URI. An example is 
  -     * "http://schemas.xmlsoap.org/soap/encoding/"
  +     * Removes the TypeMapping for the namespace.
        *
  -     * @return The registered TypeMapping for the specified encoding style or XML schema namespace. If there is no 
  -     * registered TypeMapping, this method returns null.
  +     * @param namespaceURI - The namespace URI of a type
  +     * @return The registered TypeMapping (which may be the default TypeMapping) or null.
        */
  -    public TypeMapping getTypeMapping(String namespaceURI);
  +    public TypeMapping removeTypeMapping(String namespaceURI);
  +
   
       /**
        * Creates a new empty TypeMapping object for the specified encoding style or XML schema namespace.
        *
  -     * @param namespaceURI - Encoding style or XML schema namespace specified as an URI. An example is 
  -     * "http://schemas.xmlsoap.org/soap/encoding/"
  +     * @return An empty generic TypeMapping object
  +     */
  +    public TypeMapping createTypeMapping();
  +
  +    /**
  +     * Gets a list of namespace URIs registered with this TypeMappingRegistry.
        *
  -     * @return An empty TypeMapping object
  +     * @return String[] containing names of all registered namespace URIs
        */
  -    public TypeMapping createTypeMapping(String namespaceURI);
  +    public String[] getSupportedNamespaces();
  +
  +
  +    /**
  +     * Removes all registered TypeMappings from the registery                   
  +     */
  +    public TypeMapping clear(String namespaceURI);
  +
   }