You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by aj...@apache.org on 2005/08/31 09:54:21 UTC

svn commit: r264962 - in /webservices/axis2/trunk/java/modules/wsdl: src/org/apache/axis2/wsdl/builder/wsdl4j/ src/org/apache/axis2/wsdl/codegen/emitter/ src/org/apache/axis2/wsdl/codegen/extension/ src/org/apache/axis2/wsdl/template/java/ src/org/apac...

Author: ajith
Date: Wed Aug 31 00:53:37 2005
New Revision: 264962

URL: http://svn.apache.org/viewcvs?rev=264962&view=rev
Log:
Added SOAP 1.2 support for the code generation. Now the SOAP 1.2 bindings are picked up correctly by the code generator (actually the WSDL pump) and the correct code is generated

Modified:
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/ExtensionConstants.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/ExtensionFactoryImpl.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPAddressImpl.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBindingImpl.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBodyImpl.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPHeadeImpl.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPOperationImpl.java
    webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java?rev=264962&r1=264961&r2=264962&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDLPump.java Wed Aug 31 00:53:37 2005
@@ -18,9 +18,9 @@
 import com.ibm.wsdl.extensions.soap.SOAPConstants;
 import org.apache.axis2.wsdl.builder.WSDLComponentFactory;
 import org.apache.wsdl.*;
-import org.apache.wsdl.extensions.DefaultExtensibilityElement;
 import org.apache.wsdl.extensions.ExtensionConstants;
 import org.apache.wsdl.extensions.ExtensionFactory;
+import org.apache.wsdl.extensions.DefaultExtensibilityElement;
 import org.apache.wsdl.impl.WSDLProcessingException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -701,14 +701,50 @@
 
             if (wsdl4jElement instanceof UnknownExtensibilityElement) {
                 UnknownExtensibilityElement unknown = (UnknownExtensibilityElement) (wsdl4jElement);
-                DefaultExtensibilityElement defaultExtensibilityElement = (DefaultExtensibilityElement) extensionFactory
-                        .getExtensionElement(wsdl4jElement.getElementType());
-                defaultExtensibilityElement.setElement(unknown.getElement());
-                Boolean required = unknown.getRequired();
-                if (null != required) {
-                    defaultExtensibilityElement.setRequired(required.booleanValue());
+                //look for the SOAP 1.2 stuff here. WSDL4j does not understand SOAP 1.2 things
+
+                if (ExtensionConstants.SOAP_12_OPERATION.equals(unknown.getElementType())){
+                    org.apache.wsdl.extensions.SOAPOperation soapOperationExtensibiltyElement = (org.apache.wsdl.extensions.SOAPOperation) extensionFactory
+                            .getExtensionElement(wsdl4jElement.getElementType());
+                    Element element = unknown.getElement();
+                    soapOperationExtensibiltyElement.setSoapAction(element.getAttribute("soapAction"));
+                    soapOperationExtensibiltyElement.setStyle(element.getAttribute("style"));
+                    // soapActionRequired
+                    component.addExtensibilityElement(soapOperationExtensibiltyElement);
+                }else if (ExtensionConstants.SOAP_12_BODY.equals(unknown.getElementType())){
+                    org.apache.wsdl.extensions.SOAPBody soapBodyExtensibiltyElement = (org.apache.wsdl.extensions.SOAPBody) extensionFactory
+                            .getExtensionElement(wsdl4jElement.getElementType());
+                    Element element = unknown.getElement();
+                    soapBodyExtensibiltyElement.setUse(element.getAttribute("use"));
+                    soapBodyExtensibiltyElement.setNamespaceURI(element.getAttribute("namespace"));
+                    //encoding style
+                    component.addExtensibilityElement(soapBodyExtensibiltyElement);
+                }else if (ExtensionConstants.SOAP_12_HEADER.equals(unknown.getElementType())){
+                    org.apache.wsdl.extensions.SOAPHeader soapHeaderExtensibilityElement = (org.apache.wsdl.extensions.SOAPHeader) extensionFactory.getExtensionElement(
+                            unknown.getElementType());
+                    //right now there's no known header binding!. Ignore the copying of values for now
+                    component.addExtensibilityElement(soapHeaderExtensibilityElement);
+                }else if (ExtensionConstants.SOAP_12_BINDING.equals(unknown.getElementType())){
+                     org.apache.wsdl.extensions.SOAPBinding soapBindingExtensibiltyElement = (org.apache.wsdl.extensions.SOAPBinding) extensionFactory
+                            .getExtensionElement(wsdl4jElement.getElementType());
+                    Element element = unknown.getElement();
+                    soapBindingExtensibiltyElement.setTransportURI(element.getAttribute("transport"));
+                    soapBindingExtensibiltyElement.setStyle(element.getAttribute("style"));
+
+                    component.addExtensibilityElement(soapBindingExtensibiltyElement);
+                } else{
+
+                    DefaultExtensibilityElement defaultExtensibilityElement = (DefaultExtensibilityElement) extensionFactory
+                            .getExtensionElement(wsdl4jElement.getElementType());
+                    defaultExtensibilityElement.setElement(unknown.getElement());
+                    Boolean required = unknown.getRequired();
+                    if (null != required) {
+                        defaultExtensibilityElement.setRequired(required.booleanValue());
+                    }
+                    component.addExtensibilityElement(defaultExtensibilityElement);
                 }
-                component.addExtensibilityElement(defaultExtensibilityElement);
+
+
             } else if (wsdl4jElement instanceof SOAPAddress) {
                 SOAPAddress soapAddress = (SOAPAddress) wsdl4jElement;
                 org.apache.wsdl.extensions.SOAPAddress soapAddressExtensibilityElement = (org.apache.wsdl.extensions.SOAPAddress) extensionFactory
@@ -781,7 +817,7 @@
                     soapHeaderExtensibilityElement.setRequired(required.booleanValue());
                 }
                 if (null!=wsdl4jDefinition){
-                    //find the relevant schema part from the massages
+                    //find the relevant schema part from the messages
                     Message msg = wsdl4jDefinition.getMessage(soapHeader.getMessage());
                     Part msgPart = msg.getPart(soapHeader.getPart());
                     soapHeaderExtensibilityElement.setElement(msgPart.getElementName());
@@ -806,8 +842,9 @@
                 }
                 component.addExtensibilityElement(soapBindingExtensibilityElement);
             } else {
-                //	throw new AxisError(
+                 //	throw new AxisError(
 //						"An Extensible item "+wsdl4jElement.getElementType()+" went unparsed during WSDL Parsing");
+
             }
         }
     }
