You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2006/12/23 07:38:05 UTC
svn commit: r489859 - in
/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws:
c/BeanParamWriter.java c/ParmHeaderFileWriter.java cpp/BeanParamWriter.java
cpp/ParmHeaderFileWriter.java info/ParameterInfo.java
Author: nadiramra
Date: Fri Dec 22 22:38:04 2006
New Revision: 489859
URL: http://svn.apache.org/viewvc?view=rev&rev=489859
Log:
AXISCPP-849 - Stub compilation problems when WSDL contains complexTypes and elements of the same name
Modified:
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ParameterInfo.java
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java?view=diff&rev=489859&r1=489858&r2=489859
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java Fri Dec 22 22:38:04 2006
@@ -134,7 +134,7 @@
// Ensure field name is valid and does not cause conflict with class names
String sanitizedAttrName = CUtils.sanitiseAttributeName(attribs[i].getParamName());
if (CUtils.classExists(wscontext, sanitizedAttrName))
- sanitizedAttrName += "_";
+ sanitizedAttrName += "_Ref";
attribs[i].setParamName(sanitizedAttrName);
if (attribs[i].isArray() || !(attribs[i].isSimpleType() || attribs[i].getType().isSimpleType()))
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java?view=diff&rev=489859&r1=489858&r2=489859
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java Fri Dec 22 22:38:04 2006
@@ -266,7 +266,7 @@
// Ensure field name is valid and does not cause conflict with class names
String sanitizedAttrName = CUtils.sanitiseAttributeName(attribs[i].getParamName());
if (CUtils.classExists(wscontext, sanitizedAttrName))
- sanitizedAttrName += "_";
+ sanitizedAttrName += "_Ref";
attribs[i].setParamName(sanitizedAttrName);
if (isElementNillable(i)
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java?view=diff&rev=489859&r1=489858&r2=489859
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java Fri Dec 22 22:38:04 2006
@@ -104,7 +104,7 @@
String sanitizedAttrName = CUtils.sanitiseAttributeName(attribs[i].getParamName());
attribs[i].setMethodName(sanitizedAttrName);
if (CUtils.classExists(wscontext, sanitizedAttrName))
- sanitizedAttrName += "_";
+ sanitizedAttrName += "_Ref";
attribs[i].setParamName(sanitizedAttrName);
String methodName = attribs[i].getMethodName();
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java?view=diff&rev=489859&r1=489858&r2=489859
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ParmHeaderFileWriter.java Fri Dec 22 22:38:04 2006
@@ -320,7 +320,7 @@
String sanitizedAttrName = CUtils.sanitiseAttributeName(attribs[i].getParamName());
attribs[i].setMethodName(sanitizedAttrName);
if (CUtils.classExists(wscontext, sanitizedAttrName))
- sanitizedAttrName += "_";
+ sanitizedAttrName += "_Ref";
attribs[i].setParamName(sanitizedAttrName);
if (isElementNillable(i)
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ParameterInfo.java
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ParameterInfo.java?view=diff&rev=489859&r1=489858&r2=489859
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ParameterInfo.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/ParameterInfo.java Fri Dec 22 22:38:04 2006
@@ -94,10 +94,6 @@
public String getParamName()
{
- // TODO: design review needed
- // - If type and name are equals add "_Ref" ie : ref="..."
- String result;
-
if (attribName.lastIndexOf(SymbolTable.ANON_TOKEN) > 1)
{
attribName =
@@ -107,15 +103,9 @@
// This second call to TypeMap.resoleveWSDL2LanguageNameClashes
// is made to make sure after replacing ANON_TOKEN it is still not a keyword
- attribName =
- TypeMap.resolveWSDL2LanguageNameClashes(attribName, WrapperConstants.LANGUAGE_CPP);
-
- if (isReference())
- result = attribName + "_Ref";
- else
- result = attribName;
+ attribName = TypeMap.resolveWSDL2LanguageNameClashes(attribName, WrapperConstants.LANGUAGE_CPP);
- return result;
+ return attribName;
}
// To avoid the '-' in attribute name.
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org