axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/wsdl/toJava Emitter.java
Date Mon, 08 Jul 2002 15:56:36 GMT
scheu       2002/07/08 08:56:36

  Modified:    java/src/org/apache/axis/utils axisNLS.properties
               java/src/org/apache/axis/wsdl Java2WSDL.java
               java/src/org/apache/axis/wsdl/toJava Emitter.java
  Log:
  The DefaultTypeMappingImpl contains the mappings for wsdl <-> java that
  are compliant with JAXRPC
  
  The DefaultSOAP12TypeMappingImpl (which is inappropriately named) is the
  same as the DefaultTypeMappingImpl except that the soap-enc mappings are
  preferred over xsd mappings.
  
  Both WSDL2Java and Java2WSDL have options which allow either of these
  mappings to be chosen.  (1.1 gets the first one, 1.2 gets the second one).
  
  -------------------------------------------------------
  The default for these options was 1.2.  The default is changed to 1.1 for compliance.
  -------------------------------------------------------
  
  Further notes:
  Glen, pick up this change if you want it in b3.
  
  After things settle, we need to have a better solution going forward.
  The following options seems more reasonable:
     1.1, 1.1encoded, 1.2, 1.2encoded
  
  We can discuss these later.
  
  Revision  Changes    Path
  1.23      +2 -2      xml-axis/java/src/org/apache/axis/utils/axisNLS.properties
  
  Index: axisNLS.properties
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/axisNLS.properties,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- axisNLS.properties	2 Jul 2002 22:54:32 -0000	1.22
  +++ axisNLS.properties	8 Jul 2002 15:56:36 -0000	1.23
  @@ -718,9 +718,9 @@
   
   NoJAXRPCHandler00=Unable to create handler of type {0}
   
  -optionTypeMapping00=indicate 1.1 or 1.2.  The default is 1.2 (SOAP 1.2 JAX-RPC compliant)
  +optionTypeMapping00=indicate 1.1 or 1.2.  The default is 1.1 (SOAP 1.1 JAX-RPC compliant.
 1.2 indicates SOAP 1.1 encoded.)
   badTypeMappingOption00=The -typeMappingVersion argument must be 1.1 or 1.2
  -j2wopttypeMapping00=indicate 1.1 or 1.2.  The default is 1.2 (SOAP 1.2 JAX-RPC compliant)
  +j2wopttypeMapping00=indicate 1.1 or 1.2.  The default is 1.1 (SOAP 1.1 JAX-RPC compliant
 1.2 indicates SOAP 1.1 encoded.)
   j2wBadTypeMapping00=The -typeMappingVersion argument must be 1.1 or 1.2
   
   nodisk00=No disk access, using memory only.
  
  
  
  1.20      +1 -1      xml-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java
  
  Index: Java2WSDL.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Java2WSDL.java	5 Jun 2002 19:28:59 -0000	1.19
  +++ Java2WSDL.java	8 Jul 2002 15:56:36 -0000	1.20
  @@ -392,7 +392,7 @@
           
           // Default to SOAP 1.2 JAX-RPC mapping
           if (emitter.getDefaultTypeMapping() == null) {
  -            emitter.setDefaultTypeMapping(DefaultSOAP12TypeMappingImpl.create());
  +            emitter.setDefaultTypeMapping(DefaultTypeMappingImpl.getSingleton());
           }            
       }
   
  
  
  
  1.46      +1 -1      xml-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java
  
  Index: Emitter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- Emitter.java	27 Jun 2002 18:51:38 -0000	1.45
  +++ Emitter.java	8 Jul 2002 15:56:36 -0000	1.46
  @@ -99,7 +99,7 @@
   //    public static final byte SCOPE_SESSION      = (byte)Scope.SESSION.getValue();
   
       protected HashMap namespaceMap = new HashMap();
  -    protected String typeMappingVersion = "1.2";
  +    protected String typeMappingVersion = "1.1";
       protected BaseTypeMapping baseTypeMapping = null;
       protected Namespaces namespaces = null;
       protected String NStoPkgFilename = "NStoPkg.properties";
  
  
  

Mime
View raw message