Return-Path: Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org Received: (qmail 86569 invoked from network); 17 Mar 2005 14:43:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 17 Mar 2005 14:43:52 -0000 Received: (qmail 7184 invoked by uid 500); 17 Mar 2005 14:43:50 -0000 Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org Received: (qmail 7130 invoked by uid 500); 17 Mar 2005 14:43:50 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 7116 invoked by uid 99); 17 Mar 2005 14:43:50 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 17 Mar 2005 06:43:49 -0800 Received: (qmail 86515 invoked by uid 1852); 17 Mar 2005 14:43:48 -0000 Date: 17 Mar 2005 14:43:48 -0000 Message-ID: <20050317144348.86513.qmail@minotaur.apache.org> From: samisa@apache.org To: ws-axis-cvs@apache.org Subject: cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info ParameterInfo.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N samisa 2005/03/17 06:43:48 Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal BeanParamWriter.java c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info ParameterInfo.java Log: Fixed SOAP tag name problems in case of simple arrays. AXISCPP-510 Revision Changes Path 1.59 +2 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java Index: BeanParamWriter.java =================================================================== RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/BeanParamWriter.java,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- BeanParamWriter.java 16 Mar 2005 03:03:34 -0000 1.58 +++ BeanParamWriter.java 17 Mar 2005 14:43:48 -0000 1.59 @@ -180,7 +180,7 @@ if (attribs[i].isSimpleType()){ //writer.write("\tpSZ->serializeBasicArray((Axis_Array*)(¶m->"+attribs[i].getParamNameAsMember()+"),"+CUtils.getXSDTypeForBasicType(attribs[i].getTypeName())+", \""+attribs[i].getParamName()+"\");\n"); // cblecken 17/01/2005 - writer.write("\tpSZ->serializeBasicArray((Axis_Array*)(¶m->"+attribs[i].getParamName()+"), Axis_URI_" + classname + ","+CUtils.getXSDTypeForBasicType(attribs[i].getTypeName())+", \""+attribs[i].getParamName()+"\");\n"); + writer.write("\tpSZ->serializeBasicArray((Axis_Array*)(¶m->"+attribs[i].getParamName()+"), Axis_URI_" + classname + ","+CUtils.getXSDTypeForBasicType(attribs[i].getTypeName())+", \""+attribs[i].getParamNameAsSOAPElement()+"\");\n"); } else { @@ -323,7 +323,7 @@ //if Array if ( attribs[i].isSimpleType()) { - writer.write("\tarray = pIWSDZ->getBasicArray("+CUtils.getXSDTypeForBasicType(attribs[i].getTypeName())+ ", \""+attribs[i].getParamName()+"\",0);\n"); + writer.write("\tarray = pIWSDZ->getBasicArray("+CUtils.getXSDTypeForBasicType(attribs[i].getTypeName())+ ", \""+attribs[i].getParamNameAsSOAPElement()+"\",0);\n"); // writer.write("\tparam->"+attribs[i].getParamNameAsMember()+" = ("+CUtils.getBasicArrayNameforType(attribs[i].getTypeName())+"&)array;\n"); writer.write("\tparam->"+attribs[i].getParamNameAsMember()+".m_Array = ("+attribs[i].getTypeName()+"*)new "+attribs[i].getTypeName()+"[array.m_Size];\n"); writer.write("\tparam->"+attribs[i].getParamNameAsMember()+".m_Size = array.m_Size;\n\n"); 1.18 +11 -0 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ParameterInfo.java Index: ParameterInfo.java =================================================================== RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ParameterInfo.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ParameterInfo.java 16 Mar 2005 03:03:34 -0000 1.17 +++ ParameterInfo.java 17 Mar 2005 14:43:48 -0000 1.18 @@ -114,6 +114,16 @@ attribName.lastIndexOf(SymbolTable.ANON_TOKEN) + 1, attribName.length()); } + + if( result.charAt(0) == '_') // Make sure SOAP tag name is not prefixed + // because it is a key word + { + String tagname = result.substring(1, result.length() ); + if( result.equals( TypeMap.resolveWSDL2LanguageNameClashes(tagname, + WrapperConstants.LANGUAGE_CPP))) + result = tagname; + + } return result; } @@ -140,6 +150,7 @@ TypeMap.resolveWSDL2LanguageNameClashes( paramName, WrapperConstants.LANGUAGE_CPP); + //Samisa this.attribName = paramName; }