axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hawk...@apache.org
Subject cvs commit: ws-axis/c/src/server/apache2 AttachmentHelper.h Apache2Transport.cpp Apache2Transport.h
Date Mon, 24 Jan 2005 20:46:22 GMT
hawkeye     2005/01/24 12:46:22

  Modified:    c/src/server/apache2 AttachmentHelper.h Apache2Transport.cpp
                        Apache2Transport.h
  Log:
  Removed attachment helper from these files as it broke both windows and AIX.
  
  Revision  Changes    Path
  1.2       +52 -52    ws-axis/c/src/server/apache2/AttachmentHelper.h
  
  Index: AttachmentHelper.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/apache2/AttachmentHelper.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AttachmentHelper.h	21 Jan 2005 12:42:36 -0000	1.1
  +++ AttachmentHelper.h	24 Jan 2005 20:46:22 -0000	1.2
  @@ -1,52 +1,52 @@
  -// AttachmentHelper.h: interface for the AttachmentHelper class.
  -//
  -//////////////////////////////////////////////////////////////////////
  -
  -#if !defined(AFX_ATTACHMENTHELPER_H__F133843A_6A8F_4443_9DCC_850C7DEEFB7E__INCLUDED_)
  -#define AFX_ATTACHMENTHELPER_H__F133843A_6A8F_4443_9DCC_850C7DEEFB7E__INCLUDED_
  -
  -#if _MSC_VER > 1000
  -#pragma once
  -#endif // _MSC_VER > 1000
  -
  -#pragma warning( disable : 4786 )
  -
  -#include <string>
  -#include <map>
  -#include <axis/ISoapAttachment.hpp>
  -#include "../../soap/SoapAttachment.hpp"
  -
  -using namespace std;
  -AXIS_CPP_NAMESPACE_USE
  -
  -/*
  -struct ltstr
  -{
  -         //bool operator()(const string* s1, const string* s2) const
  -		 bool operator()(const char* s1, const char* s2) const
  -         {
  -          //return strcmp(s1->c_str() , s2->c_str()) < 0;
  -		  return strcmp(s1 , s2) < 0;
  -         }
  -};
  -*/
  -
  -class AttachmentHelper  
  -{
  -private:
  -	map<const string, ISoapAttachment*> mymap;
  -	map<const string, ISoapAttachment*>::iterator iter;
  -	char* pMime;
  -public:
  -	char* getIncomingSOAPMimeHeaders();
  -	ISoapAttachment* getAttachment (const char* pcAttchId);
  -	void extract_info(string header,const char* label,SoapAttachment* pSoapAttachment);
  -	void extract_SOAPMimeHeaders(char* pBuffer);
  -	void extract_Soap (char* pBuffer);
  -	void extract_Attachment (char* pBuffer);
  -	AttachmentHelper();
  -	virtual ~AttachmentHelper();
  -
  -};
  -
  -#endif // !defined(AFX_ATTACHMENTHELPER_H__F133843A_6A8F_4443_9DCC_850C7DEEFB7E__INCLUDED_)
  +// AttachmentHelper.h: interface for the AttachmentHelper class.
  +//
  +//////////////////////////////////////////////////////////////////////
  +
  +#if !defined(AFX_ATTACHMENTHELPER_H__F133843A_6A8F_4443_9DCC_850C7DEEFB7E__INCLUDED_)
  +#define AFX_ATTACHMENTHELPER_H__F133843A_6A8F_4443_9DCC_850C7DEEFB7E__INCLUDED_
  +
  +#if _MSC_VER > 1000
  +#pragma once
  +#endif // _MSC_VER > 1000
  +
  +#pragma warning( disable : 4786 )
  +
  +#include <string>
  +#include <map>
  +#include <axis/ISoapAttachment.hpp>
  +#include "../../soap/SoapAttachment.hpp"
  +
  +using namespace std;
  +AXIS_CPP_NAMESPACE_USE
  +
  +/*
  +struct ltstr
  +{
  +         //bool operator()(const string* s1, const string* s2) const
  +		 bool operator()(const char* s1, const char* s2) const
  +         {
  +          //return strcmp(s1->c_str() , s2->c_str()) < 0;
  +		  return strcmp(s1 , s2) < 0;
  +         }
  +};
  +*/
  +
  +class AttachmentHelper  
  +{
  +private:
  +	map<const string, ISoapAttachment*> mymap;
  +//	map<const string, ISoapAttachment*>::iterator iter;
  +	char* pMime;
  +public:
  +	char* getIncomingSOAPMimeHeaders();
  +	ISoapAttachment* getAttachment (const char* pcAttchId);
  +	void extract_info(string header,const char* label,SoapAttachment* pSoapAttachment);
  +	void extract_SOAPMimeHeaders(char* pBuffer);
  +	void extract_Soap (char* pBuffer);
  +	void extract_Attachment (char* pBuffer);
  +	AttachmentHelper();
  +	virtual ~AttachmentHelper();
  +
  +};
  +
  +#endif // !defined(AFX_ATTACHMENTHELPER_H__F133843A_6A8F_4443_9DCC_850C7DEEFB7E__INCLUDED_)
  
  
  
  1.5       +9 -7      ws-axis/c/src/server/apache2/Apache2Transport.cpp
  
  Index: Apache2Transport.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/apache2/Apache2Transport.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Apache2Transport.cpp	21 Jan 2005 12:26:14 -0000	1.4
  +++ Apache2Transport.cpp	24 Jan 2005 20:46:22 -0000	1.5
  @@ -153,13 +153,13 @@
       len_read = ap_get_client_block((request_rec*) m_pContext, pBuffer, *piSize);
   	
    	if (strstr(pBuffer, "Content-Id")) {
  -		pAttachmentHelper = new AttachmentHelper();
  +//		pAttachmentHelper = new AttachmentHelper();
   		char *pAttachBuffer = (char*)malloc(1000);
   		char *mimeBoundary = (char*)malloc(1000);		
   
  -		pAttachmentHelper->extract_Attachment(pBuffer);		
  -		pAttachmentHelper->extract_SOAPMimeHeaders(pBuffer);	
  -		pAttachmentHelper->extract_Soap(pBuffer);
  +//		pAttachmentHelper->extract_Attachment(pBuffer);		
  +//		pAttachmentHelper->extract_SOAPMimeHeaders(pBuffer);	
  +//		pAttachmentHelper->extract_Soap(pBuffer);
   				
   	}
   
  @@ -296,11 +296,13 @@
   
   ISoapAttachment*  Apache2Transport::getAttachment(const char* pcAttachmentid)
   {		
  -	ISoapAttachment* pAttch = pAttachmentHelper->getAttachment(pcAttachmentid);
  -	return pAttch;
  +//	ISoapAttachment* pAttch = pAttachmentHelper->getAttachment(pcAttachmentid);
  +//	return pAttch;
  +	return NULL;
   };
   
   char* Apache2Transport::getIncomingSOAPMimeHeaders()
   {
  -	return pAttachmentHelper->getIncomingSOAPMimeHeaders();
  +	// return pAttachmentHelper->getIncomingSOAPMimeHeaders();
  +	return NULL;
   }
  
  
  
  1.11      +2 -2      ws-axis/c/src/server/apache2/Apache2Transport.h
  
  Index: Apache2Transport.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/server/apache2/Apache2Transport.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Apache2Transport.h	21 Jan 2005 12:26:14 -0000	1.10
  +++ Apache2Transport.h	24 Jan 2005 20:46:22 -0000	1.11
  @@ -47,7 +47,7 @@
   #include <string.h>
   #endif
   
  -#include "AttachmentHelper.h"
  +//#include "AttachmentHelper.h"
   #include <axis/ISoapAttachment.hpp>
   
   AXIS_CPP_NAMESPACE_USE
  @@ -89,7 +89,7 @@
       void setTimeout(const long lSeconds) {};
   
   private:
  -	AttachmentHelper* pAttachmentHelper;
  +//	AttachmentHelper* pAttachmentHelper;
   	void* m_pContext;
   #ifndef CHUNCKED_DATA_SUPPORTED
       BufferInfo* m_pBuffers;
  
  
  

Mime
View raw message