ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r390960 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/client/ core/src/org/apache/axis2/description/ integration/test/org/apache/axis2/engine/ java2wsdl/src/org/apache/ws/java2wsdl/
Date Mon, 03 Apr 2006 06:02:54 GMT
Author: deepal
Date: Sun Apr  2 23:02:52 2006
New Revision: 390960

URL: http://svn.apache.org/viewcvs?rev=390960&view=rev
Log:
- SOAP 1.2 binding is done

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
    webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
    webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java?rev=390960&r1=390959&r2=390960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/ServiceClient.java
Sun Apr  2 23:02:52 2006
@@ -365,6 +365,7 @@
          * sending this out InOnlyMEPClient mepClient = new
          * InOnlyMEPClient(serviceContext); mepClient.send("foo", mc);
          */
+       // sendReceive(operation,elem);
         throw new UnsupportedOperationException(
                 "ServiceClient.sendRobust is not yet implemented");
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java?rev=390960&r1=390959&r2=390960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java
Sun Apr  2 23:02:52 2006
@@ -45,6 +45,7 @@
 
     private String targetNamespace;
     private OMNamespace soap;
+    private OMNamespace soap12;
     private OMNamespace tns;
     private OMNamespace wsdl;
 
@@ -83,7 +84,8 @@
                 ele.declareNamespace((String) nameSpaceMap.get(key), key);
             }
         }
-        soap = ele.declareNamespace(DEFAULT_SOAP_NAMESPACE, DEFAULT_SOAP_NAMESPACE_PREFIX);
+        soap = ele.declareNamespace(URI_WSDL11_SOAP, SOAP11_PREFIX);
+        soap12 = ele.declareNamespace(URI_WSDL12_SOAP, SOAP12_PREFIX);
         String prefix = getPrefix(axisService.getTargetNamespace());
         if (prefix == null || "".equals(prefix)) {
             prefix = DEFAULT_TARGET_NAMESPACE_PREFIX;
@@ -108,7 +110,8 @@
         }
         generateMessages(fac, ele);
         generatePortType(fac, ele);
-        generateSOAPBinding(fac, ele);
+        generateSOAP11Binding(fac, ele);
+        generateSOAP12Binding(fac, ele);
         generateService(fac, ele);
         return ele;
     }
@@ -283,7 +286,7 @@
                         AxisExtensiblityElementWrapper.PORT_TYPE) {
                     WSDLExtensibilityElement wsdlextElement =
                             axisExtensiblityElementWrapper.getExtensibilityElement();
-                    writeExtensibilityElement(wsdlextElement, fac, output);
+                    writeExtensibilityElement(wsdlextElement, fac, output, soap);
                 }
             }
         }
@@ -297,15 +300,20 @@
         OMElement service = fac.createOMElement(SERVICE_LOCAL_NAME, wsdl);
         defintions.addChild(service);
         service.addAttribute(ATTRIBUTE_NAME, axisService.getName(), null);
+        generateSOAP11Port(fac, service);
+        generateSOAP12Port(fac, service);
+    }
+
+    private void generateSOAP11Port(OMFactory fac, OMElement service) throws Exception {
         for (int i = 0; i < url.length; i++) {
             String urlString = url[i];
             OMElement port = fac.createOMElement(PORT, wsdl);
             service.addChild(port);
-            port.addAttribute(ATTRIBUTE_NAME, axisService.getName() + PORT + i, null);
+            port.addAttribute(ATTRIBUTE_NAME, axisService.getName() + SOAP11PORT + i, null);
             port.addAttribute(BINDING_LOCAL_NAME, tns.getPrefix() + ":" +
                     axisService.getName() + BINDING_NAME_SUFFIX, null);
             addExtensionElemnet(fac, port, SOAP_ADDRESS, LOCATION,
-                    urlString);
+                    urlString, soap);
 
 
             ArrayList extElementList = axisService.getWsdlExtElements();
@@ -319,31 +327,148 @@
                         WSDLExtensibilityElement wsdlextElement =
                                 axisExtensiblityElementWrapper.getExtensibilityElement();
                         if (!(wsdlextElement instanceof SOAPAddress)) {
-                            writeExtensibilityElement(wsdlextElement, fac, port);
+                            writeExtensibilityElement(wsdlextElement, fac, port, soap);
                         }
                     }
                 }
             }
         }
