Return-Path: 
 <axis-cvs-return-15832-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-dev-archive@www.apache.org
Received: (qmail 95035 invoked from network); 8 Jun 2006 13:47:27 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 8 Jun 2006 13:47:27 -0000
Received: (qmail 99214 invoked by uid 500); 8 Jun 2006 13:47:24 -0000
Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org
Received: (qmail 99104 invoked by uid 500); 8 Jun 2006 13:47:24 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
List-Post: <mailto:axis-cvs@ws.apache.org>
List-Id: <axis-cvs.ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 99077 invoked by uid 500); 8 Jun 2006 13:47:24 -0000
Delivered-To: apmail-ws-axis2-cvs@ws.apache.org
Received: (qmail 99049 invoked by uid 99); 8 Jun 2006 13:47:24 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2006 06:47:24 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2006 06:47:23 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 254761A983A; Thu,  8 Jun 2006 06:47:03 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r412753 - in /webservices/axis2/trunk/java/modules:
 adb-codegen/test-resources/wsdl20/ codegen/src/org/apache/axis2/wsdl/i18n/
 core/src/org/apache/axis2/description/
Date: Thu, 08 Jun 2006 13:47:02 -0000
To: axis2-cvs@ws.apache.org
From: chinthaka@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060608134703.254761A983A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: chinthaka
Date: Thu Jun  8 06:47:01 2006
New Revision: 412753

URL: http://svn.apache.org/viewvc?rev=412753&view=rev
Log:
- displaying the wsdl version can be input as a param.
- adding two sample wsdl 2.0 docs for testing purposes. One extracted from the spec itself and the other from Woden repo.

Added:
    webservices/axis2/trunk/java/modules/adb-codegen/test-resources/wsdl20/
    webservices/axis2/trunk/java/modules/adb-codegen/test-resources/wsdl20/GreatH.wsdl
    webservices/axis2/trunk/java/modules/adb-codegen/test-resources/wsdl20/HotelReservationService.wsdl
Modified:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java

Added: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/wsdl20/GreatH.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/wsdl20/GreatH.wsdl?rev=412753&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/wsdl20/GreatH.wsdl (added)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/wsdl20/GreatH.wsdl Thu Jun  8 06:47:01 2006
@@ -0,0 +1,55 @@
+<description xmlns="http://www.w3.org/2005/05/wsdl" targetNamespace="http://greath.example.com/2004/wsdl/resSvc" xmlns:tns="http://greath.example.com/2004/wsdl/resSvc" xmlns:ghns="http://greath.example.com/2004/schemas/resSvc" xmlns:wsoap="http://www.w3.org/2005/05/wsdl/soap" xmlns:soap="http://www.w3.org/2003/05/soap-envelope">
+    <documentation>
+        This document describes the GreatH Web service. Additional
+        application-level requirements for use of this service --
+        beyond what WSDL 2.0 is able to describe -- are available
+        at http://greath.example.com/2004/reservation-documentation.html
+    </documentation>
+    <types>
+        <xs:schema
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                targetNamespace="http://greath.example.com/2004/schemas/resSvc"
+                xmlns="http://greath.example.com/2004/schemas/resSvc">
+            <xs:element name="checkAvailability" type="tCheckAvailability"/>
+            <xs:complexType name="tCheckAvailability">
+                <xs:sequence>
+                    <xs:element name="checkInDate" type="xs:date"/>
+                    <xs:element name="checkOutDate" type="xs:date"/>
+                    <xs:element name="roomType" type="xs:string"/>
+                </xs:sequence>
+            </xs:complexType>
+            <xs:element name="checkAvailabilityResponse" type="xs:double"/>
+            <xs:element name="invalidDataError" type="xs:string"/>
+        </xs:schema>
+    </types>
+    <interface name="reservationInterface">
+        <fault name="invalidDataFault"
+               element="ghns:invalidDataError"/>
+        <operation name="opCheckAvailability"
+                   pattern="http://www.w3.org/2005/05/wsdl/in-out"
+                   style="http://www.w3.org/2005/05/wsdl/style/uri"
+                   safe="true">
+            <input messageLabel="In"
+                   element="ghns:checkAvailability"/>
+            <output messageLabel="Out"
+                    element="ghns:checkAvailabilityResponse"/>
+            <outfault ref="tns:invalidDataFault" messageLabel="Out"/>
+        </operation>
+    </interface>
+    <binding name="reservationSOAPBinding"
+             interface="tns:reservationInterface"
+             type="http://www.w3.org/2005/05/wsdl/soap"
+             wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP">
+        <fault ref="tns:invalidDataFault"
+               wsoap:code="soap:Sender"/>
+        <operation ref="tns:opCheckAvailability"
+                   wsoap:mep="http://www.w3.org/2003/05/soap/mep/soap-response"/>
+    </binding>
+    <service name="reservationService"
+             interface="tns:reservationInterface">
+        <endpoint name="reservationEndpoint"
+                  binding="tns:reservationSOAPBinding"
+                  address="http://greath.example.com/2004/reservation"/>
+    </service>
+</description>
+

