axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis Constants.java
Date Tue, 23 Jul 2002 15:02:57 GMT
tomj        2002/07/23 08:02:57

  Modified:    java/src/org/apache/axis/encoding
                        DefaultTypeMappingImpl.java
               java/src/org/apache/axis Constants.java
  Log:
  Change the names of the date/time XML Schema constants to better
  reflect what they are.
  
  Revision  Changes    Path
  1.38      +18 -18    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.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- DefaultTypeMappingImpl.java	22 Jul 2002 15:17:34 -0000	1.37
  +++ DefaultTypeMappingImpl.java	23 Jul 2002 15:02:56 -0000	1.38
  @@ -275,35 +275,35 @@
           // namespace versions.
           // XSD_DATE is the current one, which is why it is
           // registered after the other two
  -        myRegister(Constants.XSD_DATE2,      java.util.Calendar.class,
  +        myRegister(Constants.XSD_TIMEINSTANT1999,      java.util.Calendar.class,
                      new CalendarSerializerFactory(java.util.Calendar.class,
  -                                             Constants.XSD_DATE2),
  +                                             Constants.XSD_TIMEINSTANT1999),
                      new CalendarDeserializerFactory(java.util.Calendar.class,
  -                                               Constants.XSD_DATE2),
  +                                               Constants.XSD_TIMEINSTANT1999),
                      true);
  -        myRegister(Constants.XSD_DATE3,      java.util.Calendar.class,
  +        myRegister(Constants.XSD_TIMEINSTANT2000,      java.util.Calendar.class,
                      new CalendarSerializerFactory(java.util.Calendar.class,
  -                                             Constants.XSD_DATE3),
  +                                             Constants.XSD_TIMEINSTANT2000),
                      new CalendarDeserializerFactory(java.util.Calendar.class,
  -                                               Constants.XSD_DATE3),
  +                                               Constants.XSD_TIMEINSTANT2000),
                      true);
  -        myRegister(Constants.XSD_DATE1,       java.util.Date.class,
  +        myRegister(Constants.XSD_DATE,       java.util.Date.class,
                      new DateSerializerFactory(java.util.Date.class,
  -                                             Constants.XSD_DATE1),
  +                                             Constants.XSD_DATE),
                      new DateDeserializerFactory(java.util.Date.class,
  -                                               Constants.XSD_DATE1),
  +                                               Constants.XSD_DATE),
                      true);
  -        myRegister(Constants.XSD_DATE,       java.util.Date.class,
  +        myRegister(Constants.XSD_DATETIME,       java.util.Date.class,
                      new CalendarSerializerFactory(java.util.Date.class,
  -                                             Constants.XSD_DATE),
  +                                             Constants.XSD_DATETIME),
                      new CalendarDeserializerFactory(java.util.Date.class,
  -                                               Constants.XSD_DATE),
  +                                               Constants.XSD_DATETIME),
                      true);
  -        myRegister(Constants.XSD_DATE,       java.util.Calendar.class,
  +        myRegister(Constants.XSD_DATETIME,       java.util.Calendar.class,
                      new CalendarSerializerFactory(java.util.Calendar.class,
  -                                             Constants.XSD_DATE),
  +                                             Constants.XSD_DATETIME),
                      new CalendarDeserializerFactory(java.util.Calendar.class,
  -                                               Constants.XSD_DATE),
  +                                               Constants.XSD_DATETIME),
                      true);
   
           // Serialize all extensions of Map to SOAP_MAP
  @@ -428,7 +428,7 @@
           // Register all known flavors of the namespace.
           try {
               if (xmlType.getNamespaceURI().equals(
  -                       Constants.URI_DEFAULT_SCHEMA_XSD)) {
  +                    Constants.URI_DEFAULT_SCHEMA_XSD)) {
                   for (int i=0; i < Constants.URIS_SCHEMA_XSD.length; i++) {
                       QName qName = new QName(Constants.URIS_SCHEMA_XSD[i],
                                               xmlType.getLocalPart());
  @@ -436,7 +436,7 @@
                   }
               }
               else if (xmlType.getNamespaceURI().equals(
  -                       Constants.URI_DEFAULT_SOAP_ENC)) {
  +                    Constants.URI_DEFAULT_SOAP_ENC)) {
                   for (int i=0; i < Constants.URIS_SOAP_ENC.length; i++) {
                       QName qName = new QName(Constants.URIS_SOAP_ENC[i],
                                               xmlType.getLocalPart());
  @@ -446,7 +446,7 @@
               // Register with the specified xmlType.
               // This is the prefered mapping and the last registed one wins
               super.register(javaType, xmlType, sf, df);
  -        } catch (Exception e) {}
  +        } catch (JAXRPCException e) { }
       }
   
       // Don't allow anyone to muck with the default type mapping because
  
  
  
  1.70      +6 -6      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.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- Constants.java	18 Jul 2002 17:38:16 -0000	1.69
  +++ Constants.java	23 Jul 2002 15:02:56 -0000	1.70
  @@ -432,13 +432,13 @@
       public static final QName XSD_ANYTYPE = new QName(URI_DEFAULT_SCHEMA_XSD, "anyType");
       public static final QName XSD_ANY = new QName(URI_DEFAULT_SCHEMA_XSD, "any");
       public static final QName XSD_QNAME = new QName(URI_DEFAULT_SCHEMA_XSD, "QName");
  -    public static final QName XSD_DATE = new QName(URI_DEFAULT_SCHEMA_XSD, "dateTime");
  -    public static final QName XSD_DATE1 = new QName(URI_DEFAULT_SCHEMA_XSD, "date");
  -    public static final QName XSD_DATE2 = new QName(URI_1999_SCHEMA_XSD,    "timeInstant");
  -    public static final QName XSD_DATE3 = new QName(URI_2000_SCHEMA_XSD,    "timeInstant");
  +    public static final QName XSD_DATETIME = new QName(URI_DEFAULT_SCHEMA_XSD, "dateTime");
  +    public static final QName XSD_DATE = new QName(URI_DEFAULT_SCHEMA_XSD, "date");
  +    public static final QName XSD_TIMEINSTANT1999 = new QName(URI_1999_SCHEMA_XSD, "timeInstant");
  +    public static final QName XSD_TIMEINSTANT2000 = new QName(URI_2000_SCHEMA_XSD, "timeInstant");
   
  -    public static final QName XSD_NORMALIZEDSTRING = new QName(URI_2001_SCHEMA_XSD,   
"normalizedString");
  -    public static final QName XSD_TOKEN = new QName(URI_2001_SCHEMA_XSD,    "token");
  +    public static final QName XSD_NORMALIZEDSTRING = new QName(URI_2001_SCHEMA_XSD, "normalizedString");
  +    public static final QName XSD_TOKEN = new QName(URI_2001_SCHEMA_XSD, "token");
   
       public static final QName SOAP_BASE64 = new QName(URI_DEFAULT_SOAP_ENC, "base64");
       public static final QName SOAP_STRING = new QName(URI_DEFAULT_SOAP_ENC, "string");
  
  
  

Mime
View raw message