+    }
+
+    private void generateSOAP12Port(OMFactory fac, OMElement service) throws Exception {
+        for (int i = 0; i < url.length; i++) {
+            String urlString = url[i];
+            OMElement port = fac.createOMElement(PORT, wsdl);
+            service.addChild(port);
+            port.addAttribute(ATTRIBUTE_NAME, axisService.getName() + SOAP12PORT + i, null);
+            port.addAttribute(BINDING_LOCAL_NAME, tns.getPrefix() + ":" +
+                    axisService.getName() + SOAP12BINDING_NAME_SUFFIX, null);
+            addExtensionElemnet(fac, port, SOAP_ADDRESS, LOCATION,
+                    urlString, soap12);
 
 
+            ArrayList extElementList = axisService.getWsdlExtElements();
+            if (extElementList != null) {
+                Iterator elements = extElementList.iterator();
+                while (elements.hasNext()) {
+                    AxisExtensiblityElementWrapper axisExtensiblityElementWrapper =
+                            (AxisExtensiblityElementWrapper) elements.next();
+                    if (axisExtensiblityElementWrapper.getType() ==
+                            AxisExtensiblityElementWrapper.PORT) {
+                        WSDLExtensibilityElement wsdlextElement =
+                                axisExtensiblityElementWrapper.getExtensibilityElement();
+                        if (!(wsdlextElement instanceof SOAPAddress)) {
+                            writeExtensibilityElement(wsdlextElement, fac, port, soap12);
+                        }
+                    }
+                }
+            }
+        }
     }
 
     /**
      * Generate the bindings
      */
