axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ros...@apache.org
Subject cvs commit: ws-axis/c/src/soap SoapHeader.cpp SoapHeader.h SoapSerializer.cpp SoapSerializer.h
Date Thu, 13 Jan 2005 14:05:42 GMT
roshan      2005/01/13 06:05:42

  Modified:    c/include/axis IHandlerSoapSerializer.hpp
               c/src/soap SoapHeader.cpp SoapHeader.h SoapSerializer.cpp
                        SoapSerializer.h
  Log:
  added getCurrentHeaderBlock method and commented getHeaderBlock method
  
  Revision  Changes    Path
  1.4       +12 -0     ws-axis/c/include/axis/IHandlerSoapSerializer.hpp
  
  Index: IHandlerSoapSerializer.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/include/axis/IHandlerSoapSerializer.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- IHandlerSoapSerializer.hpp	5 Jan 2005 10:39:02 -0000	1.3
  +++ IHandlerSoapSerializer.hpp	13 Jan 2005 14:05:42 -0000	1.4
  @@ -93,7 +93,11 @@
   	  * Serializer.The caller of this method should not delete the returned 
   	  * pointer object.
   	  */
  +	/*
  +	 * TO DO: Have to remove this method from this api. Logged this msg on
  +	 *  13Jan2005.
   	virtual IHeaderBlock* getHeaderBlock() = 0;
  +	*/
   
   	/**
   	  * Gets and returns the Header Block of the given local name and 
  @@ -115,6 +119,14 @@
         * or NULL if there are no headers.
         */
        virtual IHeaderBlock* getNextHeaderBlock()=0;
  +
  +	 /**
  +      * Used with getFirstHeaderBlock, it returns the current header block,
  +      * or NULL if:
  +	  *  - there are no headers, 
  +	  *  - or if the getFirstHeaderBlock method is not called at least once.
  +      */
  +     virtual IHeaderBlock* getCurrentHeaderBlock()=0;
   
       /*
        * A handler may get the entire soap body and encrypt/compress 
  
  
  
  1.33      +15 -2     ws-axis/c/src/soap/SoapHeader.cpp
  
  Index: SoapHeader.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapHeader.cpp,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- SoapHeader.cpp	17 Dec 2004 11:49:46 -0000	1.32
  +++ SoapHeader.cpp	13 Jan 2005 14:05:42 -0000	1.33
  @@ -42,7 +42,7 @@
   
   SoapHeader::SoapHeader()
   {
  -
  +	m_itHeaderBlocks = NULL;
   }
   
   SoapHeader::~SoapHeader()
  @@ -268,4 +268,17 @@
   	return tmpIHeaderBlock;
   }
   
  -AXIS_CPP_NAMESPACE_END
  +IHeaderBlock* SoapHeader::getCurrentHeaderBlock()
  +{
  +	if (m_itHeaderBlocks == NULL) {
  +		return NULL;
  +	} else {
  +		IHeaderBlock* tmpIHeaderBlock=NULL;
  +		if (m_itHeaderBlocks != m_headerBlocks.end())
  +			tmpIHeaderBlock = *m_itHeaderBlocks;
  +
  +		return tmpIHeaderBlock;
  +	}
  +}
  +
  +AXIS_CPP_NAMESPACE_END
  \ No newline at end of file
  
  
  
  1.14      +1 -0      ws-axis/c/src/soap/SoapHeader.h
  
  Index: SoapHeader.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapHeader.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SoapHeader.h	22 Nov 2004 11:13:38 -0000	1.13
  +++ SoapHeader.h	13 Jan 2005 14:05:42 -0000	1.14
  @@ -75,6 +75,7 @@
       
       const char* m_pcPrefix;
   public:
  +	IHeaderBlock* getCurrentHeaderBlock();
       /**
         * Gets and returns the Header Block, of the given name.
         *
  
  
  
  1.85      +16 -3     ws-axis/c/src/soap/SoapSerializer.cpp
  
  Index: SoapSerializer.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.cpp,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- SoapSerializer.cpp	9 Jan 2005 12:20:35 -0000	1.84
  +++ SoapSerializer.cpp	13 Jan 2005 14:05:42 -0000	1.85
  @@ -796,9 +796,14 @@
   
   int SoapSerializer::setSOAPMethodAttribute(Attribute *pAttribute)
   {
  -	m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod->addAttribute(pAttribute);
  +	if(m_pSoapEnvelope && (m_pSoapEnvelope->m_pSoapBody) && (m_pSoapEnvelope->
  +        m_pSoapBody->m_pSoapMethod))
  +    {
  +		m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod->addAttribute(pAttribute);
  +		return AXIS_SUCCESS;
  +	}
   
  -	return AXIS_SUCCESS;
  +	return AXIS_FAIL;
   }
   
   int SoapSerializer::serializeAnyObject(AnyType* pAnyObject)
  @@ -824,13 +829,16 @@
       return AXIS_SUCCESS;
   }
   
  -
  +/*
  + * TODO: Have to remove this method. Date logged 13Jan2005
  + 
   IHeaderBlock* SoapSerializer::getHeaderBlock()
   {
       if ((!m_pSoapEnvelope) || (!m_pSoapEnvelope->m_pSoapHeader)) return NULL;
   
       return (HeaderBlock*)m_pSoapEnvelope->m_pSoapHeader->getHeaderBlock(false);	
   }
  +*/
   
   IHeaderBlock* SoapSerializer::getHeaderBlock(const AxisChar *pcName, 
   											 const AxisChar *pcNamespace)
  @@ -991,6 +999,11 @@
   	SoapAttachment* pSAttch = new SoapAttachment();
   
   	return pSAttch;
  +}
  +
  +IHeaderBlock* SoapSerializer::getCurrentHeaderBlock()
  +{
  +	return m_pSoapEnvelope->m_pSoapHeader->getCurrentHeaderBlock();
   }
   
   AXIS_CPP_NAMESPACE_END
  
  
  
  1.36      +4 -0      ws-axis/c/src/soap/SoapSerializer.h
  
  Index: SoapSerializer.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.h,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- SoapSerializer.h	7 Jan 2005 08:55:19 -0000	1.35
  +++ SoapSerializer.h	13 Jan 2005 14:05:42 -0000	1.36
  @@ -156,6 +156,7 @@
       BasicTypeSerializer m_BTSZ;
       SOAPTransport* m_pOutputStream;
   public:
  +	IHeaderBlock* getCurrentHeaderBlock();
   	ISoapAttachment* createSoapAttachement();
   	void addNamespaceToNamespaceList(const AxisChar *pachNamespaceURI, const AxisChar* pachPrefix);
   	void addNamespaceToEnvelope(AxisChar *pachNamespaceURI, AxisChar* pachPrefix);
  @@ -163,7 +164,10 @@
   	void addAttachmentHeader(const AxisChar* achId, const AxisChar* achHeaderName, const AxisChar*
achHeaderValue);
   	void addAttachment(const AxisChar* achId, ISoapAttachment* pAttach);
   	IHeaderBlock* getHeaderBlock(const AxisChar* pcName, const AxisChar* pcNamespace);
  +	/*
  +	* TODO: Have to remove this method. Date logged 13Jan2005
   	IHeaderBlock* getHeaderBlock();
  +	*/
   	IHeaderBlock* getFirstHeaderBlock();
   	IHeaderBlock* getNextHeaderBlock();
   
  
  
  

Mime
View raw message