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 sa...@apache.org on 2005/03/29 10:16:30 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info AttributeInfo.java ParameterInfo.java TypeMap.java
samisa 2005/03/29 00:16:30
Modified: c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
BeanParamWriter.java ParmHeaderFileWriter.java
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info
AttributeInfo.java ParameterInfo.java TypeMap.java
Log:
Fixes for handling '-' in field names.
AXISCPP-525
Thanks to Chinthana for fix.
Revision Changes Path
1.62 +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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- BeanParamWriter.java 23 Mar 2005 15:45:05 -0000 1.61
+++ BeanParamWriter.java 29 Mar 2005 08:16:30 -0000 1.62
@@ -263,11 +263,11 @@
|| attribs[i].getTypeName().equals("xsd__QName")
|| attribs[i].getTypeName().equals("xsd__notation"))
{
- writer.write("\tpSZ->serializeAsElement(\""+attribs[i].getSOAPElementNameAsString()+"\", Axis_URI_" + classname + ", (void*)(param->"+attribs[i].getParamName()+"), "+ CUtils.getXSDTypeForBasicType(attribs[i].getTypeName())+");\n");
+ writer.write("\tpSZ->serializeAsElement(\""+attribs[i].getSOAPElementNameAsString()+"\", Axis_URI_" + classname + ", (void*)(param->"+attribs[i].getParamNameWithoutSymbols()+"), "+ CUtils.getXSDTypeForBasicType(attribs[i].getTypeName())+");\n");
}
else
{
- writer.write("\tpSZ->serializeAsElement(\""+attribs[i].getSOAPElementNameAsString()+"\", Axis_URI_" + classname + ", (void*)&(param->"+attribs[i].getParamName()+"), "+ CUtils.getXSDTypeForBasicType(attribs[i].getTypeName())+");\n");
+ writer.write("\tpSZ->serializeAsElement(\""+attribs[i].getSOAPElementNameAsString()+"\", Axis_URI_" + classname + ", (void*)&(param->"+attribs[i].getParamNameWithoutSymbols()+"), "+ CUtils.getXSDTypeForBasicType(attribs[i].getTypeName())+");\n");
}
}else{
1.35 +2 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java
Index: ParmHeaderFileWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ParmHeaderFileWriter.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ParmHeaderFileWriter.java 29 Mar 2005 06:28:17 -0000 1.34
+++ ParmHeaderFileWriter.java 29 Mar 2005 08:16:30 -0000 1.35
@@ -312,7 +312,7 @@
"\t"
+ getCorrectParmNameConsideringArraysAndComplexTypes(attribs[i])
+ " "
- + attribs[i].getParamName()
+ + attribs[i].getParamNameWithoutSymbols()
+ ";\n");
}
if (extensionBaseAttrib != null
@@ -323,7 +323,7 @@
"\t"
+ getCorrectParmNameConsideringArraysAndComplexTypes(extensionBaseAttrib)
+ " "
- + extensionBaseAttrib.getParamName()
+ + extensionBaseAttrib.getParamNameWithoutSymbols()
+ ";\n");
}
}
1.8 +1 -1 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/AttributeInfo.java
Index: AttributeInfo.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/AttributeInfo.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AttributeInfo.java 23 Mar 2005 15:45:05 -0000 1.7
+++ AttributeInfo.java 29 Mar 2005 08:16:30 -0000 1.8
@@ -129,7 +129,7 @@
public String getParamNameAsMember()
{
- this.attribNameAsMember = super.getParamName();
+ this.attribNameAsMember = super.getParamNameWithoutSymbols();
// need to deal with _Ref stuff :(
if (this.className != null
&& this.className.equals(attribNameAsMember))
1.20 +14 -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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ParameterInfo.java 23 Mar 2005 15:45:05 -0000 1.19
+++ ParameterInfo.java 29 Mar 2005 08:16:30 -0000 1.20
@@ -103,6 +103,20 @@
}
return result;
}
+ // 29/3/05.To avoid the '-' in attribute name.
+ public String getParamNameWithoutSymbols() {
+ // TODO: design review needed
+ // - If type and name are equals add "_Ref" ie : ref="..."
+ String result = this.getParamName();
+
+ char[] symbols = TypeMap.getSymbols();
+
+ for (int j = 0; j < symbols.length; j++) {
+ result = result.replace(symbols[j], '_');
+ }
+
+ return result;
+ }
public String getParamNameAsSOAPElement()
{
1.18 +14 -0 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/TypeMap.java
Index: TypeMap.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/info/TypeMap.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TypeMap.java 23 Mar 2005 15:45:05 -0000 1.17
+++ TypeMap.java 29 Mar 2005 08:16:30 -0000 1.18
@@ -51,6 +51,13 @@
private static Hashtable javakeywords = new Hashtable();
private static Hashtable cppkeywords = new Hashtable();
+
+ // 29/3/05. To keep symbols
+ private static char[] symbolArray =
+ {
+ '-',
+ '@'
+ };
static {
// c -> xml type mapping
@@ -512,4 +519,11 @@
return name;
}
+
+ // 29/3/05. To access the symbols
+ public static char[] getSymbols()
+ {
+ return symbolArray;
+ }
+
}