You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by na...@apache.org on 2006/04/22 06:24:19 UTC
svn commit: r396075 - in /webservices/axis/trunk/c: include/axis/
src/common/ src/soap/ src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/
src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/
src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ src/wsdl/org/apache/axis/wsdl/w...
Author: nadiramra
Date: Fri Apr 21 21:24:14 2006
New Revision: 396075
URL: http://svn.apache.org/viewcvs?rev=396075&view=rev
Log:
Changes to Axis_Create_xxx() prototype. Parameters have been removed since not used with
the creation of new array objects, nor are they used for C-binding support.
Modified:
webservices/axis/trunk/c/include/axis/AxisWrapperAPI.hpp
webservices/axis/trunk/c/include/axis/BasicNode.hpp
webservices/axis/trunk/c/src/common/AxisTrace.h
webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
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/ClientStubWriter.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/c/WrapWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/WrapWriter.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/ClientStubWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java
Modified: webservices/axis/trunk/c/include/axis/AxisWrapperAPI.hpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/include/axis/AxisWrapperAPI.hpp?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- webservices/axis/trunk/c/include/axis/AxisWrapperAPI.hpp (original)
+++ webservices/axis/trunk/c/include/axis/AxisWrapperAPI.hpp Fri Apr 21 21:24:14 2006
@@ -45,7 +45,7 @@
* Function used to create a custom type. bArray is true if array of
* objects to be created. Then nSize is the size of that array.
*/
-typedef void* (* AXIS_OBJECT_CREATE_FUNCT)(void**, bool bArray, int nSize);
+typedef void* (* AXIS_OBJECT_CREATE_FUNCT)();
/**
* @fn AXIS_OBJECT_DELETE_FUNCT
Modified: webservices/axis/trunk/c/include/axis/BasicNode.hpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/include/axis/BasicNode.hpp?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- webservices/axis/trunk/c/include/axis/BasicNode.hpp (original)
+++ webservices/axis/trunk/c/include/axis/BasicNode.hpp Fri Apr 21 21:24:14 2006
@@ -58,21 +58,6 @@
*
*/
-/*
- * Revision 1.1 2004/05/25 samisa
- * Added constructors, copy constructure and pure virtual clone for copy constructing derived classes
- */
-
-/*
- * Revision 1.2 2004/06/13 roshan
- * Added doxygen comments to help autobuild API docs
- */
-
-/*
- * Revision 1.3 2004/07/28 roshan
- * Added the method getLocalName()
- */
-
class BasicNode
{
public:
@@ -116,39 +101,39 @@
/**
-Â Â Â Â Â * Creates an Attribute and adds it to this Basic Node.
-Â Â Â Â Â *
-Â Â Â Â Â * @param localname The local name of the attribute.
-Â Â Â Â Â * @param prefix The prefix of the attribute.
-Â Â Â Â Â * @param uri The namespace uri of the attribute.
-Â Â Â Â Â * @param value The value of the attribute.
-Â Â Â Â Â *
-Â Â Â Â Â * @return A pointer to the created Attribute will be returned.
-Â Â Â Â Â */
+ * Creates an Attribute and adds it to this Basic Node.
+ *
+ * @param localname The local name of the attribute.
+ * @param prefix The prefix of the attribute.
+ * @param uri The namespace uri of the attribute.
+ * @param value The value of the attribute.
+ *
+ * @return A pointer to the created Attribute will be returned.
+ */
virtual IAttribute* createAttribute(const AxisChar* localname,
const AxisChar* prefix, const AxisChar* uri,
const AxisChar* value) =0;
/**
-Â Â Â Â Â * Creates an Attribute and adds it to this Basic Node.
-Â Â Â Â Â *
-Â Â Â Â Â * @param localname The local name of the attribute.
-Â Â Â Â Â * @param prefix The prefix of the attribute.
-Â Â Â Â Â * @param value The value of the attribute.
-Â Â Â Â Â *
- Â Â Â Â * @return A pointer to the created Attribute will be returned.
-Â Â Â Â Â */
+ * Creates an Attribute and adds it to this Basic Node.
+ *
+ * @param localname The local name of the attribute.
+ * @param prefix The prefix of the attribute.
+ * @param value The value of the attribute.
+ *
+ * @return A pointer to the created Attribute will be returned.
+ */
virtual IAttribute* createAttribute(const AxisChar* localname,
const AxisChar* prefix, const AxisChar* value)=0 ;
/**
-Â Â Â Â Â * Creates an Attribute and adds it to this Basic Node.
-Â Â Â Â Â *
-Â Â Â Â Â * @param localname The local name of the attribute.
-Â Â Â Â Â * @param value The value of the attribute.
-Â Â Â Â Â *
- Â Â Â Â * @return A pointer to the created Attribute will be returned.
-Â Â Â Â Â */
+ * Creates an Attribute and adds it to this Basic Node.
+ *
+ * @param localname The local name of the attribute.
+ * @param value The value of the attribute.
+ *
+ * @return A pointer to the created Attribute will be returned.
+ */
virtual IAttribute* createAttribute(const AxisChar* localname,
const AxisChar* value)=0 ;
Modified: webservices/axis/trunk/c/src/common/AxisTrace.h
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/common/AxisTrace.h?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisTrace.h (original)
+++ webservices/axis/trunk/c/src/common/AxisTrace.h Fri Apr 21 21:24:14 2006
@@ -296,17 +296,11 @@
};
#ifdef ENABLE_AXISTRACE
-#define TRACE_OBJECT_CREATE_FUNCT_ENTRY(funct, arr, bArr, size) \
+#define TRACE_OBJECT_CREATE_FUNCT_ENTRY(funct) \
{ \
if (axiscpp::AxisTrace::isTraceOn()) \
{ \
- void *traceArr = arr; \
- bool traceBArr = bArr; \
- int traceSize = size; \
- axiscpp::AxisTrace::traceEntry(NULL, "AXIS_OBJECT_CREATE_FUNCT", (void*)(funct), 3, \
- TRACETYPE_POINTER, 1, (void*)&traceArr, \
- TRACETYPE_BOOL, 0, (void*)&traceBArr, \
- TRACETYPE_INT, 0, (void*)&traceSize); \
+ axiscpp::AxisTrace::traceEntry(NULL, "AXIS_OBJECT_CREATE_FUNCT", (void*)(funct), 0); \
} \
}
@@ -393,7 +387,7 @@
}
#else
-#define TRACE_OBJECT_CREATE_FUNCT_ENTRY(funct, arr, bArr, size)
+#define TRACE_OBJECT_CREATE_FUNCT_ENTRY(funct)
#define TRACE_OBJECT_CREATE_FUNCT_EXIT(funct, arr)
#define TRACE_OBJECT_SIZE_FUNCT_ENTRY(funct)
#define TRACE_OBJECT_SIZE_FUNCT_EXIT(funct, size)
Modified: webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp Fri Apr 21 21:24:14 2006
@@ -781,8 +781,8 @@
if (!m_pNode)
return NULL;
/* type can be checked here */
- TRACE_OBJECT_CREATE_FUNCT_ENTRY(pCreFunct, NULL, false, 0);
- void *pObject = ((AXIS_OBJECT_CREATE_FUNCT) pCreFunct) (NULL, false, 0);
+ TRACE_OBJECT_CREATE_FUNCT_ENTRY(pCreFunct);
+ void *pObject = ((AXIS_OBJECT_CREATE_FUNCT) pCreFunct) ();
TRACE_OBJECT_CREATE_FUNCT_EXIT(pCreFunct, pObject);
if (pObject && pDZFunct)
{
@@ -853,8 +853,8 @@
m_pNode = NULL; /* node identified and used */
- TRACE_OBJECT_CREATE_FUNCT_ENTRY(pCreFunct, NULL, false, 0);
- void *pObject = ((AXIS_OBJECT_CREATE_FUNCT) pCreFunct)(NULL, false, 0);
+ TRACE_OBJECT_CREATE_FUNCT_ENTRY(pCreFunct);
+ void *pObject = ((AXIS_OBJECT_CREATE_FUNCT) pCreFunct)();
TRACE_OBJECT_CREATE_FUNCT_EXIT(pCreFunct, pObject);
if (pObject && pDZFunct)
@@ -946,8 +946,8 @@
if (RPC_ENCODED == m_nStyle)
{
/* type can be checked here */
- TRACE_OBJECT_CREATE_FUNCT_ENTRY(pCreFunct, NULL, false, 0);
- void *pObject = ((AXIS_OBJECT_CREATE_FUNCT) pCreFunct) (NULL, false, 0);
+ TRACE_OBJECT_CREATE_FUNCT_ENTRY(pCreFunct);
+ void *pObject = ((AXIS_OBJECT_CREATE_FUNCT) pCreFunct) ();
TRACE_OBJECT_CREATE_FUNCT_EXIT(pCreFunct, pObject);
if (pObject && pDZFunct)
@@ -1004,8 +1004,8 @@
}
m_pNode = NULL; /* node identified and used */
- TRACE_OBJECT_CREATE_FUNCT_ENTRY(pCreFunct, NULL, false, 0);
- void *pObject = ((AXIS_OBJECT_CREATE_FUNCT) pCreFunct)(NULL, false, 0);
+ TRACE_OBJECT_CREATE_FUNCT_ENTRY(pCreFunct);
+ void *pObject = ((AXIS_OBJECT_CREATE_FUNCT) pCreFunct)();
TRACE_OBJECT_CREATE_FUNCT_EXIT(pCreFunct, pObject);
if (pObject && pDZFunct)
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamWriter.java Fri Apr 21 21:24:14 2006
@@ -181,7 +181,7 @@
writer.write("\n");
writer.write("\t/* Reclaim array data type memory resources */\n");
- writer.write("\t\taxiscAxisDelete(param, XSDC_ARRAY);\n");
+ writer.write("\taxiscAxisDelete(param, XSDC_ARRAY);\n");
// End function body
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/BeanParamWriter.java?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- 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 Apr 21 21:24:14 2006
@@ -714,7 +714,7 @@
writer.write(" * This static method to allocate a " + classname + " type of object\n");
writer.write(" */\n");
- writer.write("void* Axis_Create_" + classname + "(void* pObj, AxiscBool bArray, int nSize)\n{\n");
+ writer.write("void* Axis_Create_" + classname + "()\n{\n");
writer.write("\t" + classname + "* pTemp = (" + classname + " *)malloc(sizeof(" + classname + "));\n");
writer.write("\tmemset(pTemp, 0, sizeof(" + classname + "));\n");
@@ -756,12 +756,12 @@
if (attribs[i].isArray())
{
writer.write("\tpTemp->" + attribs[i].getParamName() + " = "
- + "Axis_Create_" + attribs[i].getTypeName() + "_Array(0);\n");
+ + "Axis_Create_" + attribs[i].getTypeName() + "_Array();\n");
}
else
{
writer.write("\tpTemp->" + attribs[i].getParamName() + " = "
- + "Axis_Create_" + attribs[i].getTypeName() + "(0,0,0);\n");
+ + "Axis_Create_" + attribs[i].getTypeName() + "();\n");
}
}
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ClientStubWriter.java Fri Apr 21 21:24:14 2006
@@ -618,30 +618,13 @@
while (itr.hasNext())
{
typeName = itr.next().toString();
- writer.write(
- "extern int Axis_DeSerialize_"
- + typeName
- + "("
- + typeName
- + "* param, IWrapperSoapDeSerializer* pDZ);\n");
- writer.write(
- "extern void* Axis_Create_"
- + typeName
- + "("
- + typeName
- + " *Obj, bool bArray, int nSize);\n");
- writer.write(
- "extern void Axis_Delete_"
- + typeName
- + "("
- + typeName
- + "* param, bool bArray, int nSize);\n");
- writer.write(
- "extern int Axis_Serialize_"
- + typeName
- + "("
- + typeName
- + "* param, IWrapperSoapSerializer* pSZ, bool bArray);\n");
+ writer.write("extern int Axis_DeSerialize_" + typeName
+ + "(" + typeName + "* param, IWrapperSoapDeSerializer* pDZ);\n");
+ writer.write("extern void* Axis_Create_" + typeName + "();\n");
+ writer.write("extern void Axis_Delete_" + typeName + "("
+ + typeName + "* param, bool bArray, int nSize);\n");
+ writer.write("extern int Axis_Serialize_" + typeName + "("
+ + typeName + "* param, IWrapperSoapSerializer* pSZ, bool bArray);\n");
writer.write("extern int Axis_GetSize_" + typeName + "();\n\n");
}
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ParmHeaderFileWriter.java?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- 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 Apr 21 21:24:14 2006
@@ -358,8 +358,7 @@
typeName = itr.next().toString();
this.writer.write("extern int Axis_DeSerialize_" + typeName
+ "(" + typeName + "* param, AXISCHANDLE pDZ);\n");
- this.writer.write("extern void* Axis_Create_" + typeName
- + "(" + typeName + " *Obj, AxiscBool bArray, int nSize);\n");
+ this.writer.write("extern void* Axis_Create_" + typeName + "();\n");
this.writer.write("extern void Axis_Delete_" + typeName
+ "(" + typeName + "* param, AxiscBool bArray, int nSize);\n");
this.writer.write("extern int Axis_Serialize_" + typeName
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/WrapWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/WrapWriter.java?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/WrapWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/WrapWriter.java Fri Apr 21 21:24:14 2006
@@ -707,11 +707,7 @@
+ typeName
+ "* param, IWrapperSoapDeSerializer* pDZ);\n");
writer.write(
- "extern void* Axis_Create_"
- + typeName
- + "("
- + typeName
- + " * param, bool bArray, int nSize);\n");
+ "extern void* Axis_Create_" + typeName + "();\n");
writer.write(
"extern void Axis_Delete_"
+ typeName
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/WrapWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/WrapWriter.java?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/WrapWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/WrapWriter.java Fri Apr 21 21:24:14 2006
@@ -556,8 +556,7 @@
"extern int Axis_DeSerialize_" + typeName
+ "(" + typeName + "* param, IWrapperSoapDeSerializer* pDZ);\n");
writer.write(
- "extern void* Axis_Create_" + typeName
- + "(" + typeName + "* Obj, bool bArray, int nSize);\n");
+ "extern void* Axis_Create_" + typeName + "();\n");
writer.write(
"extern void Axis_Delete_" + typeName
+ "(" + typeName + "* param, bool bArray, int nSize);\n");
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/BeanParamWriter.java?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- 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 Apr 21 21:24:14 2006
@@ -83,8 +83,7 @@
{
writer.write("extern int Axis_DeSerialize_" + typeName
+ "(" + typeName + "* param, IWrapperSoapDeSerializer* pDZ);\n");
- writer.write("extern void* Axis_Create_" + typeName + "("
- + typeName + "* pObj, bool bArray = false, int nSize=0);\n");
+ writer.write("extern void* Axis_Create_" + typeName + "();\n");
writer.write("extern void Axis_Delete_" + typeName + "("
+ typeName + "* param, bool bArray = false, int nSize=0);\n");
writer.write("extern int Axis_Serialize_" + typeName + "("
@@ -95,8 +94,7 @@
{
writer.write("int Axis_DeSerialize_" + typeName + "("
+ typeName + "* param, IWrapperSoapDeSerializer* pDZ);\n");
- writer.write("void* Axis_Create_" + typeName + "("
- + typeName + "* pObj, bool bArray, int nSize);\n");
+ writer.write("void* Axis_Create_" + typeName + "();\n");
writer.write("void Axis_Delete_" + typeName + "("
+ typeName + "* param, bool bArray, int nSize);\n");
writer.write("int Axis_Serialize_" + typeName
@@ -1111,22 +1109,11 @@
private void writeCreateGlobalMethod() throws IOException
{
- writer.write("void* Axis_Create_" + classname + "(" + classname
- + "* pObj, bool bArray = false, int nSize=0)\n{\n");
- writer.write("\tif (bArray && (nSize > 0))\n\t{\n\t\tif (pObj)\n\t\t{\n");
- writer.write("\t\t\t" + classname + "* pNew = new " + classname + "[nSize];\n");
-
- writer.write("\t\t\tsize_t i = nSize/2;\n");
- writer.write("\t\t\tfor (int ii = 0; ii < (int) i; ++ii)\n");
- writer.write("\t\t\t{\n");
- writer.write("\t\t\t\tpNew[ii] = pObj[ii];\n");
- writer.write("\t\t\t\tpObj[ii].reset();\n");
- writer.write("\t\t\t}\n");
-
- writer.write("\t\t\tdelete [] pObj;\n");
- writer.write("\t\t\treturn pNew;\n\t\t}\n\t\telse\n\t\t{\n");
- writer.write("\t\t\treturn new " + classname + "[nSize];\n\t\t}\n\t}\n");
- writer.write("\telse\n\t\treturn new " + classname + ";\n}\n\n");
+ writer.write("void* Axis_Create_" + classname + "()\n");
+ writer.write("{\n");
+ writer.write("\treturn new " + classname + ";\n");
+ writer.write("}\n");
+ writer.write("\n");
}
private void writeDeleteGlobalMethod() throws IOException
@@ -1137,6 +1124,7 @@
writer.write("void Axis_Delete_" + classname + "(" + classname
+ "* param, bool bArray = false, int nSize=0)\n");
writer.write("{\n");
+ writer.write("\t/* If array, only objects in array are reclaimed, not array */\n");
writer.write("\tif (bArray)\n");
writer.write("\t{\n");
writer.write("\t\tif (nSize > 0)\n");
@@ -1149,14 +1137,10 @@
writer.write("\t\t\t\t\t(( " + classname + " ** ) param)[count] = NULL;\n");
writer.write("\t\t\t\t}\n");
writer.write("\t\t\t}\n");
- writer.write("\t\t\tdelete [] ( " + classname + " ** ) param;\n");
writer.write("\t\t}\n");
writer.write("\t}\n");
writer.write("\telse\n");
- writer.write("\t{\n");
writer.write("\t\tdelete param;\n");
- writer.write("\t}\n");
- writer.write("\tparam = NULL;\n");
writer.write("}\n");
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java Fri Apr 21 21:24:14 2006
@@ -575,7 +575,7 @@
writer.write("\t\t\t\t}\n");
writer.write("\t\t\t\tm_pCall->getCmplxArray( " + currentParamName + ",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(void *) Axis_DeSerialize_"
+ containedType);
- //writer.write(", (void*) Axis_Create_"+containedType+", (void*) Axis_Delete_"+containedType+", (void*) Axis_GetSize_"+containedType+", \""+currentType.getElementName().getLocalPart()+"\", Axis_URI_"+containedType+");\n");
+
writer.write (",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(void *) Axis_Create_" + containedType
+ ",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(void *) Axis_Delete_" + containedType
+ ",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t(void *) Axis_GetSize_" + containedType
@@ -960,19 +960,12 @@
{
typeName = itr.next().toString();
writer.write("extern int Axis_DeSerialize_" + typeName + "("
- + typeName
- + "* param, IWrapperSoapDeSerializer* pDZ);\n");
- writer.write("extern void* Axis_Create_" + typeName + "("
- + typeName
- + " *Obj, bool bArray = false, int nSize=0);\n");
+ + typeName + "* param, IWrapperSoapDeSerializer* pDZ);\n");
+ writer.write("extern void* Axis_Create_" + typeName + "();\n");
writer.write("extern void Axis_Delete_" + typeName + "("
- + typeName
- + "* param, bool bArray = false, int nSize=0);\n");
- writer
- .write("extern int Axis_Serialize_"
- + typeName
- + "("
- + typeName
+ + typeName + "* param, bool bArray = false, int nSize=0);\n");
+ writer.write("extern int Axis_Serialize_" + typeName
+ + "(" + typeName
+ "* param, IWrapperSoapSerializer* pSZ, bool bArray = false);\n");
writer.write("extern int Axis_GetSize_" + typeName + "();\n\n");
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/WrapWriter.java Fri Apr 21 21:24:14 2006
@@ -898,30 +898,13 @@
while (itr.hasNext())
{
typeName = itr.next().toString();
- writer.write(
- "extern int Axis_DeSerialize_"
- + typeName
- + "("
- + typeName
- + "* param, IWrapperSoapDeSerializer* pDZ);\n");
- writer.write(
- "extern void* Axis_Create_"
- + typeName
- + "("
- + typeName
- + " *Obj, bool bArray = false, int nSize=0);\n");
- writer.write(
- "extern void Axis_Delete_"
- + typeName
- + "("
- + typeName
- + "* param, bool bArray = false, int nSize=0);\n");
- writer.write(
- "extern int Axis_Serialize_"
- + typeName
- + "("
- + typeName
- + "* param, IWrapperSoapSerializer* pSZ, bool bArray = false);\n");
+ writer.write("extern int Axis_DeSerialize_" + typeName
+ + "(" + typeName + "* param, IWrapperSoapDeSerializer* pDZ);\n");
+ writer.write("extern void* Axis_Create_" + typeName + "();\n");
+ writer.write("extern void Axis_Delete_" + typeName
+ + "(" + typeName + "* param, bool bArray = false, int nSize=0);\n");
+ writer.write("extern int Axis_Serialize_" + typeName
+ + "(" + typeName + "* param, IWrapperSoapSerializer* pSZ, bool bArray = false);\n");
writer.write("extern int Axis_GetSize_" + typeName + "();\n\n");
}
}
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/ClientStubWriter.java Fri Apr 21 21:24:14 2006
@@ -1145,8 +1145,7 @@
typeName = itr.next ().toString ();
writer.write ("extern int Axis_DeSerialize_" + typeName
+ "(" + typeName + "* param, IWrapperSoapDeSerializer* pDZ);\n");
- writer.write ("extern void* Axis_Create_" + typeName
- + "(" + typeName + " *Obj, bool bArray = false, int nSize=0);\n");
+ writer.write ("extern void* Axis_Create_" + typeName + "();\n");
writer.write ("extern void Axis_Delete_" + typeName + "(" +
typeName + "* param, bool bArray = false, int nSize=0);\n");
writer.write ("extern int Axis_Serialize_" + typeName + "(" +
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java?rev=396075&r1=396074&r2=396075&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/literal/WrapWriter.java Fri Apr 21 21:24:14 2006
@@ -697,8 +697,7 @@
typeName = itr.next().toString();
writer.write("extern int Axis_DeSerialize_" + typeName + "("
+ typeName + "* param, IWrapperSoapDeSerializer* pDZ);\n");
- writer.write("extern void* Axis_Create_" + typeName + "("
- + typeName + " *Obj, bool bArray = false, int nSize=0);\n");
+ writer.write("extern void* Axis_Create_" + typeName + "();\n");
writer.write("extern void Axis_Delete_" + typeName + "("
+ typeName + "* param, bool bArray = false, int nSize=0);\n");
writer.write("extern int Axis_Serialize_" + typeName + "("