-    private void generateSOAPBinding(OMFactory fac,
-                                     OMElement defintions) throws Exception {
+    private void generateSOAP11Binding(OMFactory fac,
+                                       OMElement defintions) throws Exception {
         OMElement binding = fac.createOMElement(BINDING_LOCAL_NAME, wsdl);
         defintions.addChild(binding);
         binding.addAttribute(ATTRIBUTE_NAME, axisService.getName() + BINDING_NAME_SUFFIX,
null);
         binding.addAttribute("type", tns.getPrefix() + ":" + axisService.getName() + PORT_TYPE_SUFFIX,
null);
 
         //Adding ext elements
-        writeBindingExtensibleElements(fac, binding);
+        writeBindingExtensibleElements(fac, binding, soap);
+        addExtensionElemnet(fac, binding, BINDING_LOCAL_NAME,
+                TRANSPORT, TRANSPORT_URI,
+                STYLE, style, soap);
+
+        Iterator operations = axisService.getOperations();
+        while (operations.hasNext()) {
+            AxisOperation axisOperation = (AxisOperation) operations.next();
+            if (axisOperation.isControlOperation()) {
+                continue;
+            }
+            String opeartionName = axisOperation.getName().getLocalPart();
+            OMElement operation = fac.createOMElement(OPERATION_LOCAL_NAME, wsdl);
+            binding.addChild(operation);
+            String soapAction = axisOperation.getSoapAction();
+            if (soapAction == null) {
+                soapAction = "";
+            }
+            addExtensionElemnet(fac, operation, OPERATION_LOCAL_NAME,
+                    SOAP_ACTION, soapAction,
+                    STYLE, style, soap);
+            //writing ext elements
+            writeOperationExtensibleElements(axisOperation, fac, operation, soap);
+
+            String MEP = axisOperation.getMessageExchangePattern();
+
+            if (WSDLConstants.MEP_URI_IN_ONLY.equals(MEP) ||
+                    WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
+                    WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
+                    WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
+                    WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
+                    WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+                AxisMessage inaxisMessage = axisOperation
+                        .getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+                if (inaxisMessage != null) {
+                    operation.addAttribute(ATTRIBUTE_NAME, opeartionName, null);
+                    OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME, wsdl);
+                    addExtensionElemnet(fac, input, SOAP_BODY, SOAP_USE, use, "namespace",
+                            targetNamespace, soap);
+                    operation.addChild(input);
+                    writeBidingPartExtensibleElements(inaxisMessage, fac, input, soap);
+                }
+            }
+
+            if (WSDLConstants.MEP_URI_OUT_ONLY.equals(MEP) ||
+                    WSDLConstants.MEP_URI_OUT_OPTIONAL_IN.equals(MEP) ||
+                    WSDLConstants.MEP_URI_IN_OPTIONAL_OUT.equals(MEP) ||
+                    WSDLConstants.MEP_URI_ROBUST_OUT_ONLY.equals(MEP) ||
+                    WSDLConstants.MEP_URI_ROBUST_IN_ONLY.equals(MEP) ||
+                    WSDLConstants.MEP_URI_IN_OUT.equals(MEP)) {
+                AxisMessage outAxisMessage = axisOperation
+                        .getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+                if (outAxisMessage != null) {
+                    OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME, wsdl);
+                    addExtensionElemnet(fac, output, SOAP_BODY, SOAP_USE, use, "namespace",
+                            targetNamespace, soap);
+                    operation.addChild(output);
+                    writeBidingPartExtensibleElements(outAxisMessage, fac, output, soap);
+                }
+            }
+
+            // generate fault Messages
+            ArrayList faultyMessages = axisOperation.getFaultMessages();
+            if (faultyMessages != null) {
+                for (int i = 0; i < faultyMessages.size(); i++) {
+                    AxisMessage faultyMessge = (AxisMessage) faultyMessages.get(i);
+                    OMElement fault = fac.createOMElement(FAULT_LOCAL_NAME, wsdl);
+                    addExtensionElemnet(fac, fault, SOAP_BODY, SOAP_USE, use, "namespace",
+                            targetNamespace, soap);
+                    fault.addAttribute(ATTRIBUTE_NAME, faultyMessge.getName(), null);
+                    operation.addChild(fault);
+                    writeBidingPartExtensibleElements(faultyMessge, fac, fault, soap);
+                }
+            }
+        }
+    }
+
+    /**
+     * Generate the bindings
+     */
+    private void generateSOAP12Binding(OMFactory fac,
+                                       OMElement defintions) throws Exception {
+        OMElement binding = fac.createOMElement(BINDING_LOCAL_NAME, wsdl);
+        defintions.addChild(binding);
+        binding.addAttribute(ATTRIBUTE_NAME, axisService.getName() + SOAP12BINDING_NAME_SUFFIX,
null);
+        binding.addAttribute("type", tns.getPrefix() + ":" + axisService.getName() + PORT_TYPE_SUFFIX,
null);
+
+        //Adding ext elements
+        writeBindingExtensibleElements(fac, binding, soap12);
         addExtensionElemnet(fac, binding, BINDING_LOCAL_NAME,
                 TRANSPORT, TRANSPORT_URI,
-                STYLE, style);
+                STYLE, style, soap12);
 
         Iterator operations = axisService.getOperations();
         while (operations.hasNext()) {
@@ -360,9 +485,9 @@
             }
             addExtensionElemnet(fac, operation, OPERATION_LOCAL_NAME,
                     SOAP_ACTION, soapAction,
-                    STYLE, style);
+                    STYLE, style, soap12);
             //writing ext elements
-            writeOperationExtensibleElements(axisOperation, fac, operation);
+            writeOperationExtensibleElements(axisOperation, fac, operation, soap);
 
             String MEP = axisOperation.getMessageExchangePattern();
 
@@ -378,9 +503,9 @@
                     operation.addAttribute(ATTRIBUTE_NAME, opeartionName, null);
                     OMElement input = fac.createOMElement(IN_PUT_LOCAL_NAME, wsdl);
                     addExtensionElemnet(fac, input, SOAP_BODY, SOAP_USE, use, "namespace",
-                            targetNamespace);
+                            targetNamespace, soap12);
                     operation.addChild(input);
-                    writeBidingPartExtensibleElements(inaxisMessage, fac, input);
+                    writeBidingPartExtensibleElements(inaxisMessage, fac, input, soap12);
                 }
             }
 
