axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject svn commit: r392263 [2/2] - in /webservices/axis2/trunk/java/modules: adb/src/org/apache/axis2/databinding/utils/ codegen/src/org/apache/axis2/util/ codegen/src/org/apache/axis2/wsdl/codegen/ codegen/src/org/apache/axis2/wsdl/codegen/emitter/ codegen/s...
Date Fri, 07 Apr 2006 12:38:47 GMT
Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDL2JavaTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDL2JavaTest.java?rev=392263&r1=392262&r2=392263&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDL2JavaTest.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDL2JavaTest.java
Fri Apr  7 05:38:41 2006
@@ -98,19 +98,23 @@
         try {
             generateAndCompile("wsat.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
         } catch (CodeGenerationException e) {
+            e.printStackTrace();
             fail("Exception while code generation test!"+ e.getMessage());
         }
     }
 
     /**
      * Test for the WSDL that's missing a service
+     * Since we do noit permit the clients to be generated when
+     * service is missing, we should get an error
      */
     public void testCodeGenerationNoService(){
 
         try {
             generateAndCompile("no-service.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
+            fail("Undesired behavior while code generating!");
         } catch (CodeGenerationException e) {
-            fail("Exception while code generation test!"+ e.getMessage());
+            //done - we are good if we reach here
         }
     }
 
@@ -151,16 +155,16 @@
         }
     }
 