Added: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/wsdl20/HotelReservationService.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/wsdl20/HotelReservationService.wsdl?rev=412753&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/wsdl20/HotelReservationService.wsdl (added)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/wsdl20/HotelReservationService.wsdl Thu Jun  8 06:47:01 2006
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<description
+    xmlns="http://www.w3.org/2006/01/wsdl"
+    targetNamespace= "http://greath.example.com/2004/wsdl/resSvc"
+    xmlns:tns= "http://greath.example.com/2004/wsdl/resSvc"
+    xmlns:ghns = "http://greath.example.com/2004/schemas/resSvc"
+    xmlns:wsoap= "http://www.w3.org/2004/08/wsdl/soap12"
+    xmlns:soap="http://www.w3.org/2003/05/soap-envelope">
+
+  <documentation>
+    This document describes the GreatH Web service.  Additional
+    application-level requirements for use of this service --
+    beyond what WSDL 2.0 is able to describe -- are available
+    at http://greath.example.com/2004/reservation-documentation.html
+  </documentation>
+
+  <types>
+    <xs:schema
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        targetNamespace="http://greath.example.com/2004/schemas/resSvc"
+        xmlns="http://greath.example.com/2004/schemas/resSvc">
+
+      <xs:element name="checkAvailability" type="tCheckAvailability"/>
+      <xs:complexType name="tCheckAvailability">
+        <xs:sequence>
+          <xs:element  name="checkInDate" type="xs:date"/>
+          <xs:element  name="checkOutDate" type="xs:date"/>
+          <xs:element  name="roomType" type="xs:string"/>
+        </xs:sequence>
+      </xs:complexType>
+
+      <xs:element name="checkAvailabilityResponse" type="xs:double"/>
+
+      <xs:element name="invalidDataError" type="xs:string"/>
+
+    </xs:schema>
+  </types>
+
+  <interface  name = "reservationInterface" >
+
+    <fault name = "invalidDataFault"
+            element = "ghns:invalidDataError"/>
+
+    <operation name="opCheckAvailability"
+            pattern="http://www.w3.org/2004/03/wsdl/in-out" >
+        <input messageLabel="In"
+              element="ghns:checkAvailability" />
+        <output messageLabel="Out"
+              element="ghns:checkAvailabilityResponse" />
+        <outfault ref="tns:invalidDataFault" messageLabel="Out"/>
+    </operation>
+
+  </interface>
+
+  <binding name="reservationSOAPBinding"
+	  interface="tns:reservationInterface"
+	  type="http://www.w3.org/2004/08/wsdl/soap12"
+	  wsoap:protocol="http://www.w3.org/2003/05/soap/bindings/HTTP">
+
+    <operation ref="tns:opCheckAvailability"
+      wsoap:mep="http://www.w3.org/2003/05/soap/mep/request-response"/>
+
+    <fault ref="tns:invalidDataFault"
+      wsoap:code="soap:Sender"/>
+
+  </binding>
+
+  <service name="reservationService"
+       interface="tns:reservationInterface">
+
+     <endpoint name="reservationEndpoint"
+               binding="tns:reservationSOAPBinding"
+               address ="http://greath.example.com/2004/reservation"/>
+
+  </service>
+
+</description>
\ No newline at end of file

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties?rev=412753&r1=412752&r2=412753&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties Thu Jun  8 06:47:01 2006
@@ -31,6 +31,7 @@
 wsdl2code.arg15=\t  -r <path>                Specify a repository against which code is generated.
 wsdl2code.arg16=\t  -ns2p ns1=pkg1,ns2=pkg2  Specify a custom package name for each namespace specified in the wsdl's schema.
 wsdl2code.arg17=\t  -ssi                     Generate an interface for the service implementation (Default: off).
+wsdl2code.arg18=\t  -wv                      WSDL Version. Valid Options : 2, 2.0, 1.1
 
 ################## prop file loader #################################
 propfileload.frameworkMismatch=Number of frameworks and extension names do not match!

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java?rev=412753&r1=412752&r2=412753&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java Thu Jun  8 06:47:01 2006
@@ -116,10 +116,10 @@
 
             // Setting wsdl4jdefintion to axisService , so if some one want
             // to play with it he can do that by getting the parameter
-            Parameter wsdldefintionParamter = new Parameter();
-            wsdldefintionParamter.setName(WSDLConstants.WSDL_20_DESCRIPTION);
-            wsdldefintionParamter.setValue(description);
-            axisService.addParameter(wsdldefintionParamter);
+            Parameter wsdlDescriptionParamter = new Parameter();
+            wsdlDescriptionParamter.setName(WSDLConstants.WSDL_20_DESCRIPTION);
+            wsdlDescriptionParamter.setValue(description);
+            axisService.addParameter(wsdlDescriptionParamter);
 
             if (description == null) {
                 return null;



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org