Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 88530 invoked from network); 23 Jul 2006 21:30:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Jul 2006 21:30:31 -0000 Received: (qmail 34683 invoked by uid 500); 23 Jul 2006 21:30:30 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 34583 invoked by uid 500); 23 Jul 2006 21:30:29 -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 34572 invoked by uid 99); 23 Jul 2006 21:30:29 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Jul 2006 14:30:29 -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; Sun, 23 Jul 2006 14:30:29 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B19201A981D; Sun, 23 Jul 2006 14:30:08 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r424829 - in /webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws: CUtils.java c/AllParamWriter.java cpp/AllParamWriter.java Date: Sun, 23 Jul 2006 21:30:08 -0000 To: axis-cvs@ws.apache.org From: nadiramra@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060723213008.B19201A981D@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: nadiramra Date: Sun Jul 23 14:30:07 2006 New Revision: 424829 URL: http://svn.apache.org/viewvc?rev=424829&view=rev Log: Use sanitiseClassName only if QName or string represents an anonymous type. Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java?rev=424829&r1=424828&r2=424829&view=diff ============================================================================== --- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java (original) +++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/CUtils.java Sun Jul 23 14:30:07 2006 @@ -936,7 +936,9 @@ if((cpp && !qname2classmapCpp.containsKey(qname)) || (!cpp && !qname2classmapC.containsKey(qname))) { - arrayName = CUtils.sanitiseClassName(qname.getLocalPart()) + "_Array"; + arrayName = qname.getLocalPart() + "_Array"; + if (TypeMap.isAnonymousType(qname)) + arrayName = CUtils.sanitiseClassName(arrayName); } return arrayName; } Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java?rev=424829&r1=424828&r2=424829&view=diff ============================================================================== --- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java (original) +++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/AllParamWriter.java Sun Jul 23 14:30:07 2006 @@ -32,6 +32,7 @@ import org.apache.axis.wsdl.wsdl2ws.WrapperFault; import org.apache.axis.wsdl.wsdl2ws.info.Type; import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext; +import org.apache.axis.wsdl.wsdl2ws.info.TypeMap; /** * Parameter genarator.. genarate all necessary param classes @@ -77,7 +78,8 @@ String elementType = type.getElementType(); if (elementType != null) { - elementType = CUtils.sanitiseClassName(elementType); + if (TypeMap.isAnonymousType(elementType)) + elementType = CUtils.sanitiseClassName(elementType); if (WSDL2Ws.verbose) System.out.println(" Array element type " Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java?rev=424829&r1=424828&r2=424829&view=diff ============================================================================== --- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java (original) +++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/AllParamWriter.java Sun Jul 23 14:30:07 2006 @@ -33,6 +33,7 @@ import org.apache.axis.wsdl.wsdl2ws.WrapperFault; import org.apache.axis.wsdl.wsdl2ws.info.Type; import org.apache.axis.wsdl.wsdl2ws.info.WebServiceContext; +import org.apache.axis.wsdl.wsdl2ws.info.TypeMap; public class AllParamWriter implements SourceWriter { @@ -70,7 +71,8 @@ String elementType = type.getElementType(); if (elementType != null) { - elementType = CUtils.sanitiseClassName(elementType); + if (TypeMap.isAnonymousType(elementType)) + elementType = CUtils.sanitiseClassName(elementType); if (WSDL2Ws.verbose) System.out.println(" Array element type " --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org