@@ -833,5 +870,4 @@
             component.addExtensibleAttributes(attribute);
         }
     }
-
-}
\ No newline at end of file
+}

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java?rev=264962&r1=264961&r2=264962&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java Wed Aug 31 00:53:37 2005
@@ -885,7 +885,7 @@
             methodElement.appendChild(getOutputElement(doc, operation, soapHeaderOutputParameterList));
 
             rootElement.appendChild(methodElement);
-          
+
         }
     }
 
@@ -899,7 +899,7 @@
 
         while (extIterator.hasNext()) {
             WSDLExtensibilityElement element = (WSDLExtensibilityElement) extIterator.next();
-            if (element.getType().equals(ExtensionConstants.SOAP_HEADER)) {
+            if (element.getType().equals(ExtensionConstants.SOAP_11_HEADER)) {
                 SOAPHeader header = (SOAPHeader)element;
                 soapHeaderParameterQNameList.add(header.getElement());
             }
@@ -914,7 +914,7 @@
         boolean actionAdded = false;
         while (extIterator.hasNext()) {
             WSDLExtensibilityElement element = (WSDLExtensibilityElement) extIterator.next();
-            if (element.getType().equals(ExtensionConstants.SOAP_OPERATION)) {
+            if (ExtensionConstants.SOAP_11_OPERATION.equals(element.getType())) {
                 addAttribute(doc,
                         "soapaction",
                         ((SOAPOperation) element).getSoapAction(),
@@ -1071,11 +1071,12 @@
             Iterator iterator = endpoint.getExtensibilityElements().iterator();
             while (iterator.hasNext()) {
                 WSDLExtensibilityElement element = (WSDLExtensibilityElement) iterator.next();
-                if (element.getType().equals(ExtensionConstants.SOAP_ADDRESS)) {
+                if (ExtensionConstants.SOAP_11_ADDRESS.equals(element.getType()) ||
+                     ExtensionConstants.SOAP_12_ADDRESS.equals(element.getType())){
                     address = (org.apache.wsdl.extensions.SOAPAddress) element;
                 }
             }
-            text = doc.createTextNode(address.getLocationURI());     //todo How to get the end point address
+            text = doc.createTextNode(address!=null?address.getLocationURI():"");     //todo How to get the end point address
             endpointElement.appendChild(text);
             rootElement.appendChild(endpointElement);
         }

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java?rev=264962&r1=264961&r2=264962&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java Wed Aug 31 00:53:37 2005
@@ -12,10 +12,8 @@
 import org.apache.xmlbeans.*;
 import org.w3c.dom.Element;
 import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
 
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import java.io.*;
 import java.util.*;
 
@@ -193,7 +191,8 @@
                 .iterator();
         while (extIterator.hasNext()) {
             WSDLExtensibilityElement element = (WSDLExtensibilityElement) extIterator.next();
-            if (ExtensionConstants.SOAP_BODY.equals(element.getType())) {
+            if (ExtensionConstants.SOAP_11_BODY.equals(element.getType()) ||
+                    ExtensionConstants.SOAP_12_BODY.equals(element.getType())) {
                 if (WSDLConstants.WSDL_USE_ENCODED.equals(
                         ((SOAPBody) element).getUse())) {
                     throw new RuntimeException(

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl?rev=264962&r1=264961&r2=264962&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/SkeletonTemplate.xsl Wed Aug 31 00:53:37 2005
@@ -12,7 +12,8 @@
 	           java method -->
         /**
          * Auto generated method signature
-          <xsl:for-each select="input/param">
+         <!--  select only the body parameters  -->
+          <xsl:for-each select="input/param[@location='body']">
             <xsl:if test="@type!=''">* @param <xsl:value-of select="@name"></xsl:value-of><xsl:text>
          </xsl:text></xsl:if></xsl:for-each>
          */

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/ExtensionConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/ExtensionConstants.java?rev=264962&r1=264961&r2=264962&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/ExtensionConstants.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/ExtensionConstants.java Wed Aug 31 00:53:37 2005
@@ -26,22 +26,33 @@
     /**
      * The Type name for the SOAP Address defined in the Port/Endpoint
      */
-    public static final QName SOAP_ADDRESS = new QName(
+    public static final QName SOAP_11_ADDRESS = new QName(
             "http://schemas.xmlsoap.org/wsdl/soap/", "address");
+    public static final QName SOAP_12_ADDRESS = new QName(
+            "http://schemas.xmlsoap.org/wsdl/soap12/", "address");
 
-    public static final QName SOAP_OPERATION = new QName(
+
+    public static final QName SOAP_11_OPERATION = new QName(
             "http://schemas.xmlsoap.org/wsdl/soap/", "operation");
+     public static final QName SOAP_12_OPERATION = new QName(
+            "http://schemas.xmlsoap.org/wsdl/soap12/", "operation");
 
     public static final QName SCHEMA = new QName(
             "http://www.w3.org/2001/XMLSchema", "schema");
 
-    public static final QName SOAP_BODY = new QName(
+    public static final QName SOAP_11_BODY = new QName(
             "http://schemas.xmlsoap.org/wsdl/soap/", "body");
+    public static final QName SOAP_12_BODY = new QName(
+            "http://schemas.xmlsoap.org/wsdl/soap12/", "body");
     
-    public static final QName SOAP_HEADER = new QName(
+    public static final QName SOAP_11_HEADER = new QName(
             "http://schemas.xmlsoap.org/wsdl/soap/", "header");
+     public static final QName SOAP_12_HEADER = new QName(
+            "http://schemas.xmlsoap.org/wsdl/soap12/", "header");
 
-    public static final QName SOAP_BINDING = new QName(
+    public static final QName SOAP_11_BINDING = new QName(
             "http://schemas.xmlsoap.org/wsdl/soap/", "binding");
+     public static final QName SOAP_12_BINDING = new QName(
+            "http://schemas.xmlsoap.org/wsdl/soap12/", "binding");
 
 }

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/ExtensionFactoryImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/ExtensionFactoryImpl.java?rev=264962&r1=264961&r2=264962&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/ExtensionFactoryImpl.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/ExtensionFactoryImpl.java Wed Aug 31 00:53:37 2005
@@ -35,18 +35,28 @@
      * @return the Specific implementation for the particular QName given.
      */
     public WSDLExtensibilityElement getExtensionElement(QName qName) {
-        if (SOAP_ADDRESS.equals(qName))
+        if (SOAP_11_ADDRESS.equals(qName))
             return new SOAPAddressImpl();
         if (SCHEMA.equals(qName))
             return new SchemaImpl();
-        if (SOAP_OPERATION.equals(qName))
+        if (SOAP_11_OPERATION.equals(qName))
             return new SOAPOperationImpl();
-        if (SOAP_BODY.equals(qName))
+        if (SOAP_11_BODY.equals(qName))
             return new SOAPBodyImpl();
-        if (SOAP_BINDING.equals(qName))
+        if (SOAP_11_BINDING.equals(qName))
             return new SOAPBindingImpl();
-        if (SOAP_HEADER.equals(qName))
+        if (SOAP_11_HEADER.equals(qName))
             return new SOAPHeadeImpl();
+        //soap 1.2 objects.
+        if (SOAP_12_OPERATION.equals(qName))
+            return new SOAPOperationImpl(SOAP_12_OPERATION);
+        if (SOAP_12_BODY.equals(qName))
+            return new SOAPBodyImpl(SOAP_12_BODY);
+        if (SOAP_12_BINDING.equals(qName))
+            return new SOAPBindingImpl(SOAP_12_BINDING);
+        if (SOAP_12_HEADER.equals(qName))
+            return new SOAPHeadeImpl(SOAP_12_HEADER);
+        
         return new DefaultExtensibilityElementImpl();
     }
 

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPAddressImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPAddressImpl.java?rev=264962&r1=264961&r2=264962&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPAddressImpl.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPAddressImpl.java Wed Aug 31 00:53:37 2005
@@ -34,7 +34,7 @@
 
 
     public SOAPAddressImpl() {
-        type = SOAP_ADDRESS;
+        type = SOAP_11_ADDRESS;
     }
 
 

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBindingImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBindingImpl.java?rev=264962&r1=264961&r2=264962&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBindingImpl.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBindingImpl.java Wed Aug 31 00:53:37 2005
@@ -20,6 +20,8 @@
 import org.apache.wsdl.extensions.SOAPBinding;
 import org.apache.wsdl.impl.WSDLExtensibilityElementImpl;
 
+import javax.xml.namespace.QName;
+
 /**
  * @author chathura@opensource.lk
  */
@@ -30,9 +32,12 @@
     protected String transportURI;
 
     public SOAPBindingImpl() {
-        this.type = SOAP_BINDING;
+        this.type = SOAP_11_BINDING;
     }
 
+    public SOAPBindingImpl(QName type) {
+        this.type = type;
+    }
 
     public String getStyle() {
         return style;

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBodyImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBodyImpl.java?rev=264962&r1=264961&r2=264962&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBodyImpl.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPBodyImpl.java Wed Aug 31 00:53:37 2005
@@ -20,6 +20,8 @@
 import org.apache.wsdl.extensions.SOAPBody;
 import org.apache.wsdl.impl.WSDLExtensibilityElementImpl;
 
+import javax.xml.namespace.QName;
+
 /**
  * @author chathura@opensource.lk
  */
@@ -30,9 +32,12 @@
     protected String namespaceURI;
 
     public SOAPBodyImpl() {
-        this.type = SOAP_BODY;
+        this.type = SOAP_11_BODY;
     }
 
+    public SOAPBodyImpl(QName type) {
+        this.type = type;
+    }
 
     public String getNamespaceURI() {
         return namespaceURI;

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPHeadeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPHeadeImpl.java?rev=264962&r1=264961&r2=264962&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPHeadeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPHeadeImpl.java Wed Aug 31 00:53:37 2005
@@ -18,7 +18,11 @@
     private QName element = null;
 
     public SOAPHeadeImpl() {
-        this.type = SOAP_HEADER;
+        this.type = SOAP_11_HEADER;
+    }
+
+    public SOAPHeadeImpl(QName type) {
+        this.type = type;
     }
 
     public QName getMessage() {

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPOperationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPOperationImpl.java?rev=264962&r1=264961&r2=264962&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPOperationImpl.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/extensions/impl/SOAPOperationImpl.java Wed Aug 31 00:53:37 2005
@@ -20,6 +20,8 @@
 import org.apache.wsdl.extensions.SOAPOperation;
 import org.apache.wsdl.impl.WSDLExtensibilityElementImpl;
 
+import javax.xml.namespace.QName;
+
 /**
  * @author chathura@opensource.lk
  */
@@ -31,9 +33,12 @@
     private String style;
 
     public SOAPOperationImpl() {
-        this.type = SOAP_OPERATION;
+        this.type = SOAP_11_OPERATION;
     }
 
+    public SOAPOperationImpl(QName type) {
+        this.type = type;
+    }
     public String getStyle() {
         return style;
     }

Modified: webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java?rev=264962&r1=264961&r2=264962&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/test/org/apache/wsdl/SOAPActionTest.java Wed Aug 31 00:53:37 2005
@@ -65,7 +65,7 @@
             WSDLExtensibilityElement element = (WSDLExtensibilityElement) iterator
                     .next();
             SOAPOperation soapOperation = null;
-            if (ExtensionConstants.SOAP_OPERATION.equals(element.getType())) {
+            if (ExtensionConstants.SOAP_11_OPERATION.equals(element.getType())) {
                 soapOperation = (SOAPOperation) element;
             }
             if (soapOperation == null) {