-    /**
-     * Test for the sales rank and price!
-     */
-    public void testCodeGenerationSalesRankNPrice(){
-        try {
-            generateAndCompile("SalesRankNPrice.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
-        } catch (CodeGenerationException e) {
-            fail("Exception while code generation test!"+ e.getMessage());
-        }
-    }
+//    /**
+//     * Test for the sales rank and price!
+//     */
+//    public void testCodeGenerationSalesRankNPrice(){
+//        try {
+//            generateAndCompile("SalesRankNPrice.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
+//        } catch (CodeGenerationException e) {
+//            fail("Exception while code generation test!"+ e.getMessage());
+//        }
+//    }
 
      /**
      * Test for the mime doc
@@ -211,15 +215,18 @@
 //    }
 
     /**
-     * Test for the modified ping-unboond wsdl. The binding is removed in this wsdl
+     * Test for the modified ping-unboond wsdl.
+     * The binding is removed in this wsdl.Codegen should fail for this
+     * WSDL by saying
      *
      */
     public void testCodeGenerationPingUnbound(){
 
         try {
             generateAndCompile("ping-unbound.wsdl", OUTPUT_LOCATION_BASE+OUTPUT_LOCATION_PREFIX+folderCount++);
+            fail("Undesired behavior while code generating!");
         } catch (CodeGenerationException e) {
-            fail("Exception while code generation test!"+ e.getMessage());
+           //we are good
         }
     }
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java?rev=392263&r1=392262&r2=392263&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java
Fri Apr  7 05:38:41 2006
@@ -18,7 +18,24 @@
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
-import javax.wsdl.*;
+import javax.wsdl.Binding;
+import javax.wsdl.BindingInput;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.BindingOutput;
+import javax.wsdl.Definition;
+import javax.wsdl.Fault;
+import javax.wsdl.Import;
+import javax.wsdl.Input;
+import javax.wsdl.Message;
+import javax.wsdl.Operation;
+import javax.wsdl.OperationType;
+import javax.wsdl.Output;
+import javax.wsdl.Part;
+import javax.wsdl.Port;
+import javax.wsdl.PortType;
+import javax.wsdl.Service;
+import javax.wsdl.Types;
+import javax.wsdl.WSDLException;
 import javax.wsdl.extensions.ExtensibilityElement;
 import javax.wsdl.extensions.UnknownExtensibilityElement;
 import javax.wsdl.extensions.schema.Schema;
@@ -35,7 +52,14 @@
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import java.util.Vector;
 
 /*
  * Copyright 2004,2005 The Apache Software Foundation.
@@ -98,9 +122,9 @@
     private QName serviceName;
 
     private String portName;
-    
 
-    private boolean isServreSideService = true;
+
+    private boolean isServerSide = true;
     private static final String BINDING = "Binding";
     private static final String SERVICE = "Service";
     private static final String PORT = "Port";
@@ -113,6 +137,10 @@
     private static final String BINDING_OPERATION_INPUT = "Binding.Operation.Input";
     private static final String BINDING_OPERATION_OUTPUT = "Binding.Operation.Output";
 
+    private Definition wsdl4jDefinition = null;
+
+    private String style = null;
+
     public WSDL2AxisServiceBuilder(InputStream in, QName serviceName,
                                    String portName) {
         this.in = in;
@@ -121,6 +149,14 @@
         this.axisService = new AxisService();
     }
 
+    public WSDL2AxisServiceBuilder(Definition def, QName serviceName,
+                                   String portName) {
+        this.wsdl4jDefinition = def;
+        this.serviceName = serviceName;
+        this.portName = portName;
+        this.axisService = new AxisService();
+    }
+
     public WSDL2AxisServiceBuilder(InputStream in, AxisService service) {
         this(in);
         this.axisService = service;
@@ -130,35 +166,38 @@
         this(in, null, null);
     }
 
-    public boolean isServreSideService() {
-        return isServreSideService;
+    public boolean isServerSide() {
+        return isServerSide;
     }
 
-    public void setServreSideService(boolean servreSideService) {
-        isServreSideService = servreSideService;
+    public void setServerSide(boolean serverSide) {
+        isServerSide = serverSide;
     }
 
     public AxisService populateService() throws AxisFault {
         try {
-            Definition dif = readInTheWSDLFile(in);
-            if (dif == null) {
+            if (wsdl4jDefinition == null) {
+                wsdl4jDefinition = readInTheWSDLFile(in);
+            }
+
+            if (wsdl4jDefinition == null) {
                 return null;
             }
             //setting target name space
-            axisService.setTargetNamespace(dif.getTargetNamespace());
+            axisService.setTargetNamespace(wsdl4jDefinition.getTargetNamespace());
             //adding ns in the original WSDL
-            axisService.setNameSpacesMap(dif.getNamespaces());
+            axisService.setNameSpacesMap(wsdl4jDefinition.getNamespaces());
             //scheam generation
-            processImports(dif);
-            Types wsdl4jTypes = dif.getTypes();
+            processImports(wsdl4jDefinition);
+            Types wsdl4jTypes = wsdl4jDefinition.getTypes();
             if (null != wsdl4jTypes) {
                 this.copyExtensibleElements(wsdl4jTypes
-                        .getExtensibilityElements(), dif, axisService, TYPES);
+                        .getExtensibilityElements(), wsdl4jDefinition, axisService, TYPES);
             }
-            Binding binding = findBinding(dif);
+            Binding binding = findBinding(wsdl4jDefinition);
             //////////////////(1.2) /////////////////////////////
             // create new Schema extensions element for wrapping
-            Element[] schemaElements = generateWrapperSchema(dif, binding);
+            Element[] schemaElements = generateWrapperSchema(wsdl4jDefinition, binding);
             if (schemaElements != null && schemaElements.length > 0) {
                 for (int i = 0; i < schemaElements.length; i++) {
                     Element schemaElement = schemaElements[i];
@@ -174,7 +213,7 @@
                     }
                 }
             }
-            processBinding(binding, dif);
+            processBinding(binding, wsdl4jDefinition);
             return axisService;
         } catch (WSDLException e) {
             throw new AxisFault(e);
@@ -227,8 +266,9 @@
     private void processBinding(Binding binding, Definition dif)
             throws AxisFault {
         if (binding != null) {
+            copyExtensibleElements(binding.getExtensibilityElements(), wsdl4jDefinition,
+                    axisService,BINDING);
             PortType portType = binding.getPortType();
-
             processPortType(portType, dif);
 
             List list = binding.getBindingOperations();
@@ -325,6 +365,9 @@
                     .getOperationDescription(MEP);
             axisOperation.setName(opName);
         }
+        if (style != null) {
+            axisOperation.setStyle(style);
+        }
         copyExtensibleElements(wsdl4jOperation.getExtensibilityElements(), dif,
                 axisOperation, PORT_TYPE_OPERATION);
 
@@ -874,7 +917,10 @@
                     Element element = unknown.getElement();
                     if (description instanceof AxisOperation) {
                         AxisOperation axisOperation = (AxisOperation) description;
-                        axisOperation.setStyle(element.getAttribute("style"));
+                        String style = element.getAttribute("style");
+                        if (style != null) {
+                            axisOperation.setStyle(style);
+                        }
                         axisOperation.setSoapAction(element.getAttribute("soapAction"));
                     }
                 } else if (ExtensionConstants.SOAP_12_HEADER.equals(unknown
@@ -882,6 +928,7 @@
                     //TODO : implement thid
                 } else if (ExtensionConstants.SOAP_12_BINDING.equals(unknown
                         .getElementType())) {
+                    style = unknown.getElement().getAttribute("style");
                     axisService.setSoapNsUri(wsdl4jElement.getElementType().getNamespaceURI());
                 } else if (ExtensionConstants.SOAP_12_ADDRESS.equals(unknown
                         .getElementType())) {
@@ -941,7 +988,9 @@
                 SOAPOperation soapOperation = (SOAPOperation) wsdl4jElement;
                 if (description instanceof AxisOperation) {
                     AxisOperation axisOperation = (AxisOperation) description;
-                    axisOperation.setStyle(soapOperation.getStyle());
+                    if (soapOperation.getStyle() != null) {
+                        axisOperation.setStyle(soapOperation.getStyle());
+                    }
                     axisOperation.setSoapAction(soapOperation.getSoapActionURI());
                 }
             } else if (SOAPConstants.Q_ELEM_SOAP_HEADER.equals(wsdl4jElement
@@ -975,6 +1024,7 @@
             } else if (SOAPConstants.Q_ELEM_SOAP_BINDING.equals(wsdl4jElement
                     .getElementType())) {
                 SOAPBinding soapBinding = (SOAPBinding) wsdl4jElement;
+                style = soapBinding.getStyle();
                 axisService.setSoapNsUri(soapBinding.getElementType().getNamespaceURI());
             }
         }
@@ -1173,7 +1223,7 @@
 
     private String getMEP(Operation operation) {
         OperationType operationType = operation.getStyle();
-        if (isServreSideService) {
+        if (isServerSide) {
             if (null != operationType) {
                 if (operationType.equals(OperationType.REQUEST_RESPONSE))
                     return WSDLConstants.MEP_URI_IN_OUT;
@@ -1237,4 +1287,4 @@
 
 //    }
     }
-}
\ No newline at end of file
+}

Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=392263&r1=392262&r2=392263&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Fri Apr  7 05:38:41 2006
@@ -31,7 +31,7 @@
             <classpath refid="maven.dependency.classpath"/>
             <arg line="-d xmlbeans -p samples.wsdl.perf -o target/perf -s -t -ss -sd -g
-uri test/samples/wsdl/perf/perf.wsdl"/>
         </java>
-        <ant:copy overwrite="yes" todir="target/perf/test/samples/perf">
+        <ant:copy overwrite="yes" todir="target/perf/src/samples/wsdl/perf">
             <ant:fileset dir="test/samples/wsdl/perf">
                 <ant:include name="*Skeleton.java"/>
             </ant:fileset>
@@ -40,15 +40,23 @@
                  target="make.repo"/>
         <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf"
                  target="jar.client"/>
-        <ant:path id="samples.wsdl.perf.client.jar"
+         <ant:move file="target/perf/build/lib/PerfPortType-test-client.jar" 
+              tofile="target/perf/build/lib/PerfSoapService-test-client.jar" />
+              
+          <ant:move file="target/perf/build/lib/PerfPortType.aar" 
+              tofile="target/perf/build/lib/PerfSoapService.aar" />
+              
+         <ant:path id="samples.wsdl.perf.client.jar"
                   location="target/perf/build/lib/PerfSoapService-test-client.jar"/>
+        
         <maven:addPath id="maven.dependency.classpath" refid="samples.wsdl.perf.client.jar"/>
-
+        <!-- $$$$$$$$$$$$$$$$$$$$$$$$$$$ -->
+		<ant:echo>${maven.dependency.classpath}</ant:echo>
         <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
             <classpath refid="maven.dependency.classpath"/>
             <arg line="-d adb -p samples.wsdl.perf2 -o target/perf2 -s -t -ss -sd -g -uri
test/samples/wsdl/perf2/perf.wsdl"/>
         </java>
-        <ant:copy overwrite="yes" todir="target/perf2/test/samples/perf2">
+        <ant:copy overwrite="yes" todir="target/perf2/src/samples/wsdl/perf2">
             <ant:fileset dir="test/samples/wsdl/perf2">
                 <ant:include name="*Skeleton.java"/>
             </ant:fileset>
@@ -57,6 +65,8 @@
                  target="make.repo"/>
         <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf2"
                  target="jar.client"/>
+        <ant:move file="target/perf2/build/lib/PerfPortType-test-client.jar" 
+                tofile="target/perf2/build/lib/PerfSoapService2-test-client.jar" />
         <ant:path id="samples.wsdl.perf2.client.jar"
                   location="target/perf2/build/lib/PerfSoapService2-test-client.jar"/>
         <maven:addPath id="maven.dependency.classpath" refid="samples.wsdl.perf2.client.jar"/>

Modified: webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeSkeleton.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeSkeleton.java?rev=392263&r1=392262&r2=392263&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeSkeleton.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeSkeleton.java
Fri Apr  7 05:38:41 2006
@@ -13,10 +13,10 @@
      *
      * @param param0
      */
-    public OutputElementDocument handleStringArray(
-        InputElementDocument param0) {
+    public samples.wsdl.perf.OutputElementDocument handleStringArray(
+        samples.wsdl.perf.InputElementDocument param0) {
 
-        OutputElementDocument output = OutputElementDocument.Factory.newInstance();
+        samples.wsdl.perf.OutputElementDocument output = samples.wsdl.perf.OutputElementDocument.Factory.newInstance();
         output.setOutputElement("The Array length is - " + param0.getInputElement().getItemArray().length);
         return output;
     } 

Modified: webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeTest.java?rev=392263&r1=392262&r2=392263&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeTest.java
Fri Apr  7 05:38:41 2006
@@ -31,7 +31,7 @@
 
     private String targetEpr = "http://127.0.0.1:" +
             UtilServer.TESTING_PORT +
-            "/axis2/services/PerfSoapService";
+            "/axis2/services/PerfPortType";
 
     public PerfPortTypeTest() {
         super();

Modified: webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/perf.wsdl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/perf.wsdl?rev=392263&r1=392262&r2=392263&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/perf.wsdl (original)
+++ webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/perf.wsdl Fri
Apr  7 05:38:41 2006
@@ -36,7 +36,7 @@
 			</wsdl:output>
 		</wsdl:operation>
 	</wsdl:binding>
-	<wsdl:service name="PerfSoapService">
+	<wsdl:service name="PerfPortType">
 		<wsdl:port name="Performance" binding="impl:PerformanceSoapBinding">
 			<wsdlsoap:address location="http://localhost:8080/axis2/services/PerfPortType"/>
 		</wsdl:port>

Modified: webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf2/perf.wsdl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf2/perf.wsdl?rev=392263&r1=392262&r2=392263&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf2/perf.wsdl (original)
+++ webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf2/perf.wsdl Fri
Apr  7 05:38:41 2006
@@ -36,7 +36,7 @@
 			</wsdl:output>
 		</wsdl:operation>
 	</wsdl:binding>
-	<wsdl:service name="PerfSoapService2">
+	<wsdl:service name="PerfPortType">
 		<wsdl:port name="Performance" binding="impl:PerformanceSoapBinding">
 			<wsdlsoap:address location="http://localhost:8080/axis2/services/PerfPortType"/>
 		</wsdl:port>

Modified: webservices/axis2/trunk/java/modules/security/interop/ping.wsdl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/interop/ping.wsdl?rev=392263&r1=392262&r2=392263&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/interop/ping.wsdl (original)
+++ webservices/axis2/trunk/java/modules/security/interop/ping.wsdl Fri Apr  7 05:38:41 2006
@@ -1,99 +1,99 @@
-<definitions xmlns:s1="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-             xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-             xmlns:s="http://www.w3.org/2001/XMLSchema"
-             xmlns:tns="http://xmlsoap.org/Ping"
-             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-             xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/"
-             xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-             targetNamespace="http://xmlsoap.org/Ping"
-             xmlns="http://schemas.xmlsoap.org/wsdl/">
-    <types>
-        <s:schema elementFormDefault="qualified" targetNamespace="http://xmlsoap.org/Ping">
-            <s:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
-            <s:element name="Ping" nillable="true" type="tns:ping"/>
-            <s:complexType name="ping">
-                <s:sequence>
-                    <s:element minOccurs="0" maxOccurs="1" name="ticket" type="tns:ticketType"/>
-                    <s:element minOccurs="1" maxOccurs="1" name="text" nillable="true"
type="s:string"/>
-                </s:sequence>
-            </s:complexType>
-            <s:complexType name="ticketType">
-                <s:simpleContent>
-                    <s:extension base="s:string">
-                        <s:attribute ref="s1:Id"/>
-                    </s:extension>
-                </s:simpleContent>
-            </s:complexType>
-            <s:element name="PingResponse" nillable="true" type="tns:pingResponse"/>
-            <s:complexType name="pingResponse">
-                <s:sequence>
-                    <s:element minOccurs="1" maxOccurs="1" name="text" nillable="true"
type="s:string"/>
-                </s:sequence>
-            </s:complexType>
-        </s:schema>
-        <s:schema elementFormDefault="qualified" targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
-            <s:attribute name="Id" type="s:string"/>
-        </s:schema>
-    </types>
-    <message name="PingRequest">
-        <part name="ping" element="tns:Ping"/>
-    </message>
-    <message name="PingResponse">
-        <part name="pingResponse" element="tns:PingResponse"/>
-    </message>
-    <portType name="PingPort">
-        <operation name="Ping">
-            <input message="tns:PingRequest"/>
-            <output message="tns:PingResponse"/>
-        </operation>
-    </portType>
-    <binding name="PingBinding" type="tns:PingPort">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="Ping">
-            <soap:operation soapAction="urn:Ping" style="document"/>
-            <input>
-                <soap:body use="literal"/>
-            </input>
-            <output>
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-    </binding>
-    <service name="PingService">
-        <port name="Ping1" binding="tns:PingBinding">
-            <soap:address location="http://localhost:9080/pingservice/Ping1"/>
-        </port>
-        <port name="Ping2" binding="tns:PingBinding">
-            <soap:address location="http://localhost:9080/pingservice/Ping2"/>
-        </port>
-        <port name="Ping2a" binding="tns:PingBinding">
-            <soap:address location="http://localhost:9080/pingservice/Ping2a"/>
-        </port>
-        <port name="Ping3" binding="tns:PingBinding">
-            <soap:address location="http://localhost:9080/pingservice/Ping3"/>
-        </port>
-        <port name="Ping4" binding="tns:PingBinding">
-            <soap:address location="http://localhost:9080/pingservice/Ping4"/>
-        </port>
-        <port name="Ping5" binding="tns:PingBinding">
-            <soap:address location="http://localhost:9080/pingservice/Ping5"/>
-        </port>
-        <port name="Ping6" binding="tns:PingBinding">
-            <soap:address location="http://localhost:9080/pingservice/Ping6"/>
-        </port>
-        <port name="Ping7" binding="tns:PingBinding">
-            <soap:address location="http://localhost:9080/pingservice/Ping7"/>
-        </port>
-        <port name="STPing1" binding="tns:PingBinding">
-            <soap:address location="http://localhost:9080/pingservice/STPing1"/>
-        </port>
-        <port name="STPing3" binding="tns:PingBinding">
-            <soap:address location="http://localhost:9080/pingservice/STPing3"/>
-        </port>
-        <port name="STPing4" binding="tns:PingBinding">
-            <soap:address location="http://localhost:9080/pingservice/STPing4"/>
-        </port>
-        
-    </service>
-</definitions>
+<definitions xmlns:s1="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+             xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+             xmlns:s="http://www.w3.org/2001/XMLSchema"
+             xmlns:tns="http://xmlsoap.org/Ping"
+             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+             xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/"
+             xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+             targetNamespace="http://xmlsoap.org/Ping"
+             xmlns="http://schemas.xmlsoap.org/wsdl/">
+    <types>
+        <s:schema elementFormDefault="qualified" targetNamespace="http://xmlsoap.org/Ping">
+            <s:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
+            <s:element name="Ping" nillable="true" type="tns:ping"/>
+            <s:complexType name="ping">
+                <s:sequence>
+                    <s:element minOccurs="0" maxOccurs="1" name="ticket" type="tns:ticketType"/>
+                    <s:element minOccurs="1" maxOccurs="1" name="text" nillable="true"
type="s:string"/>
+                </s:sequence>
+            </s:complexType>
+            <s:complexType name="ticketType">
+                <s:simpleContent>
+                    <s:extension base="s:string">
+                        <s:attribute ref="s1:Id"/>
+                    </s:extension>
+                </s:simpleContent>
+            </s:complexType>
+            <s:element name="PingResponse" nillable="true" type="tns:pingResponse"/>
+            <s:complexType name="pingResponse">
+                <s:sequence>
+                    <s:element minOccurs="1" maxOccurs="1" name="text" nillable="true"
type="s:string"/>
+                </s:sequence>
+            </s:complexType>
+        </s:schema>
+        <s:schema elementFormDefault="qualified" targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+            <s:attribute name="Id" type="s:string"/>
+        </s:schema>
+    </types>
+    <message name="PingRequest">
+        <part name="ping" element="tns:Ping"/>
+    </message>
+    <message name="PingResponse">
+        <part name="pingResponse" element="tns:PingResponse"/>
+    </message>
+    <portType name="PingPort">
+        <operation name="Ping">
+            <input message="tns:PingRequest"/>
+            <output message="tns:PingResponse"/>
+        </operation>
+    </portType>
+    <binding name="PingBinding" type="tns:PingPort">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="Ping">
+            <soap:operation soapAction="urn:Ping" style="document"/>
+            <input>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+    </binding>
+    <service name="PingPort">
+        <port name="Ping1" binding="tns:PingBinding">
+            <soap:address location="http://localhost:9080/pingservice/Ping1"/>
+        </port>
+        <port name="Ping2" binding="tns:PingBinding">
+            <soap:address location="http://localhost:9080/pingservice/Ping2"/>
+        </port>
+        <port name="Ping2a" binding="tns:PingBinding">
+            <soap:address location="http://localhost:9080/pingservice/Ping2a"/>
+        </port>
+        <port name="Ping3" binding="tns:PingBinding">
+            <soap:address location="http://localhost:9080/pingservice/Ping3"/>
+        </port>
+        <port name="Ping4" binding="tns:PingBinding">
+            <soap:address location="http://localhost:9080/pingservice/Ping4"/>
+        </port>
+        <port name="Ping5" binding="tns:PingBinding">
+            <soap:address location="http://localhost:9080/pingservice/Ping5"/>
+        </port>
+        <port name="Ping6" binding="tns:PingBinding">
+            <soap:address location="http://localhost:9080/pingservice/Ping6"/>
+        </port>
+        <port name="Ping7" binding="tns:PingBinding">
+            <soap:address location="http://localhost:9080/pingservice/Ping7"/>
+        </port>
+        <port name="STPing1" binding="tns:PingBinding">
+            <soap:address location="http://localhost:9080/pingservice/STPing1"/>
+        </port>
+        <port name="STPing3" binding="tns:PingBinding">
+            <soap:address location="http://localhost:9080/pingservice/STPing3"/>
+        </port>
+        <port name="STPing4" binding="tns:PingBinding">
+            <soap:address location="http://localhost:9080/pingservice/STPing4"/>
+        </port>
+        
+    </service>
+</definitions>

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLService.java?rev=392263&r1=392262&r2=392263&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLService.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/wsdl/WSDLService.java Fri Apr
 7 05:38:41 2006
@@ -21,7 +21,7 @@
 
 public interface WSDLService extends Component {
     public static final String STYLE_RPC = "rpc";
-    public static final String STYLE_DOC = "doc";
+    public static final String STYLE_DOC = "document";
     public static final String STYLE_MSG = "msg";
 
     /**



Mime
View raw message