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 di...@apache.org on 2005/02/01 14:05:59 UTC
cvs commit: ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal BeanParamWriter.java ClientStubWriter.java
dicka 2005/02/01 05:05:59
Modified: c/src/soap SoapDeSerializer.cpp
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal
BeanParamWriter.java ClientStubWriter.java
Log:
Applying patches provided by Carsten Blecken.
Submitted by: Carsten Blecken
Reviewed by: Adrian Dick
Revision Changes Path
1.136 +1 -1 ws-axis/c/src/soap/SoapDeSerializer.cpp
Index: SoapDeSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapDeSerializer.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- SoapDeSerializer.cpp 25 Jan 2005 14:25:24 -0000 1.135
+++ SoapDeSerializer.cpp 1 Feb 2005 13:05:59 -0000 1.136
@@ -752,7 +752,7 @@
if (m_pNode->m_type == END_ELEMENT)
{
//Skip past end of item
- m_pNode = m_pParser->next ();
+// m_pNode = m_pParser->next ();
if (0 ==
strcmp (pName, m_pNode->m_pchNameOrValue))
1.44 +14 -6 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- BeanParamWriter.java 31 Jan 2005 14:18:08 -0000 1.43
+++ BeanParamWriter.java 1 Feb 2005 13:05:59 -0000 1.44
@@ -169,7 +169,9 @@
else if(attribs[i].isArray()){
//if Array
if (attribs[i].isSimpleType()){
- writer.write("\tpSZ->serializeBasicArray((Axis_Array*)(¶m->"+attribs[i].getParamNameAsMember()+"),"+CUtils.getXSDTypeForBasicType(attribs[i].getTypeName())+", \""+attribs[i].getParamName()+"\");\n");
+ //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");
}
else
{
@@ -244,16 +246,22 @@
else if (attribs[i].isSimpleType()){
//writer.write("\tpSZ->serializeAsElement(\""+attribs[i].getElementName().getLocalPart()+"\", (void*)&(param->"+attribs[i].getParamName()+"), "+ CUtils.getXSDTypeForBasicType(attribs[i].getTypeName())+");\n");
//Samisa 22/08/2004
- writer.write("\tpSZ->serializeAsElement( \""+attribs[i].getElementNameAsString()+"\", (void*)&(param->"+attribs[i].getParamNameAsMember()+"), "+ CUtils.getXSDTypeForBasicType(attribs[i].getTypeName())+");\n");
- //Samisa
+ // writer.write("\tpSZ->serializeAsElement( \""+attribs[i].getElementNameAsString()+"\", (void*)&(param->"+attribs[i].getParamNameAsMember()+"), "+ CUtils.getXSDTypeForBasicType(attribs[i].getTypeName())+");\n");
+ // cblecken 17/01/2005
+ writer.write("\tpSZ->serializeAsElement(\""+attribs[i].getElementNameAsString()+"\", Axis_URI_" + classname + ", (void*)&(param->"+attribs[i].getParamName()+"), "+ CUtils.getXSDTypeForBasicType(attribs[i].getTypeName())+");\n");
+
}else{
//if complex type
String elm = attribs[i].getParamName();
if ( attribs[i].isReference() )
elm = attribs[i].getTypeName();
- writer.write("\tpSZ->serialize(\"<"+elm+"\", 0);\n");
- writer.write("\tAxis_Serialize_"+attribs[i].getTypeName()+"(param->"+attribs[i].getParamNameAsMember()+", pSZ);\n");
- writer.write("\tpSZ->serialize(\"</"+elm+">\", 0);\n");
+ //writer.write("\tpSZ->serialize(\"<"+elm+"\", 0);\n");
+ //writer.write("\tAxis_Serialize_"+attribs[i].getTypeName()+"(param->"+attribs[i].getParamNameAsMember()+", pSZ);\n");
+ //writer.write("\tpSZ->serialize(\"</"+elm+">\", 0);\n");
+ writer.write("\tpSZ->serialize(\"<\", pSZ->getNamespacePrefix(\"" + type.getName().getNamespaceURI() + "\"), \":\", \""+elm+"\", 0);\n");
+ writer.write("\tAxis_Serialize_"+attribs[i].getTypeName()+"(param->"+attribs[i].getParamName()+", pSZ);\n");
+ writer.write("\tpSZ->serialize(\"</\", pSZ->getNamespacePrefix(\"" + type.getName().getNamespaceURI() + "\"), \":\", \""+elm+"\", \">\", 0);\n");
+
}
}
writer.write("\treturn AXIS_SUCCESS;\n");
1.62 +3 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
Index: ClientStubWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ClientStubWriter.java 14 Jan 2005 11:34:31 -0000 1.61
+++ ClientStubWriter.java 1 Feb 2005 13:05:59 -0000 1.62
@@ -594,8 +594,9 @@
+ containedType
+ ", (void*) Axis_GetSize_"
+ containedType
- + ", cPrefixAndParamName"
- + i
+ + ", \""
+ + parameterName
+ + "\""
+ ", Axis_URI_"
+ containedType);
}