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 JavaGeneratorFactory.java
Date Fri, 28 Jun 2002 23:27:25 GMT
scheu       2002/06/28 16:27:25

  Modified:    java/samples/echo deploy.wsdd
               java/src/org/apache/axis Constants.java
               java/src/org/apache/axis/wsdl/fromJava Emitter.java
               java/src/org/apache/axis/wsdl/toJava
                        JavaGeneratorFactory.java
  Log:
  Problem:
  echo?wsdl dies with an NPE.  The source of the problem is
  echo's deploy.wsdd which contains echoMapArray meta data that no longer
  matches what is produced by Java2WSDL.  The net effect was two
  OperationDescs being produced from the same operation...one of
  the OperationDescs (the one from the deploy.wsdd) resulted in the
  NPE.
  
  All of these problems may have been exposed by recent HashMap/Hashtable
  changes.
  
  Solution:
  
  1) The echo deploy.wsdd contains the qname ArrayOfMap.
     Changed the qname to ArrayOf_apachesoap_Map
     to comply with the current array naming conventions in Java2WSDL.
  
  2) Made sure that Java2WSDL emits a http://xml.apache.org/xml-soap namespace
     and associates it with the prefix apachesoap.
  
  Revision  Changes    Path
  1.21      +3 -3      xml-axis/java/samples/echo/deploy.wsdd
  
  Index: deploy.wsdd
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/samples/echo/deploy.wsdd,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- deploy.wsdd	8 May 2002 15:05:53 -0000	1.20
  +++ deploy.wsdd	28 Jun 2002 23:27:24 -0000	1.21
  @@ -65,7 +65,7 @@
         />
         <typeMapping
           xmlns:ns="http://soapinterop.org/"
  -        qname="ns:ArrayOf_tns2_Map"
  +        qname="ns:ArrayOf_apachesoap_Map"
           type="java:java.util.HashMap[]"
           serializer="org.apache.axis.encoding.ser.ArraySerializerFactory"
           deserializer="org.apache.axis.encoding.ser.ArrayDeserializerFactory"
  @@ -161,8 +161,8 @@
         <operation name="echoMap" returnQName="return" returnType="RTypeNS:Map" xmlns:RTypeNS="http://xml.apache.org/xml-soap"
>
           <parameter name="input" type="tns:Map" xmlns:tns="http://xml.apache.org/xml-soap"/>
         </operation>
  -      <operation name="echoMapArray" returnQName="return" returnType="RTypeNS:ArrayOfMap"
xmlns:RTypeNS="http://soapinterop.org/xsd" >
  -        <parameter name="input" type="tns:ArrayOfMap" xmlns:tns="http://soapinterop.org/xsd"/>
  +      <operation name="echoMapArray" returnQName="return" returnType="RTypeNS:ArrayOf_apachesoap_Map"
xmlns:RTypeNS="http://soapinterop.org/" >
  +        <parameter name="input" type="tns:ArrayOf_apachesoap_Map" xmlns:tns="http://soapinterop.org/"/>
         </operation>
     </service>
   </deployment>
  
  
  
  1.65      +1 -1      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.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- Constants.java	18 Jun 2002 13:52:47 -0000	1.64
  +++ Constants.java	28 Jun 2002 23:27:25 -0000	1.65
  @@ -74,12 +74,12 @@
       public static final String NS_PREFIX_SCHEMA_XSD = "xsd" ;
       public static final String NS_PREFIX_WSDL       = "wsdl" ;
       public static final String NS_PREFIX_WSDL_SOAP  = "wsdlsoap";
  +    public static final String NS_PREFIX_XMLSOAP    = "apachesoap";
   
   
       // Axis Namespaces
       public static final String NS_URI_AXIS = "http://xml.apache.org/axis/";
       public static final String NS_URI_XMLSOAP = "http://xml.apache.org/xml-soap";
  -
   
   
       //
  
  
  
  1.45      +5 -0      xml-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java
  
  Index: Emitter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Emitter.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- Emitter.java	21 Jun 2002 22:25:38 -0000	1.44
  +++ Emitter.java	28 Jun 2002 23:27:25 -0000	1.45
  @@ -489,6 +489,11 @@
                            Constants.URI_DEFAULT_SCHEMA_XSD);
           namespaces.putPrefix(Constants.URI_DEFAULT_SCHEMA_XSD,
                                Constants.NS_PREFIX_SCHEMA_XSD);
  +
  +        def.addNamespace(Constants.NS_PREFIX_XMLSOAP,
  +                         Constants.NS_URI_XMLSOAP);
  +        namespaces.putPrefix(Constants.NS_URI_XMLSOAP,
  +                             Constants.NS_PREFIX_XMLSOAP);
       }
   
      /**
  
  
  
  1.12      +1 -0      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
  
  Index: JavaGeneratorFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- JavaGeneratorFactory.java	26 Jun 2002 21:23:52 -0000	1.11
  +++ JavaGeneratorFactory.java	28 Jun 2002 23:27:25 -0000	1.12
  @@ -845,6 +845,7 @@
        */
       private String constructSignature(Parameters parms, String opName) {
           String name  = Utils.xmlNameToJava(opName);
  +
           String ret = parms.returnType == null ? "void" : parms.returnType.getName();
           String signature = "    public " + ret + " " + name + "(";
   
  
  
  

Mime
View raw message