You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/02/12 19:04:59 UTC

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

dims        2005/02/12 10:04:59

  Modified:    java/src/org/apache/axis/encoding
                        DefaultTypeMappingImpl.java
  Log:
  Removing xsd:language, xsd:name from here as it breaks TCK tests.
  
  Revision  Changes    Path
  1.88      +1 -33     ws-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java
  
  Index: DefaultTypeMappingImpl.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/DefaultTypeMappingImpl.java,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- DefaultTypeMappingImpl.java	7 Feb 2005 07:54:03 -0000	1.87
  +++ DefaultTypeMappingImpl.java	12 Feb 2005 18:04:59 -0000	1.88
  @@ -151,41 +151,9 @@
                                                  Constants.XSD_BASE64 ),
                      new Base64DeserializerFactory(byte[].class,
                                              Constants.XSD_BASE64));
  -        /*
  -        // This JSR 101 change occurred right before v1.0.
  -        // This mapping is not roundtrippable, and breaks the roundtrip
  -        // testcase, so it is commented out for now.
  -        // SOAP 1.1
  -        // byte[] -ser-> XSD_BASE64
  -        // Byte[] -ser-> XSD_BASE64
  -        // XSD_BASE64 -deser-> byte[]
  -        // SOAP_BASE64 -deser->byte[]
  -        //
  -        // NOTE: If the following code is enabled, the
  -        // commented out code "//type == Byte[].class ||"
  -        // code in org.apache.axis.wsdl.fromJava.Types also needs to be enabled.
  -
  -        myRegister(Constants.SOAP_BASE64,     byte[].class,
  -                   new Base64SerializerFactory(byte[].class,
  -                                               Constants.SOAP_BASE64 ),
  -                   new Base64DeserializerFactory(byte[].class,
  -                                                 Constants.SOAP_BASE64),
  -                   true);
  -        myRegister(Constants.XSD_BASE64,     Byte[].class,
  -                   new Base64SerializerFactory(Byte[].class,
  -                                               Constants.XSD_BASE64 ),
  -                   new Base64DeserializerFactory(Byte[].class,
  -                                           Constants.XSD_BASE64),true);
  -        myRegister(Constants.XSD_BASE64,     byte[].class,
  -                   new Base64SerializerFactory(byte[].class,
  -                                               Constants.XSD_BASE64 ),
  -                   new Base64DeserializerFactory(byte[].class,
  -                                           Constants.XSD_BASE64),true);
  -        */
  +
           // anySimpleType is mapped to java.lang.String according to JAX-RPC 1.1 spec.
           myRegisterSimple(Constants.XSD_ANYSIMPLETYPE, java.lang.String.class);
  -        myRegisterSimple(Constants.XSD_LANGUAGE, java.lang.String.class);
  -        myRegisterSimple(Constants.XSD_NAME, java.lang.String.class);
           
           // If SOAP 1.1 over the wire, map wrapper classes to XSD primitives.
           myRegisterSimple(Constants.XSD_STRING, java.lang.String.class);