axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: ws-axis/java/src/org/apache/axis/wsdl/fromJava Types.java
Date Tue, 18 Jan 2005 14:49:46 GMT
dims        2005/01/18 06:49:46

  Modified:    java/src/org/apache/axis/wsdl/fromJava Types.java
  Log:
  Key off of the typemapping impl and not of the system property.
  
  Revision  Changes    Path
  1.108     +10 -3     ws-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java
  
  Index: Types.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -u -r1.107 -r1.108
  --- Types.java	11 Jan 2005 16:44:53 -0000	1.107
  +++ Types.java	18 Jan 2005 14:49:46 -0000	1.108
  @@ -23,6 +23,7 @@
   import org.apache.axis.encoding.SerializerFactory;
   import org.apache.axis.encoding.SimpleType;
   import org.apache.axis.encoding.TypeMapping;
  +import org.apache.axis.encoding.DefaultJAXRPC11TypeMappingImpl;
   import org.apache.axis.encoding.ser.BeanSerializerFactory;
   import org.apache.axis.encoding.ser.EnumSerializerFactory;
   import org.apache.axis.enum.Style;
  @@ -116,9 +117,6 @@
       /** Which types have we already written? */
       Class [] mappedTypes = null;
   
  -    /** For WS-I BP compliance, we can't use "ArrayOf" as a type prefix - instead use "MyArrayOf"
(gag) */
  -    private String arrayTypePrefix = AxisEngine.jaxrpc11Compliance ? "MyArrayOf" : "ArrayOf";
  -
       public static boolean isArray(Class clazz)
       {
           return clazz.isArray() || java.util.Collection.class.isAssignableFrom(clazz);
  @@ -719,6 +717,15 @@
                   Constants.equals(Constants.SOAP_ARRAY, qName)) {
               Class componentType = getComponentType(javaType);
   
  +            // For WS-I BP compliance, we can't use "ArrayOf" as a type prefix 
  +            // instead use "MyArrayOf" (gag) 
  +            String arrayTypePrefix = "ArrayOf";
  +
  +            if(tm instanceof DefaultJAXRPC11TypeMappingImpl || 
  +               defaultTM instanceof DefaultJAXRPC11TypeMappingImpl) {
  +                arrayTypePrefix = "MyArrayOf";
  +            }
  +            
               // If component namespace uri == targetNamespace
               // Construct ArrayOf<componentLocalPart>
               // Else
  
  
  

Mime
View raw message