@@ -395,9 +520,9 @@
                 if (outAxisMessage != null) {
                     OMElement output = fac.createOMElement(OUT_PUT_LOCAL_NAME, wsdl);
                     addExtensionElemnet(fac, output, SOAP_BODY, SOAP_USE, use, "namespace",
-                            targetNamespace);
+                            targetNamespace, soap12);
                     operation.addChild(output);
-                    writeBidingPartExtensibleElements(outAxisMessage, fac, output);
+                    writeBidingPartExtensibleElements(outAxisMessage, fac, output, soap12);
                 }
             }
 
@@ -408,10 +533,10 @@
                     AxisMessage faultyMessge = (AxisMessage) faultyMessages.get(i);
                     OMElement fault = fac.createOMElement(FAULT_LOCAL_NAME, wsdl);
                     addExtensionElemnet(fac, fault, SOAP_BODY, SOAP_USE, use, "namespace",
-                            targetNamespace);
+                            targetNamespace, soap12);
                     fault.addAttribute(ATTRIBUTE_NAME, faultyMessge.getName(), null);
                     operation.addChild(fault);
-                    writeBidingPartExtensibleElements(faultyMessge, fac, fault);
+                    writeBidingPartExtensibleElements(faultyMessge, fac, fault, soap12);
                 }
             }
         }
@@ -419,7 +544,8 @@
 
     private void writeBidingPartExtensibleElements(AxisMessage inaxisMessage,
                                                    OMFactory fac,
-                                                   OMElement input) throws Exception {
+                                                   OMElement input,
+                                                   OMNamespace soapNameSpace) throws Exception
{
         ArrayList extElementList;
         extElementList = inaxisMessage.getWsdlExtElements();
         if (extElementList != null) {
@@ -432,10 +558,10 @@
                     WSDLExtensibilityElement wsdlextElement =
                             axisExtensiblityElementWrapper.getExtensibilityElement();
                     if (!(wsdlextElement instanceof SOAPBody)) {
-                        writeExtensibilityElement(wsdlextElement, fac, input);
+                        writeExtensibilityElement(wsdlextElement, fac, input, soapNameSpace);
                     }
                     if (wsdlextElement instanceof SOAPHeader) {
-                        writeExtensibilityElement(wsdlextElement, fac, input);
+                        writeExtensibilityElement(wsdlextElement, fac, input, soapNameSpace);
                     }
 
                 }
@@ -443,7 +569,10 @@
         }
     }
 
-    private void writeOperationExtensibleElements(AxisOperation axisOperation, OMFactory
fac, OMElement operation) throws Exception {
+    private void writeOperationExtensibleElements(AxisOperation axisOperation,
+                                                  OMFactory fac,
+                                                  OMElement operation,
+                                                  OMNamespace soapNameSpace) throws Exception
{
         ArrayList extElementList;
         extElementList = axisOperation.getWsdlExtElements();
         if (extElementList != null) {
@@ -454,14 +583,16 @@
                 if (axisExtensiblityElementWrapper.getType() == AxisExtensiblityElementWrapper.PORT_BINDING)
{
                     WSDLExtensibilityElement wsdlextElement = axisExtensiblityElementWrapper.getExtensibilityElement();
                     if (!(wsdlextElement instanceof SOAPOperation)) {
-                        writeExtensibilityElement(wsdlextElement, fac, operation);
+                        writeExtensibilityElement(wsdlextElement, fac, operation, soapNameSpace);
                     }
                 }
             }
         }
     }
 
