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 di...@apache.org on 2002/11/22 21:12:26 UTC

cvs commit: xml-axis/java/src/org/apache/axis/encoding DefaultTypeMappingImpl.java

dims        2002/11/22 12:12:26

  Modified:    java/src/org/apache/axis Constants.java
               java/src/org/apache/axis/encoding
                        DefaultTypeMappingImpl.java
  Log:
  Fix for Bug 14712, we need to map xml:lang to org.apache.axis.types.Language as well.
  
  Revision  Changes    Path
  1.98      +2 -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.97
  retrieving revision 1.98
  diff -u -r1.97 -r1.98
  --- Constants.java	20 Nov 2002 16:37:40 -0000	1.97
  +++ Constants.java	22 Nov 2002 20:12:24 -0000	1.98
  @@ -543,6 +543,8 @@
       public static final QName XSD_LANGUAGE = new QName(URI_2001_SCHEMA_XSD, "language");
       public static final QName XSD_ID = new QName(URI_2001_SCHEMA_XSD, "ID");
       
  +    public static final QName XML_LANG = new QName(NS_URI_XML, "lang");
  +
       public static final QName SOAP_BASE64 = new QName(URI_DEFAULT_SOAP_ENC, "base64");
       public static final QName SOAP_BASE64BINARY = new QName(URI_DEFAULT_SOAP_ENC, "base64Binary");
       public static final QName SOAP_STRING = new QName(URI_DEFAULT_SOAP_ENC, "string");
  
  
  
  1.63      +9 -1      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.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- DefaultTypeMappingImpl.java	1 Nov 2002 13:49:06 -0000	1.62
  +++ DefaultTypeMappingImpl.java	22 Nov 2002 20:12:25 -0000	1.63
  @@ -485,7 +485,15 @@
                      new SimpleDeserializerFactory(org.apache.axis.types.Language.class,
                                                Constants.XSD_LANGUAGE)
           );
  -         
  +
  +        // a xml:lang
  +        myRegister(Constants.XML_LANG, org.apache.axis.types.Language.class,
  +                   new SimpleSerializerFactory(org.apache.axis.types.Language.class,
  +                                             Constants.XML_LANG),
  +                   new SimpleDeserializerFactory(org.apache.axis.types.Language.class,
  +                                             Constants.XML_LANG)
  +        );
  +        
           // a xsd:NmToken
           myRegister(Constants.XSD_NMTOKEN, org.apache.axis.types.NMToken.class,
                      new SimpleSerializerFactory(org.apache.axis.types.NMToken.class,