Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 63591 invoked from network); 23 Nov 2005 10:16:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Nov 2005 10:16:52 -0000 Received: (qmail 18592 invoked by uid 500); 23 Nov 2005 10:16:48 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 18507 invoked by uid 500); 23 Nov 2005 10:16:47 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 18467 invoked by uid 99); 23 Nov 2005 10:16:47 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 23 Nov 2005 02:16:47 -0800 Received: (qmail 63311 invoked by uid 65534); 23 Nov 2005 10:16:26 -0000 Message-ID: <20051123101626.63310.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r348406 - in /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl: symbolTable/CElementDecl.java symbolTable/CSchemaUtils.java wsdl2ws/ParamWriter.java wsdl2ws/WSDL2Ws.java wsdl2ws/info/AttributeInfo.java wsdl2ws/info/ElementInfo.java Date: Wed, 23 Nov 2005 10:16:24 -0000 To: axis-cvs@ws.apache.org From: dushshantha@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: dushshantha Date: Wed Nov 23 02:16:03 2005 New Revision: 348406 URL: http://svn.apache.org/viewcvs?rev=348406&view=rev Log: Added a new field to ElementInfo.java, AttributeInfo.java and CElementDecl.java to state whether the element is namespace qualified. Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CElementDecl.java webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CSchemaUtils.java webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/AttributeInfo.java webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ElementInfo.java Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CElementDecl.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CElementDecl.java?rev=348406&r1=348405&r2=348406&view=diff ============================================================================== --- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CElementDecl.java (original) +++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CElementDecl.java Wed Nov 23 02:16:03 2005 @@ -58,6 +58,12 @@ private boolean allElement = false; //04/05/2005 + //Dushshantha: + //This field is set to true if the element is elementFormDefault qualified. + //This specifies whether the element must be namespace qualified or not in the SOAP message. + private boolean nsQualified = false; + + /** Field documentation */ private String documentation; @@ -136,6 +142,19 @@ this.allElement = allElement; } //04/05/2005 + + /** + * Dushshantha: + * Getter and setter for the field nsQualified + */ + public boolean getNsQualified(){ + return nsQualified; + } + + public void setNsQualified(boolean nsQual){ + nsQualified = nsQual; + } + /** * @return Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CSchemaUtils.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CSchemaUtils.java?rev=348406&r1=348405&r2=348406&view=diff ============================================================================== --- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CSchemaUtils.java (original) +++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/symbolTable/CSchemaUtils.java Wed Nov 23 02:16:03 2005 @@ -869,7 +869,13 @@ // used to retrieve the proper java name of the type. QName nodeType = Utils.getTypeQName(elementNode, forElement, false); TypeEntry type = symbolTable.getTypeEntry(nodeType, forElement.value); - + + //Dushshantha: + //The boolean field 'qualified' is set to true + //if the element is namespace qualified. + //The default value is unqualified. + boolean qualified = false; + // An element inside a complex type is either qualified or unqualified. // If the ref= attribute is used, the name of the ref'd element is used // (which must be a root element). If the ref= attribute is not @@ -880,13 +886,21 @@ // check the Form (or elementFormDefault) attribute of this node to // determine if it should be namespace quailfied or not. String form = Utils.getAttribute(elementNode, "form"); - + if ((form != null) && form.equals("unqualified")) { // Unqualified nodeName nodeName = Utils.findQName("", nodeName.getLocalPart()); } + else if ((form != null) && form.equals("qualified")){ + /** + * Dushshantha: + * qualified nodename + */ + qualified = true; + nodeName = Utils.findQName("", nodeName.getLocalPart()); + } else if (form == null) { @@ -903,6 +917,16 @@ // Unqualified nodeName nodeName = Utils.findQName("", nodeName.getLocalPart()); } + else if ((def == null) || def.equals("qualified")){ + + /** + * Dushshantha: + * qualified nodename + */ + qualified = true; + nodeName = Utils.findQName("", nodeName.getLocalPart()); + } + } } @@ -939,6 +963,8 @@ if (nillable != null && "true".equals(nillable)) elem.setNillable(true); + elem.setNsQualified(qualified); + return elem; /*elem.setNillable( Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java?rev=348406&r1=348405&r2=348406&view=diff ============================================================================== --- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java (original) +++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/ParamWriter.java Wed Nov 23 02:16:03 2005 @@ -184,6 +184,11 @@ //setting the all element availability. this.attribs[i].setAllElement(elem.getAllElement()); //04/05/2005.................................................. + + //Dushshantha: + //states whether the atribute is namespace qualified + this.attribs[i].setNsQualified(elem.getNsQualified()); + //setting the minoccures this.attribs[i].setMinOccurs(elem.getMinOccurs()); //12/05/2005.................................................. Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java?rev=348406&r1=348405&r2=348406&view=diff ============================================================================== --- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java (original) +++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/WSDL2Ws.java Wed Nov 23 02:16:03 2005 @@ -1030,6 +1030,11 @@ eleinfo.setAllElement(elem.getAllElement()); //04/05/2005................................................. + //Dushshantha: + //states whether the element must be namespace qualified. + eleinfo.setNsQualified(elem.getNsQualified()); + + typedata.setTypeNameForElementName(eleinfo); } } Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/AttributeInfo.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/AttributeInfo.java?rev=348406&r1=348405&r2=348406&view=diff ============================================================================== --- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/AttributeInfo.java (original) +++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/AttributeInfo.java Wed Nov 23 02:16:03 2005 @@ -49,6 +49,11 @@ private boolean allElement = false; //04/05/2005............................................... + // Dushshantha: + //This field is set to true if the element is elementFormDefault qualified. + //This specifies whether the element must be namespace qualified or not in the SOAP message. + private boolean nsQualified = false; + /** * @param type * @param attribName @@ -197,6 +202,21 @@ } //04/05/2005................................................. //Chinthana: Changes to do modification for handle Min and Max occures + + /** + * Dushshantha: + * Getter and setter for the field nsQualified + */ + public boolean getNsQualified(){ + return nsQualified; + } + + public void setNsQualified(boolean nsQual){ + nsQualified = nsQual; + } + + + /** * @return int */ Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ElementInfo.java URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ElementInfo.java?rev=348406&r1=348405&r2=348406&view=diff ============================================================================== --- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ElementInfo.java (original) +++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ElementInfo.java Wed Nov 23 02:16:03 2005 @@ -41,6 +41,13 @@ private boolean allElement = false; //............................................ + + // Dushshantha: + //This field is set to true if the element is elementFormDefault qualified. + //This specifies whether the element must be namespace qualified or not in the SOAP message. + private boolean nsQualified = false; + + public ElementInfo(QName name, Type type) { this.name = name; @@ -181,6 +188,20 @@ this.allElement = newAllElement; } //04/05/2005................................................. + + + /** + * Dushshantha: + * Getter and setter for the field nsQualified + */ + public boolean getNsQualified(){ + return nsQualified; + } + + public void setNsQualified(boolean nsQual){ + nsQualified = nsQual; + } + }