-    private void writeBindingExtensibleElements(OMFactory fac, OMElement binding) throws
Exception {
+    private void writeBindingExtensibleElements(OMFactory fac,
+                                                OMElement binding,
+                                                OMNamespace soapNameSpace) throws Exception
{
         ArrayList extElementList = axisService.getWsdlExtElements();
         if (extElementList != null) {
             Iterator elements = extElementList.iterator();
@@ -471,7 +602,7 @@
                 if (axisExtensiblityElementWrapper.getType() == AxisExtensiblityElementWrapper.PORT_BINDING)
{
                     WSDLExtensibilityElement wsdlextElement = axisExtensiblityElementWrapper.getExtensibilityElement();
                     if (!(wsdlextElement instanceof SOAPBinding)) {
-                        writeExtensibilityElement(wsdlextElement, fac, binding);
+                        writeExtensibilityElement(wsdlextElement, fac, binding, soapNameSpace);
                     }
                 }
             }
@@ -484,8 +615,9 @@
                                      String att1Name,
                                      String att1Value,
                                      String att2Name,
-                                     String att2Value) {
-        OMElement soapbinding = fac.createOMElement(name, soap);
+                                     String att2Value,
+                                     OMNamespace soapNameSpace) {
+        OMElement soapbinding = fac.createOMElement(name, soapNameSpace);
         element.addChild(soapbinding);
         soapbinding.addAttribute(att1Name, att1Value, null);
         soapbinding.addAttribute(att2Name, att2Value, null);
@@ -495,34 +627,43 @@
                                      OMElement element,
                                      String name,
                                      String att1Name,
-                                     String att1Value) {
-        OMElement extElement = fac.createOMElement(name, soap);
+                                     String att1Value,
+                                     OMNamespace soapNameSpace) {
+        OMElement extElement = fac.createOMElement(name, soapNameSpace);
         element.addChild(extElement);
         extElement.addAttribute(att1Name, att1Value, null);
     }
 
 
-    protected void writeExtensibilityElement(WSDLExtensibilityElement extElement, OMFactory
fac, OMElement element) throws Exception {
+    protected void writeExtensibilityElement(WSDLExtensibilityElement extElement,
+                                             OMFactory fac,
+                                             OMElement element,
+                                             OMNamespace soapNameSpace) throws Exception
{
         if (extElement instanceof SOAPAddress) {
-            addExtensionElemnet(fac, element, SOAP_ADDRESS, LOCATION, ((SOAPAddress) extElement).getLocationURI());
+            addExtensionElemnet(fac, element, SOAP_ADDRESS, LOCATION,
+                    ((SOAPAddress) extElement).getLocationURI(), soapNameSpace);
         } else if (extElement instanceof SOAPBinding) {
             SOAPBinding soapBinding = (SOAPBinding) extElement;
             addExtensionElemnet(fac, element, BINDING_LOCAL_NAME, TRANSPORT,
-                    soapBinding.getTransportURI(), STYLE, soapBinding.getStyle());
+                    soapBinding.getTransportURI(), STYLE, soapBinding.getStyle(),
+                    soapNameSpace);
         } else if (extElement instanceof SOAPHeader) {
             SOAPHeader soapHeader = (SOAPHeader) extElement;
-            addSOAPHeader(fac, element, soapHeader);
+            addSOAPHeader(fac, element, soapHeader, soapNameSpace);
         } else if (extElement instanceof SOAPOperation) {
             SOAPOperation soapop = (SOAPOperation) extElement;
             addExtensionElemnet(fac, element, OPERATION_LOCAL_NAME, SOAP_ACTION,
-                    soapop.getSoapAction(), STYLE, soapop.getStyle());
+                    soapop.getSoapAction(), STYLE, soapop.getStyle(),
+                    soapNameSpace);
         } else if (extElement instanceof SOAPBody) {
             SOAPBody soapBody = (SOAPBody) extElement;
             if (soapBody.getNamespaceURI() != null) {
                 addExtensionElemnet(fac, element, SOAP_BODY, SOAP_USE,
-                        soapBody.getUse(), "namespace", soapBody.getNamespaceURI());
+                        soapBody.getUse(), "namespace", soapBody.getNamespaceURI(),
+                        soapNameSpace);
             } else {
-                addExtensionElemnet(fac, element, SOAP_BODY, SOAP_USE, soapBody.getUse());
+                addExtensionElemnet(fac, element, SOAP_BODY, SOAP_USE, soapBody.getUse(),
+                        soapNameSpace);
             }
         } else if (extElement instanceof PolicyExtensibilityElement) {
             throw new UnsupportedOperationException();
@@ -545,8 +686,9 @@
     }
 
     private void addSOAPHeader(OMFactory fac, OMElement element,
-                               SOAPHeader header) {
-        OMElement extElement = fac.createOMElement("header", soap);
+                               SOAPHeader header,
+                               OMNamespace soapNameSpace) {
+        OMElement extElement = fac.createOMElement("header", soapNameSpace);
         element.addChild(extElement);
         String use = header.getUse();
         if (use != null) {

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java?rev=390960&r1=390959&r2=390960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java
Sun Apr  2 23:02:52 2006
@@ -55,7 +55,7 @@
                     "/axis2/services/EchoXMLService?wsdl");
             ServiceClient serviceClient = new ServiceClient(null, wsdlURL,
                     new QName("http://ws.apache.org/axis2", "EchoXMLService"),
-                    "EchoXMLServiceport0");
+                    "EchoXMLServiceSOAP11port0");
             OMElement payload = TestingUtils.createDummyOMElement();
             OMElement response = serviceClient.sendReceive(
                     new QName("http://org.apache.axis2/xsd", "echoOMElement"), payload);

