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/05/02 22:11:10 UTC
svn commit: r399031 - in /webservices/axis/trunk/c: include/axis/
include/axis/client/ src/cbindings/ src/cbindings/client/ src/common/
src/engine/client/ src/soap/ src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/
src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/litera...
Author: nadiramra
Date: Tue May 2 13:11:06 2006
New Revision: 399031
URL: http://svn.apache.org/viewcvs?rev=399031&view=rev
Log:
Remove generation of and references to Axis_GetSize_xxxxx() function.
Modified:
webservices/axis/trunk/c/include/axis/AxisWrapperAPI.hpp
webservices/axis/trunk/c/include/axis/IWrapperSoapDeSerializer.hpp
webservices/axis/trunk/c/include/axis/IWrapperSoapSerializer.hpp
webservices/axis/trunk/c/include/axis/client/Call.hpp
webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp
webservices/axis/trunk/c/src/cbindings/IWrapperSoapSerializerC.cpp
webservices/axis/trunk/c/src/cbindings/client/CallC.cpp
webservices/axis/trunk/c/src/common/AxisTrace.h
webservices/axis/trunk/c/src/common/ComplexObjectHandler.h
webservices/axis/trunk/c/src/common/Param.cpp
webservices/axis/trunk/c/src/common/Param.h
webservices/axis/trunk/c/src/engine/client/Call.cpp
webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp
webservices/axis/trunk/c/src/soap/SoapDeSerializer.h
webservices/axis/trunk/c/src/soap/SoapSerializer.cpp
webservices/axis/trunk/c/src/soap/SoapSerializer.h
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.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/ClientStubHeaderWriter.java
webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.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=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/include/axis/AxisWrapperAPI.hpp (original)
+++ webservices/axis/trunk/c/include/axis/AxisWrapperAPI.hpp Tue May 2 13:11:06 2006
@@ -64,12 +64,6 @@
*/
typedef int (* AXIS_SERIALIZE_FUNCT)(void*, void*, bool bArray);
-/**
- * @fn AXIS_OBJECT_SIZE_FUNCT
- * Function that is used to get the size of an object of a custom type.
- */
-typedef int (* AXIS_OBJECT_SIZE_FUNCT)(void);
-
AXIS_CPP_NAMESPACE_END
#endif
Modified: webservices/axis/trunk/c/include/axis/IWrapperSoapDeSerializer.hpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/include/axis/IWrapperSoapDeSerializer.hpp?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/include/axis/IWrapperSoapDeSerializer.hpp (original)
+++ webservices/axis/trunk/c/include/axis/IWrapperSoapDeSerializer.hpp Tue May 2 13:11:06 2006
@@ -73,7 +73,6 @@
* @param pDZFunct function pointer to the complex type deserialize method
* @param pCreFunct function pointer to the complex type creation method
* @param pDelFunct function pointer to the complex type delete method
- * @param pSizeFunct function pointer toeh complex type size method
* @param pName SOAP element name for complex type
* @param pNamespace SOAP namespace for complex type
* @return deserialized complex type array, this is pArray
@@ -82,7 +81,6 @@
void* pDZFunct,
void* pCreFunct,
void* pDelFunct,
- void* pSizeFunct,
const AxisChar* pName,
const AxisChar* pNamespace)=0;
/**
Modified: webservices/axis/trunk/c/include/axis/IWrapperSoapSerializer.hpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/include/axis/IWrapperSoapSerializer.hpp?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/include/axis/IWrapperSoapSerializer.hpp (original)
+++ webservices/axis/trunk/c/include/axis/IWrapperSoapSerializer.hpp Tue May 2 13:11:06 2006
@@ -130,7 +130,6 @@
* @param pArray Axis_Array containing complex type elements.
* @param pSZFunct function pointer to complex type serialize method.
* @param pDelFunct function pointer to complex type delete method.
- * @param pSizeFunct function pointer to complex type size method.
* @param pName local name for array elements.
* @param pNamespace namespace URI for array elements.
* @return status
@@ -138,7 +137,6 @@
virtual int AXISCALL addOutputCmplxArrayParam(const Axis_Array* pArray,
void* pSZFunct,
void* pDelFunct,
- void* pSizeFunct,
const AxisChar* pName,
const AxisChar* pNamespace)=0;
@@ -216,7 +214,6 @@
* @param pArray Axis_Array containing complex type elements.
* @param pSZFunct function pointer to complex type serialize method.
* @param pDelFunct function pointer to complex type delete method.
- * @param pSizeFunct function pointer to complex type size method.
* @param pName local name for array elements.
* @param pNamespace namespace URI for array elements.
* @return status
@@ -224,7 +221,6 @@
virtual int AXISCALL serializeCmplxArray(const Axis_Array* pArray,
void* pSZFunct,
void* pDelFunct,
- void* pSizeFunct,
const AxisChar* pName,
const AxisChar* pNamespace)=0;
Modified: webservices/axis/trunk/c/include/axis/client/Call.hpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/include/axis/client/Call.hpp?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/include/axis/client/Call.hpp (original)
+++ webservices/axis/trunk/c/include/axis/client/Call.hpp Tue May 2 13:11:06 2006
@@ -286,8 +286,6 @@
* @param pArray is a pointer the an Axis_Array object.
* @param pSZFunct is a pointer to the function that knows how to serialise the object.
* @param pDelFunct is a pointer to the function that knows how to delete the object.
- * @param pSizeFunct is a pointer to the function that knows how to increase
- * the size of the object.
* @param pName is a null terminated character string that contains the
* prefix:name of the object.
* @param pNamespace is the namespace associated with the prefix used in 'pName'.
@@ -295,7 +293,6 @@
void AXISCALL addCmplxArrayParameter( Axis_Array * pArray,
void * pSZFunct,
void * pDelFunct,
- void * pSizeFunct,
const AxisChar * pName,
const AxisChar * pNamespace);
@@ -1539,8 +1536,6 @@
* the object.
* @param pCreFunct is a pointer to the function that knows how to create the object.
* @param pDelFunct is a pointer to the function that knows how to delete the object.
- * @param pSizeFunct is a pointer to the function that knows how to add more
- * elements to the object.
* @param pName is a null terminated character string that contains the
* prefix:name of the object.
* @param pNamespace is the namespace associated with the prefix used in 'pName'.
@@ -1550,7 +1545,6 @@
void * pDZFunct,
void * pCreFunct,
void * pDelFunct,
- void * pSizeFunct,
const AxisChar * pName,
const AxisChar * pNamespace);
Modified: webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp (original)
+++ webservices/axis/trunk/c/src/cbindings/IWrapperSoapDeSerializerC.cpp Tue May 2 13:11:06 2006
@@ -103,7 +103,6 @@
void * pDZFunct,
void * pCreFunct,
void * pDelFunct,
- void * pSizeFunct,
const AxiscChar * pName,
const AxiscChar * pNamespace)
{
@@ -116,8 +115,7 @@
tmpObjArray.set((void **)pArray->m_Array, pArray->m_Size, (XSDTYPE)pArray->m_Type);
Axis_Array* pObjArray = dz->getCmplxArray(&tmpObjArray,
- pDZFunct, pCreFunct, pDelFunct, pSizeFunct,
- pName, pNamespace);
+ pDZFunct, pCreFunct, pDelFunct, pName, pNamespace);
return AxisObjectConverter::cppArrayToC(pObjArray, pArray, false);
}
Modified: webservices/axis/trunk/c/src/cbindings/IWrapperSoapSerializerC.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/cbindings/IWrapperSoapSerializerC.cpp?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/cbindings/IWrapperSoapSerializerC.cpp (original)
+++ webservices/axis/trunk/c/src/cbindings/IWrapperSoapSerializerC.cpp Tue May 2 13:11:06 2006
@@ -200,7 +200,6 @@
const Axisc_Array * pArray,
void * pSZFunct,
void * pDelFunct,
- void * pSizeFunct,
const AxiscChar * pName,
const AxiscChar * pNamespace)
{
@@ -208,8 +207,7 @@
try
{
- return sz->addOutputCmplxArrayParam((const Axis_Array*)pArray,pSZFunct,pDelFunct,
- pSizeFunct,pName,pNamespace);
+ return sz->addOutputCmplxArrayParam((const Axis_Array*)pArray,pSZFunct,pDelFunct,pName,pNamespace);
}
catch ( AxisException& e )
{
@@ -304,7 +302,6 @@
const Axisc_Array * pArray,
void * pSZFunct,
void * pDelFunct,
- void * pSizeFunct,
const AxiscChar * pName,
const AxiscChar * pNamespace)
{
@@ -317,8 +314,7 @@
if (pArray && pArray->m_Array)
objArray.set((void **)pArray->m_Array, pArray->m_Size, (XSDTYPE)pArray->m_Type);
- return sz->serializeCmplxArray((const Axis_Array*)&objArray,pSZFunct,pDelFunct,
- pSizeFunct,pName,pNamespace);
+ return sz->serializeCmplxArray((const Axis_Array*)&objArray,pSZFunct,pDelFunct,pName,pNamespace);
}
catch ( AxisException& e )
{
Modified: webservices/axis/trunk/c/src/cbindings/client/CallC.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/cbindings/client/CallC.cpp?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/cbindings/client/CallC.cpp (original)
+++ webservices/axis/trunk/c/src/cbindings/client/CallC.cpp Tue May 2 13:11:06 2006
@@ -354,7 +354,6 @@
Axisc_Array * pArray,
void * pSZFunct,
void * pDelFunct,
- void * pSizeFunct,
const AxiscChar * pName,
const AxiscChar * pNamespace)
{
@@ -364,7 +363,7 @@
try
{
- c->addCmplxArrayParameter((Axis_Array*)pArray,pSZFunct,pDelFunct,pSizeFunct,pName,pNamespace);
+ c->addCmplxArrayParameter((Axis_Array*)pArray,pSZFunct,pDelFunct,pName,pNamespace);
}
catch ( AxisException& e )
{
@@ -1819,7 +1818,6 @@
void * pDZFunct,
void * pCreFunct,
void * pDelFunct,
- void * pSizeFunct,
const AxiscChar * pName,
const AxiscChar * pNamespace)
{
@@ -1836,8 +1834,7 @@
ObjArray.set(pArray->m_Array, pArray->m_Size, (XSDTYPE)pArray->m_Type);
pObjArray = c->getCmplxArray(&ObjArray,
- pDZFunct, pCreFunct,pDelFunct,pSizeFunct,
- pName, pNamespace);
+ pDZFunct, pCreFunct,pDelFunct, pName, pNamespace);
return AxisObjectConverter::cppArrayToC(pObjArray, pArray, false);
}
Modified: webservices/axis/trunk/c/src/common/AxisTrace.h
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/common/AxisTrace.h?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisTrace.h (original)
+++ webservices/axis/trunk/c/src/common/AxisTrace.h Tue May 2 13:11:06 2006
@@ -313,21 +313,6 @@
TRACETYPE_POINTER, 1, (void*)&(arr)); \
}
-#define TRACE_OBJECT_SIZE_FUNCT_ENTRY(funct) \
-{ \
- if (axiscpp::AxisTrace::isTraceOn()) \
- { \
- axiscpp::AxisTrace::traceEntry(NULL, "AXIS_OBJECT_SIZE_FUNCT", (void*)(funct), 0); \
- } \
-}
-
-#define TRACE_OBJECT_SIZE_FUNCT_EXIT(funct, size) \
-{ \
- if (axiscpp::AxisTrace::isTraceOn()) \
- axiscpp::AxisTrace::traceExit(NULL, "AXIS_OBJECT_SIZE_FUNCT", (void*)(funct), 1, \
- TRACETYPE_INT, 1, (void*)&(size)); \
-}
-
#define TRACE_OBJECT_DELETE_FUNCT_ENTRY(funct, arr, size) \
{ \
if (axiscpp::AxisTrace::isTraceOn()) \
@@ -389,8 +374,6 @@
#else
#define TRACE_OBJECT_CREATE_FUNCT_ENTRY(funct, size)
#define TRACE_OBJECT_CREATE_FUNCT_EXIT(funct, arr)
-#define TRACE_OBJECT_SIZE_FUNCT_ENTRY(funct)
-#define TRACE_OBJECT_SIZE_FUNCT_EXIT(funct, size)
#define TRACE_OBJECT_DELETE_FUNCT_ENTRY(funct, arr, size)
#define TRACE_OBJECT_DELETE_FUNCT_EXIT(funct)
#define TRACE_DESERIALIZE_FUNCT_ENTRY(funct, item, that)
Modified: webservices/axis/trunk/c/src/common/ComplexObjectHandler.h
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/common/ComplexObjectHandler.h?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/ComplexObjectHandler.h (original)
+++ webservices/axis/trunk/c/src/common/ComplexObjectHandler.h Tue May 2 13:11:06 2006
@@ -37,7 +37,6 @@
AXIS_OBJECT_CREATE_FUNCT pCreFunct;
AXIS_OBJECT_DELETE_FUNCT pDelFunct;
AXIS_DESERIALIZE_FUNCT pDZFunct;
- AXIS_OBJECT_SIZE_FUNCT pSizeFunct;
AxisString m_TypeName;
AxisString m_URI;
public:
Modified: webservices/axis/trunk/c/src/common/Param.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/common/Param.cpp?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/Param.cpp (original)
+++ webservices/axis/trunk/c/src/common/Param.cpp Tue May 2 13:11:06 2006
@@ -231,8 +231,7 @@
// following function is called to set array of user types.
int Param::setArrayElements (void* pObject,
AXIS_DESERIALIZE_FUNCT pDZFunct,
- AXIS_OBJECT_DELETE_FUNCT pDelFunct,
- AXIS_OBJECT_SIZE_FUNCT pSizeFunct)
+ AXIS_OBJECT_DELETE_FUNCT pDelFunct)
{
if (m_Type != XSD_ARRAY)
return AXIS_FAIL;
@@ -244,7 +243,6 @@
m_Value.pArray->m_value.cta = new ComplexObjectHandler;
m_Value.pArray->m_value.cta->pDZFunct = pDZFunct;
m_Value.pArray->m_value.cta->pDelFunct = pDelFunct;
- m_Value.pArray->m_value.cta->pSizeFunct = pSizeFunct;
m_Value.pArray->m_value.cta->pObject = pObject;
return AXIS_SUCCESS;
}
@@ -286,7 +284,6 @@
pSZFunct = NULL;
pDelFunct = NULL;
pDZFunct = NULL;
- pSizeFunct = NULL;
m_TypeName = "";
m_URI = "";
}
Modified: webservices/axis/trunk/c/src/common/Param.h
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/common/Param.h?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/Param.h (original)
+++ webservices/axis/trunk/c/src/common/Param.h Tue May 2 13:11:06 2006
@@ -70,10 +70,8 @@
void setPrefix(const AxisChar* prefix);
void setURI(const AxisChar* uri);
int setArrayElements(void* pElements);
- int setArrayElements(void* pObject, AXIS_DESERIALIZE_FUNCT pDZFunct,
- AXIS_OBJECT_DELETE_FUNCT pDelFunct, AXIS_OBJECT_SIZE_FUNCT pSizeFunct);
- int setUserType(void* pObject, AXIS_DESERIALIZE_FUNCT pDZFunct,
- AXIS_OBJECT_DELETE_FUNCT pDelFunct);
+ int setArrayElements(void* pObject, AXIS_DESERIALIZE_FUNCT pDZFunct, AXIS_OBJECT_DELETE_FUNCT pDelFunct);
+ int setUserType(void* pObject, AXIS_DESERIALIZE_FUNCT pDZFunct, AXIS_OBJECT_DELETE_FUNCT pDelFunct);
void setName(const AxisChar* sName);
};
Modified: webservices/axis/trunk/c/src/engine/client/Call.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/engine/client/Call.cpp?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/client/Call.cpp (original)
+++ webservices/axis/trunk/c/src/engine/client/Call.cpp Tue May 2 13:11:06 2006
@@ -160,12 +160,11 @@
void Call::addCmplxArrayParameter( Axis_Array * pArray,
void * pSZFunct,
void * pDelFunct,
- void * pSizeFunct,
const AxisChar * pName,
const AxisChar * pNamespace)
{
m_nStatus = m_pIWSSZ->addOutputCmplxArrayParam( pArray,
- pSZFunct, pDelFunct, pSizeFunct,
+ pSZFunct, pDelFunct,
pName, pNamespace);
}
@@ -457,12 +456,11 @@
void* pDZFunct,
void* pCreFunct,
void* pDelFunct,
- void* pSizeFunct,
const AxisChar* pName,
const AxisChar* pNamespace)
{
return m_pIWSDZ->getCmplxArray (pArray,
- pDZFunct, pCreFunct, pDelFunct, pSizeFunct,
+ pDZFunct, pCreFunct, pDelFunct,
pName, pNamespace);
}
Modified: webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp Tue May 2 13:11:06 2006
@@ -513,8 +513,7 @@
void SoapDeSerializer::deserializeLiteralComplexArray(Axis_Array * pArray,
void *pDZFunct,
void *pCreFunct,
- void *pDelFunct,
- void* pSizeFunct,
+ void *pDelFunct,
const AxisChar * pName,
const AxisChar * pNamespace)
{
@@ -532,7 +531,6 @@
void *pDZFunct,
void *pCreFunct,
void *pDelFunct,
- void* pSizeFunct,
const AxisChar * pName,
const AxisChar * pNamespace,
int size)
@@ -552,7 +550,6 @@
void *pDZFunct,
void *pCreFunct,
void *pDelFunct,
- void *pSizeFunct,
const AxisChar * pName,
const AxisChar * pNamespace)
{
@@ -583,7 +580,7 @@
else if (arraySize > 0)
{
deserializeEncodedComplexArray(pArray, pDZFunct, pCreFunct, pDelFunct,
- pSizeFunct, pName, pNamespace, arraySize);
+ pName, pNamespace, arraySize);
if (m_nStatus != AXIS_FAIL)
return pArray;
@@ -592,7 +589,7 @@
else
{
deserializeLiteralComplexArray(pArray, pDZFunct, pCreFunct, pDelFunct,
- pSizeFunct, pName, pNamespace);
+ pName, pNamespace);
if (m_nStatus != AXIS_FAIL)
return pArray;
Modified: webservices/axis/trunk/c/src/soap/SoapDeSerializer.h
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/soap/SoapDeSerializer.h?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapDeSerializer.h (original)
+++ webservices/axis/trunk/c/src/soap/SoapDeSerializer.h Tue May 2 13:11:06 2006
@@ -116,7 +116,7 @@
* Note: returned Axis_Array object is the same object as passed in to this
* method. */
Axis_Array* AXISCALL getCmplxArray(Axis_Array* pArray, void* pDZFunct, void* pCreFunct,
- void* pDelFunct, void* pSizeFunct, const AxisChar* pName,
+ void* pDelFunct, const AxisChar* pName,
const AxisChar* pNamespace);
/* Method used by wrappers to get a deserialized Array of basic types */
Axis_Array* AXISCALL getBasicArray(XSDTYPE nType, const AxisChar* pName,
@@ -314,8 +314,6 @@
xsd__duration * AXISCALL getAttributeAsDuration(const AxisChar* pName,
const AxisChar* pNamespace);
-/* void* CreateArray(XSDTYPE nType, int nSize); */
-/* void DeleteArray(Axis_Array* pArray , XSDTYPE nType); */
void setStyle(AXIS_BINDING_STYLE nStyle){ m_nStyle = nStyle;};
AXIS_BINDING_STYLE getStyle(){return m_nStyle;};
XSDTYPE getXSDType(const AnyElement* pElement);
@@ -362,8 +360,8 @@
xsd__hexBinary decodeFromHexBinary(const AxisChar* pValue);
void deserializeLiteralArray (Axis_Array* pArray, IAnySimpleType* pSimpleType, const AxisChar* pName, const AxisChar* pNamespace);
void deserializeEncodedArray (Axis_Array* pArray, IAnySimpleType* pSimpleType, const AxisChar* pName, const AxisChar* pNamespace, int size);
- void deserializeLiteralComplexArray(Axis_Array * pArray, void *pDZFunct, void *pCreFunct, void *pDelFunct, void* pSizeFunct, const AxisChar * pName, const AxisChar * pNamespace);
- void deserializeEncodedComplexArray(Axis_Array * pArray, void *pDZFunct, void *pCreFunct, void *pDelFunct, void* pSizeFunct, const AxisChar * pName, const AxisChar * pNamespace, int size);
+ void deserializeLiteralComplexArray(Axis_Array * pArray, void *pDZFunct, void *pCreFunct, void *pDelFunct, const AxisChar * pName, const AxisChar * pNamespace);
+ void deserializeEncodedComplexArray(Axis_Array * pArray, void *pDZFunct, void *pCreFunct, void *pDelFunct, const AxisChar * pName, const AxisChar * pNamespace, int size);
LONGLONG strtoll(const char *);
};
Modified: webservices/axis/trunk/c/src/soap/SoapSerializer.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/soap/SoapSerializer.cpp?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapSerializer.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapSerializer.cpp Tue May 2 13:11:06 2006
@@ -187,7 +187,6 @@
int SoapSerializer::addOutputCmplxArrayParam( const Axis_Array * pArray,
void * pSZFunct,
void * pDelFunct,
- void * pSizeFunct,
const AxisChar * pName,
const AxisChar * pNamespace)
{
@@ -195,9 +194,7 @@
Axis_Array * pLocalArray = pArray->clone();
- ArrayBean* pAb = makeArrayBean( pLocalArray->m_Array, pSZFunct,
- pDelFunct,
- pSizeFunct);
+ ArrayBean* pAb = makeArrayBean( pLocalArray->m_Array, pSZFunct, pDelFunct);
pAb->SetDimension( pLocalArray->m_Size);
@@ -584,8 +581,7 @@
*/
ArrayBean * SoapSerializer::makeArrayBean(void ** pObject,
void * pSZFunct,
- void * pDelFunct,
- void * pSizeFunct)
+ void * pDelFunct)
{
ArrayBean* pAb = new ArrayBean();
@@ -593,7 +589,6 @@
pAb->m_value.cta = new ComplexObjectHandler;
pAb->m_value.cta->pSZFunct = (AXIS_SERIALIZE_FUNCT) pSZFunct;
pAb->m_value.cta->pDelFunct = (AXIS_OBJECT_DELETE_FUNCT) pDelFunct;
- pAb->m_value.cta->pSizeFunct = (AXIS_OBJECT_SIZE_FUNCT) pSizeFunct;
pAb->m_value.cta->pObject = pObject;
return pAb;
@@ -648,15 +643,11 @@
*/
int SoapSerializer::serializeCmplxArray( const Axis_Array * pArray,
void * pSZFunct,
- void * pDelFunct,
- void * pSizeFunct,
+ void * pDelFunct,
const AxisChar * pName,
const AxisChar * pNamespace)
{
- ArrayBean * pAb = (ArrayBean*) makeArrayBean( pArray->m_Array,
- pSZFunct,
- pDelFunct,
- pSizeFunct);
+ ArrayBean * pAb = (ArrayBean*) makeArrayBean( pArray->m_Array, pSZFunct, pDelFunct);
pAb->SetDimension( pArray->m_Size);
Modified: webservices/axis/trunk/c/src/soap/SoapSerializer.h
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/soap/SoapSerializer.h?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapSerializer.h (original)
+++ webservices/axis/trunk/c/src/soap/SoapSerializer.h Tue May 2 13:11:06 2006
@@ -129,7 +129,7 @@
/* for arrays of complex types */
int AXISCALL addOutputCmplxArrayParam(const Axis_Array* pArray,
- void* pSZFunct, void* pDelFunct, void* pSizeFunct,
+ void* pSZFunct, void* pDelFunct,
const AxisChar* pName, const AxisChar* pNamespace);
/* for complex types */
@@ -142,7 +142,7 @@
int AXISCALL addFaultDetail( const AxisChar * pDetail);
int AXISCALL serializeCmplxArray(const Axis_Array* pArray, void* pSZFunct,
- void* pDelFunct, void* pSizeFunct, const AxisChar* pName,
+ void* pDelFunct, const AxisChar* pName,
const AxisChar* pNamespace);
int AXISCALL serializeBasicArray(const Axis_Array* pArray, XSDTYPE nType,
@@ -163,8 +163,7 @@
private:
ArrayBean* makeArrayBean(XSDTYPE nType, void** pArray);
- ArrayBean* makeArrayBean(void** pObject, void* pSZFunct, void* pDelFunct,
- void* pSizeFunct);
+ ArrayBean* makeArrayBean(void** pObject, void* pSZFunct, void* pDelFunct);
int setSoapHeader(SoapHeader* pSoapHeader);
public: /* Basic Type Serializing methods */
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ArrayParamHeaderWriter.java Tue May 2 13:11:06 2006
@@ -138,6 +138,12 @@
{
try
{
+ writer.write("\n");
+ writer.write("/* ************************************************************ */\n");
+ writer.write("/* --- Function to create custom type --- */\n");
+ writer.write("/* ************************************************************ */\n");
+ writer.write("\n");
+
this.writer.write("extern void* Axis_Create_" + classname + "(int nSize);\n");
}
catch (IOException e)
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=399031&r1=399030&r2=399031&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 Tue May 2 13:11:06 2006
@@ -61,7 +61,6 @@
writeDeSerializeGlobalMethod();
writeCreateGlobalMethod();
writeDeleteGlobalMethod();
- writeGetSizeGlobalMethod();
}
catch (IOException e)
{
@@ -71,18 +70,6 @@
/**
* @throws IOException
- */
- protected void writeGetSizeGlobalMethod() throws IOException
- {
- writer.write("\n");
- writer.write("/**\n");
- writer.write(" * This static method gives the size of " + classname + " type of object\n");
- writer.write(" */\n");
- writer.write("int Axis_GetSize_" + classname + "(void)\n{\n\treturn sizeof(" + classname + ");\n}\n");
- }
-
- /**
- * @throws IOException
* @throws WrapperFault
*/
private void writeSerializeGlobalMethod() throws IOException, WrapperFault
@@ -298,7 +285,6 @@
+ attribs[i].getParamNameAsMember() + ",\n");
writer.write("\t\t\t\t\t\t (void*) Axis_Serialize_" + arrayType + ",\n");
writer.write("\t\t\t\t\t\t (void*) Axis_Delete_" + arrayType + ",\n");
- writer.write("\t\t\t\t\t\t (void*) Axis_GetSize_" + arrayType + ",\n");
writer.write("\t\t\t\t\t\t \""
+ attribs[i].getElementNameAsString() + "\", " + namespace + ");\n");
}
@@ -506,7 +492,6 @@
+ "\t\t(void*)Axis_DeSerialize_" + arrayType + ",\n"
+ "\t\t(void*)Axis_Create_" + arrayType + ",\n"
+ "\t\t(void*)Axis_Delete_" + arrayType + ",\n"
- + "\t\t(void*)Axis_GetSize_" + arrayType + ",\n"
+ "\t\t\"" + attribs[i].getElementNameAsString() + "\",\n"
+ "\t\tAxis_URI_" + arrayType + ");\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=399031&r1=399030&r2=399031&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 Tue May 2 13:11:06 2006
@@ -357,8 +357,6 @@
+ containedType
+ ", (void*)Axis_Delete_"
+ containedType
- + ", (void*) Axis_GetSize_"
- + containedType
+ ", Axis_TypeName_"
+ containedType
+ ", Axis_URI_"
@@ -457,8 +455,6 @@
+ containedType
+ ", (void*) Axis_Delete_"
+ containedType
- + ", (void*) Axis_GetSize_"
- + containedType
+ ", \""
+ currentType.getParamName()
+ "\", Axis_URI_"
@@ -541,8 +537,6 @@
+ containedType
+ ", (void*) Axis_Delete_"
+ containedType
- + ", (void*) Axis_GetSize_"
- + containedType
+ ", \""
+ returntype.getParamName()
+ "\", 0);\n");
@@ -624,8 +618,7 @@
writer.write("extern void Axis_Delete_" + typeName + "("
+ typeName + "* param, int nSize);\n");
writer.write("extern int Axis_Serialize_" + typeName + "("
- + typeName + "* param, IWrapperSoapSerializer* pSZ, bool bArray);\n");
- writer.write("extern int Axis_GetSize_" + typeName + "(void);\n\n");
+ + typeName + "* param, IWrapperSoapSerializer* pSZ, bool bArray);\n\n");
}
}
catch (IOException e)
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=399031&r1=399030&r2=399031&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 Tue May 2 13:11:06 2006
@@ -384,6 +384,17 @@
}
Iterator itr = typeSet.iterator();
+
+ if (itr.hasNext())
+ {
+ writer.write("\n");
+ writer.write("/* ************************************************************ */\n");
+ writer.write("/* --- Functions to create/delete, serialize/deserialize --- */\n");
+ writer.write("/* --- custom types --- */\n");
+ writer.write("/* ************************************************************ */\n");
+ writer.write("\n");
+ }
+
while (itr.hasNext())
{
typeName = itr.next().toString();
@@ -393,8 +404,7 @@
this.writer.write("extern void Axis_Delete_" + typeName
+ "(" + typeName + "* param, int nSize);\n");
this.writer.write("extern int Axis_Serialize_" + typeName
- + "(" + typeName + "* param, AXISCHANDLE pSZ, AxiscBool bArray);\n");
- this.writer.write("extern int Axis_GetSize_" + typeName + "(void);\n\n");
+ + "(" + typeName + "* param, AXISCHANDLE pSZ, AxiscBool bArray);\n\n");
}
}
catch (IOException e)
@@ -446,7 +456,7 @@
writer.write("\n");
//Local name and the URI for the type
- writer.write("/*Local name and the URI for the type*/\n");
+ writer.write("/* Local name and the URI for the type */\n");
writer.write("static const char* Axis_URI_" + classname + " = \""
+ type.getName().getNamespaceURI() + "\";\n");
writer.write("static const char* Axis_TypeName_" + classname
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=399031&r1=399030&r2=399031&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 Tue May 2 13:11:06 2006
@@ -444,9 +444,7 @@
+ containedType
+ ", (void*)Axis_Delete_"
+ containedType
- + "\n\t\t, (void*)Axis_GetSize_"
- + containedType
- + ", Axis_TypeName_"
+ + "\n\t\t, Axis_TypeName_"
+ containedType
+ ", Axis_URI_"
+ containedType
@@ -527,8 +525,6 @@
+ containedType
+ ", (void*) Axis_Delete_"
+ containedType
- + ", (void*) Axis_GetSize_"
- + containedType
+ ", \""
+ methodName
+ "Return\", Axis_URI_"
@@ -630,8 +626,6 @@
+ containedType
+ ", (void*) Axis_Delete_"
+ containedType
- + ", (void*) Axis_GetSize_"
- + containedType
+ ", \""
+ returnParamName
+ "\", Axis_URI_"
@@ -719,8 +713,7 @@
+ typeName
+ "("
+ typeName
- + "* param, IWrapperSoapSerializer* pSZ, bool bArray);\n");
- writer.write("extern int Axis_GetSize_" + typeName + "(void);\n\n");
+ + "* param, IWrapperSoapSerializer* pSZ, bool bArray);\n\n");
}
}
catch (IOException e)
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubHeaderWriter.java Tue May 2 13:11:06 2006
@@ -54,18 +54,18 @@
try
{
writer.write("\n");
- writer.write("/* ****************************************************** */\n");
- writer.write("/* --- Functions relating to web service client proxy --- */\n");
- writer.write("/* ****************************************************** */\n");
+ writer.write("/* ************************************************************ */\n");
+ writer.write("/* --- Functions relating to web service client proxy --- */\n");
+ writer.write("/* ************************************************************ */\n");
writer.write("\n");
writer.write("extern AXISCHANDLE get_" + classname + "_stub(const char* pchEndPointUri);\n");
writer.write("extern void destroy_" + classname + "_stub(AXISCHANDLE pStub);\n");
writer.write("extern int get_" + classname + "_Status(AXISCHANDLE pStub);\n");
writer.write("\n");
- writer.write("/* ****************************************************** */\n");
- writer.write("/* --- Functions relating to web service methods --- */\n");
- writer.write("/* ****************************************************** */\n");
+ writer.write("/* ************************************************************ */\n");
+ writer.write("/* --- Functions relating to web service methods --- */\n");
+ writer.write("/* ************************************************************ */\n");
writer.write("\n");
for (int i = 0; i < methods.size(); i++)
Modified: webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java?rev=399031&r1=399030&r2=399031&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java (original)
+++ webservices/axis/trunk/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ClientStubWriter.java Tue May 2 13:11:06 2006
@@ -536,8 +536,7 @@
writer.write ("Value" + i +
", (void*)Axis_Serialize_" + containedType +
", (void*)Axis_Delete_" + containedType +
- ", (void*) Axis_GetSize_" + containedType + ", \"" +
- parameterName + "\"" + ", ");
+ ", \"" + parameterName + "\"" + ", ");
if (namespace.length () == 0)
writer.write ("NULL");
@@ -662,7 +661,6 @@
+ ", (void*) Axis_DeSerialize_" + containedType
+ ", (void*) Axis_Create_" + containedType
+ ", (void*) Axis_Delete_" + containedType
- + ", (void*) Axis_GetSize_" + containedType
+ ", \"" + currentType.getElementNameAsString ()
+ "\", Axis_URI_" + containedType + ");\n");
@@ -677,7 +675,6 @@
+ ", (void*) Axis_DeSerialize_" + containedType
+ ", (void*) Axis_Create_" + containedType
+ ", (void*) Axis_Delete_" + containedType
- + ", (void*) Axis_GetSize_" + containedType
+ ", \"" + currentType.getElementNameAsString ()
+ "\", Axis_URI_" + containedType + ");\n");
writer.write("\t\t\t\tdelete pTemp" + i + ";\n");
@@ -813,7 +810,6 @@
+ containedType
+ ", (void*) Axis_Create_" + containedType
+ ", (void*) Axis_Delete_" + containedType
- + ", (void*) Axis_GetSize_" + containedType
+ ", \"" + returntype.getElementNameAsString ()
+ "\", Axis_URI_" + containedType + ");\n");
}
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=399031&r1=399030&r2=399031&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 Tue May 2 13:11:06 2006
@@ -295,8 +295,7 @@
+ containedType
+ "\n\t\t, (void*)Axis_Create_" + containedType
+ ", (void*)Axis_Delete_" + containedType
- + "\n\t\t, (void*)Axis_GetSize_" + containedType
- + ", \""
+ + "\n\t\t, \""
+ elementName
+ "\", Axis_URI_" + containedType
+ ");\n");
@@ -382,7 +381,6 @@
"\treturn SZ._functions->addOutputCmplxArrayParam(SZ._object, (Axis_Array*)(&ret), (void*) Axis_Serialize_"
+ containedType
+ ", (void*) Axis_Delete_" + containedType
- + ", (void*) Axis_GetSize_" + containedType
+ ", \""
+ returnParamName
+ "\", Axis_URI_" + containedType
@@ -476,7 +474,6 @@
+ i + "),"
+ "(void*) Axis_Serialize_" + containedType
+ ", (void*) Axis_Delete_" + containedType
- + ", (void*) Axis_GetSize_" + containedType
+ ", \""
+ returnParamName
+ "\", Axis_URI_" + containedType
@@ -562,8 +559,7 @@
+ "(" + typeName + "* param, int nSize);\n");
writer.write(
"extern int Axis_Serialize_" + typeName
- + "(" + typeName + "* param, IWrapperSoapSerializer* pSZ, bool bArray);\n");
- writer.write("extern int Axis_GetSize_" + typeName + "(void);\n\n");
+ + "(" + typeName + "* param, IWrapperSoapSerializer* pSZ, bool bArray);\n\n");
}
}
catch (IOException e)
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=399031&r1=399030&r2=399031&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 Tue May 2 13:11:06 2006
@@ -87,8 +87,7 @@
writer.write("extern void Axis_Delete_" + typeName + "("
+ typeName + "* param, 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");
+ + typeName + "* param, IWrapperSoapSerializer* pSZ, bool bArray = false);\n\n");
}
else
{
@@ -99,8 +98,7 @@
+ typeName + "* param, int nSize);\n");
writer.write("int Axis_Serialize_" + typeName
+ "(" + typeName
- + "* param, IWrapperSoapSerializer* pSZ, bool bArray);\n");
- writer.write("int Axis_GetSize_" + typeName + "();\n\n");
+ + "* param, IWrapperSoapSerializer* pSZ, bool bArray);\n\n");
}
}
@@ -109,7 +107,6 @@
writeDeSerializeGlobalMethod();
writeCreateGlobalMethod();
writeDeleteGlobalMethod();
- writeGetSizeGlobalMethod();
}
catch (IOException e)
{
@@ -401,14 +398,6 @@
}
- private void writeGetSizeGlobalMethod() throws IOException
- {
- writer.write("/*\n");
- writer.write(" * This static method gives the size of " + classname + " type of object\n");
- writer.write(" */\n");
- writer.write("int Axis_GetSize_" + classname + "()\n{\n\treturn sizeof(" + classname + ");\n}\n");
- }
-
private void writeSerializeGlobalMethod() throws IOException, WrapperFault
{
writer.write( "/*\n");
@@ -625,7 +614,6 @@
+ attribs[i].getParamNameAsMember() + ",\n");
writer.write("\t\t\t\t\t\t (void*) Axis_Serialize_" + arrayType + ",\n");
writer.write("\t\t\t\t\t\t (void*) Axis_Delete_" + arrayType + ",\n");
- writer.write("\t\t\t\t\t\t (void*) Axis_GetSize_" + arrayType + ",\n");
writer.write("\t\t\t\t\t\t \""
+ attribs[i].getElementNameAsString() + "\", " + namespace + ");\n");
}
@@ -923,7 +911,6 @@
+ arrayType + ",\n"
+ "\t\t\t\t\t\t\t\t (void*)Axis_Create_" + arrayType + ",\n"
+ "\t\t\t\t\t\t\t\t (void*)Axis_Delete_" + arrayType + ",\n"
- + "\t\t\t\t\t\t\t\t (void*)Axis_GetSize_" + arrayType + ",\n"
+ "\t\t\t\t\t\t\t\t \""
+ attribs[i].getElementNameAsString()
+ "\", Axis_URI_" + arrayType + ");\n\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=399031&r1=399030&r2=399031&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 Tue May 2 13:11:06 2006
@@ -441,7 +441,6 @@
writer.write("Value" + i
+ ",\n\t\t\t\t\t\t\t\t\t\t(void *) Axis_Serialize_" + containedType
+ ",\n\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(void *) Axis_GetSize_" + containedType
+ ",\n\t\t\t\t\t\t\t\t\t\t\"" + ((ParameterInfo) paramsB.get(i)).getParamName() + "\""
+ ",\n\t\t\t\t\t\t\t\t\t\tAxis_URI_" + containedType);
}
@@ -579,7 +578,6 @@
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
+ ",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"" +currentType.getElementNameAsString() +
"\",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tAxis_URI_" + containedType +
");\n");
@@ -592,7 +590,6 @@
+ containedType);
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
+ ",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"" + currentType.getElementNameAsString() +
"\",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tAxis_URI_" + containedType +
");\n");
@@ -711,7 +708,6 @@
//damitha
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
+ ",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"" + paramTagName
+ "\",\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\tAxis_URI_" + containedType + ");\n");
}
@@ -969,8 +965,7 @@
+ typeName + "* param, 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");
+ + "* param, IWrapperSoapSerializer* pSZ, bool bArray = false);\n\n");
}
} catch (IOException e)
{
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=399031&r1=399030&r2=399031&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 Tue May 2 13:11:06 2006
@@ -458,9 +458,7 @@
+ containedType
+ ", (void*)Axis_Delete_"
+ containedType
- + ",\n\t\t(void*)Axis_GetSize_"
- + containedType
- + ", \""
+ + ",\n\t\t \""
+ parameterName
+ "\", Axis_URI_"
+ containedType
@@ -587,8 +585,6 @@
+ containedType
+ ", (void*) Axis_Delete_"
+ containedType
- + ", (void*) Axis_GetSize_"
- + containedType
+ ", \""
+ methodName
+ "Return\", Axis_URI_"
@@ -720,8 +716,6 @@
+ containedType
+ ", (void*) Axis_Delete_"
+ containedType
- + ", (void*) Axis_GetSize_"
- + containedType
+ ", \""
+ returnParamName
+ "\", Axis_URI_"
@@ -904,8 +898,7 @@
writer.write("extern void Axis_Delete_" + typeName
+ "(" + typeName + "* param, 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");
+ + "(" + typeName + "* param, IWrapperSoapSerializer* pSZ, bool bArray = false);\n\n");
}
}
catch (IOException e)
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=399031&r1=399030&r2=399031&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 Tue May 2 13:11:06 2006
@@ -541,8 +541,7 @@
writer.write ("Value" + i +
", (void*)Axis_Serialize_" + containedType +
", (void*)Axis_Delete_" + containedType +
- ", (void*) Axis_GetSize_" + containedType + ", \"" +
- parameterName + "\"" + ", ");
+ ", \"" + parameterName + "\"" + ", ");
if (namespace.length () == 0)
writer.write ("NULL");
@@ -677,7 +676,6 @@
+ ", (void*) Axis_DeSerialize_" + containedType
+ ", (void*) Axis_Create_" + containedType
+ ", (void*) Axis_Delete_" + containedType
- + ", (void*) Axis_GetSize_" + containedType
+ ", \"" + currentType.getElementNameAsString ()
+ "\", Axis_URI_" + containedType + ");\n");
writer.write("\t\t\t}\n");
@@ -690,7 +688,6 @@
+ ", (void*) Axis_DeSerialize_" + containedType
+ ", (void*) Axis_Create_" + containedType
+ ", (void*) Axis_Delete_" + containedType
- + ", (void*) Axis_GetSize_" + containedType
+ ", \"" + currentType.getElementNameAsString ()
+ "\", Axis_URI_" + containedType + ");\n");
writer.write("\t\t\t\tdelete pTemp" + i + ";\n");
@@ -821,7 +818,6 @@
+ containedType
+ ", (void*) Axis_Create_" + containedType
+ ", (void*) Axis_Delete_" + containedType
- + ", (void*) Axis_GetSize_" + containedType
+ ", \"" + returntype.getElementNameAsString ()
+ "\", Axis_URI_" + containedType + ");\n");
}
@@ -1149,8 +1145,7 @@
writer.write ("extern void Axis_Delete_" + typeName + "(" +
typeName + "* param, 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");
+ typeName + "* param, IWrapperSoapSerializer* pSZ, bool bArray = false);\n\n");
}
}
catch (IOException e)
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=399031&r1=399030&r2=399031&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 Tue May 2 13:11:06 2006
@@ -287,8 +287,7 @@
+ "pIWSDZ->getCmplxArray(v" + i + ", (void*)Axis_DeSerialize_" + containedType
+ ",\n\t\t(void*)Axis_Create_" + containedType
+ ", (void*)Axis_Delete_" + containedType
- + ",\n\t\t(void*)Axis_GetSize_" + containedType
- + ", \"" + elementName + "\", Axis_URI_" + containedType + ");\n");
+ + ",\n\t\t \"" + elementName + "\", Axis_URI_" + containedType + ");\n");
}
}
else if (param.isAnyType())
@@ -413,7 +412,6 @@
writer.write("\t\tnStatus = pIWSSZ->addOutputCmplxArrayParam(ret,"
+ "(void*) Axis_Serialize_" + containedType
+ ", (void*) Axis_Delete_" + containedType
- + ", (void*) Axis_GetSize_" + containedType
+ ", \"" + returnParamName
+ "\", Axis_URI_" + containedType + ");\n");
writer.write("\t\tdelete ret;\n");
@@ -536,7 +534,6 @@
writer.write("\tpIWSSZ->addOutputCmplxArrayParam((Axis_Array*)(&out" + i + "),"
+ "(void*) Axis_Serialize_" + containedType
+ ", (void*) Axis_Delete_" + containedType
- + ", (void*) Axis_GetSize_" + containedType
+ ", \"" + returnParamName + "\", Axis_URI_" + containedType + ");\n");
writer.write("\tdelete out" + i + ";\n");
}
@@ -701,8 +698,7 @@
writer.write("extern void Axis_Delete_" + typeName + "("
+ typeName + "* param, 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");
+ + typeName + "* param, IWrapperSoapSerializer* pSZ, bool bArray = false);\n\n");
}
}
catch (IOException e)