Modified: webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java?rev=390960&r1=390959&r2=390960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
Sun Apr  2 23:02:52 2006
@@ -87,7 +87,7 @@
         OMElement ele = fac.createOMElement("definitions", wsdl);
         ns1 = ele.declareNamespace(AXIS2_XSD, "ns1");
         ele.declareNamespace(URI_2001_SCHEMA_XSD, DEFAULT_SCHEMA_NAMESPACE_PREFIX);
-        soap = ele.declareNamespace(DEFAULT_SOAP_NAMESPACE, DEFAULT_SOAP_NAMESPACE_PREFIX);
+        soap = ele.declareNamespace(URI_WSDL11_SOAP, SOAP11_PREFIX);
         tns = ele.declareNamespace(DEFAULT_TARGET_NAMESPACE, TARGETNAMESPACE_PREFIX);
         ele.addAttribute("targetNamespace", DEFAULT_TARGET_NAMESPACE, null);
         OMElement wsdlTypes = fac.createOMElement("types", wsdl);

Modified: webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java?rev=390960&r1=390959&r2=390960&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java
(original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java
Sun Apr  2 23:02:52 2006
@@ -20,7 +20,8 @@
 
 public interface Java2WSDLConstants {
 
-    String DEFAULT_SOAP_NAMESPACE_PREFIX = "soap";
+    String SOAP11_PREFIX = "soap";
+    String SOAP12_PREFIX = "soap12";
     String DEFAULT_WSDL_NAMESPACE_PREFIX = "wsdl";
     String DEFAULT_SCHEMA_NAMESPACE_PREFIX = "xs";
     String DEFAULT_TARGET_NAMESPACE_PREFIX = "axis2";
@@ -30,11 +31,13 @@
     String DEFAULT_TARGET_NAMESPACE = "http://ws.apache.org/axis2";
     String WSDL_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/";
     String AXIS2_XSD = "http://org.apache.axis2/xsd";
-    String DEFAULT_SOAP_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/soap/";
+    String URI_WSDL12_SOAP = "http://schemas.xmlsoap.org/wsdl/soap12/";
+    String URI_WSDL11_SOAP = "http://schemas.xmlsoap.org/wsdl/soap/";
     String TRANSPORT_URI = "http://schemas.xmlsoap.org/soap/http";
     String DEFAULT_LOCATION_URL = "http://localhost:8080/axis2/services/";
 
-    String BINDING_NAME_SUFFIX = "Binding";
+    String BINDING_NAME_SUFFIX = "SOAP11Binding";
+    String SOAP12BINDING_NAME_SUFFIX = "SOAP12Binding";
     String PORT_TYPE_SUFFIX = "PortType";
     String PORT_NAME_SUFFIX = "Port";
     String MESSAGE_LOCAL_NAME = "message";
@@ -51,6 +54,8 @@
     String SERVICE_LOCAL_NAME = "service";
     String BINDING_LOCAL_NAME = "binding";
     String PORT = "port";
+    String SOAP12PORT = "SOAP12port";
+    String SOAP11PORT = "SOAP11port";
     String PART_ATTRIBUTE_NAME = "part";
     String ELEMENT_ATTRIBUTE_NAME = "element";
     String FAULT_LOCAL_NAME = "fault";



Mime
View raw message