axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject cvs commit: ws-axis/c/src/soap HeaderBlock.cpp HeaderBlock.h SoapBody.cpp SoapBody.h SoapEnvelope.cpp SoapEnvelope.h SoapFault.cpp SoapFault.h SoapHeader.cpp SoapHeader.h SoapKeywordMapping.cpp SoapKeywordMapping.h SoapMethod.cpp SoapMethod.h URIMapping.h
Date Thu, 09 Jun 2005 05:05:54 GMT
samisa      2005/06/08 22:05:54

  Modified:    c/src/soap HeaderBlock.cpp HeaderBlock.h SoapBody.cpp
                        SoapBody.h SoapEnvelope.cpp SoapEnvelope.h
                        SoapFault.cpp SoapFault.h SoapHeader.cpp
                        SoapHeader.h SoapKeywordMapping.cpp
                        SoapKeywordMapping.h SoapMethod.cpp SoapMethod.h
                        URIMapping.h
  Log:
  Removed some commented unwanted lines in the code to beautify the code
  
  Revision  Changes    Path
  1.64      +3 -82     ws-axis/c/src/soap/HeaderBlock.cpp
  
  Index: HeaderBlock.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/HeaderBlock.cpp,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- HeaderBlock.cpp	23 Mar 2005 15:44:59 -0000	1.63
  +++ HeaderBlock.cpp	9 Jun 2005 05:05:54 -0000	1.64
  @@ -30,25 +30,6 @@
   
   /* HeaderBlock.cpp: implementation of the HeaderBlock class. */
   
  -/*
  - * Revision 1.1  2004/07/01 roshan
  - * Added code to "addChild" method to deal with a null child.
  - * Added code to createImmediateChild(NODE_TYPE eNODE_TYPE,
  - *                                            AxisChar *pachLocalName,
  - *                                            AxisChar *pachPrefix,
  - *                                            AxisChar *pachUri,
  - *                                            AxisChar* pachValue)
  - *  to deal with null localname and namespace uri.
  - * Added code to addAttribute(Attribute* pAttr) to deal with null values.
  - * Added code to createAttribute(const AxisChar *localname,
  - *                                        const AxisChar *prefix,
  - *                                       const AxisChar *value)
  - *  to deal with null values.
  - * Added code to addNamespaceDecl(Attribute *pAttribute) to deal with NULL
  - *  null values.
  - */
  -
  -
   #ifdef WIN32
   #pragma warning (disable : 4786)
   #endif
  @@ -116,9 +97,7 @@
   
   HeaderBlock::~HeaderBlock()
   {
  -    /*
  -     *Clear the Attributes
  -     */
  +    // Clear the Attributes
       list<Attribute*>::iterator itCurrAttribute= m_attributes.begin();
       while(itCurrAttribute != m_attributes.end())
       {        
  @@ -127,9 +106,7 @@
       }
       m_attributes.clear();
   
  -    /*
  -     *Clear the Namespaces
  -     */
  +    // Clear the Namespaces
       list<Namespace*>::iterator itCurrNamespace= m_namespaceDecls.begin();
       while(itCurrNamespace != m_namespaceDecls.end())
       {        
  @@ -138,9 +115,7 @@
       }
       m_namespaceDecls.clear();
   
  -    /*
  -     *Clear the children
  -     */
  +    // Clear the children
       list<BasicNode*>::iterator itCurrChild= m_children.begin();
       while(itCurrChild != m_children.end())
       {        
  @@ -458,22 +433,6 @@
   	}
   }
   
  -/* TO DO: We need to remove this completely
  -*
  -int HeaderBlock::addNamespaceDecl(INamespace *pNamespace)
  -{
  -    if (pNamespace)
  -    {
  -        m_namespaceDecls.push_back((Namespace*)pNamespace);
  -        return AXIS_SUCCESS;
  -    }
  -    else
  -    {
  -        return AXIS_FAIL;
  -    }
  -}
  -*/
  -
   int HeaderBlock::serializeNamespaceDecl(SoapSerializer &pSZ, std::list<AxisChar*>&
lstTmpNameSpaceStack)
   {
       list<Namespace*>::iterator itCurrNamespaceDecl= m_namespaceDecls.begin();
  @@ -546,44 +505,6 @@
       return pBasicNode;
   }
   
  -#ifdef UNIT_TESTING_ON
  -int HeaderBlock::initializeForTesting()
  -{
  -    setPrefix("m");
  -    setLocalName("reservation");
  -    setURI("http://travelcompany.example.org/reservation");
  -
  -    Attribute* pAttribute2 = new Attribute(m_attributes);
  -    pAttribute2->setPrefix("SOAP-ENV");
  -    pAttribute2->setLocalName("role");
  -    pAttribute2->setValue("http://www.w3.org/2003/05/soap-envelope/role/next");
  -
  -    Attribute* pAttribute3 = new Attribute(m_attributes);
  -    pAttribute3->setPrefix("SOAP-ENV");
  -    pAttribute3->setLocalName("mustUnderstand");
  -    pAttribute3->setValue("true");
  -
  -    addAttribute(pAttribute2);
  -    addAttribute(pAttribute3);
  -
  -    ComplexElement* pComplexElement = new ComplexElement();
  -    pComplexElement->setPrefix("m");
  -    pComplexElement->setLocalName("reference");
  -    pComplexElement->addChild(new CharacterElement("abcdefgh"));
  -
  -    ComplexElement* pComplexElement2 = new ComplexElement();
  -    pComplexElement2->setPrefix("m");
  -    pComplexElement2->setLocalName("dateAndTime");
  -    pComplexElement2->addChild(new 
  -        CharacterElement("2001-11-29T13:20:00.000-05:00"));
  -
  -    addChild(pComplexElement);
  -    addChild(pComplexElement2);
  -
  -    return AXIS_SUCCESS;    
  -}
  -#endif
  -
   bool HeaderBlock::operator ==( const HeaderBlock &objHeaderBlock)
   {
       /*
  
  
  
  1.30      +0 -3      ws-axis/c/src/soap/HeaderBlock.h
  
  Index: HeaderBlock.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/HeaderBlock.h,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- HeaderBlock.h	23 Mar 2005 15:44:59 -0000	1.29
  +++ HeaderBlock.h	9 Jun 2005 05:05:54 -0000	1.30
  @@ -107,9 +107,6 @@
           AxisChar *pachLocalName, AxisChar *pachPrefix, AxisChar *pachUri, 
           AxisChar* pachValue);
   
  -#ifdef UNIT_TESTING_ON
  -    int initializeForTesting();
  -#endif
       BasicNode* createImmediateChild(NODE_TYPE eNODE_TYPE, 
           AxisChar *pachLocalName, AxisChar *pachPrefix, AxisChar *pachUri, 
           AxisChar* pachValue);
  
  
  
  1.34      +0 -21     ws-axis/c/src/soap/SoapBody.cpp
  
  Index: SoapBody.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapBody.cpp,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- SoapBody.cpp	17 Dec 2004 11:49:45 -0000	1.33
  +++ SoapBody.cpp	9 Jun 2005 05:05:54 -0000	1.34
  @@ -20,22 +20,12 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    *
  - *
  - *
  - *
    * @author Roshan Weerasuriya (roshan@opensource.lk, roshanw@jkcsworld.com)
    *
    */
   
   /* SoapBody.cpp: implementation of the SoapBody class. */
   
  -/*
  - * Revision 1.1  2004/June/02 roshan
  - * Added the parameter "eSoapVersion" to the call of m_pSoapFault->serialize
  - * method. The SoapFault class is expecting this parameter to determine the
  - * SoapVersion.
  - */
  -
   #include "SoapBody.h"
   #include "SoapSerializer.h"
   #include <axis/GDefine.hpp>
  @@ -154,14 +144,3 @@
   
   AXIS_CPP_NAMESPACE_END
   
  -#ifdef UNIT_TESTING_ON
  -int SoapBody::initializeForTesting()
  -{
  -    SoapMethod* pSoapMethod = new SoapMethod();
  -    pSoapMethod->initializeForTesting();
  -
  -    setSoapMethod(pSoapMethod);
  -
  -    return AXIS_SUCCESS;
  -}
  -#endif
  
  
  
  1.18      +0 -6      ws-axis/c/src/soap/SoapBody.h
  
  Index: SoapBody.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapBody.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- SoapBody.h	23 Nov 2004 17:21:04 -0000	1.17
  +++ SoapBody.h	9 Jun 2005 05:05:54 -0000	1.18
  @@ -70,17 +70,11 @@
       list<Attribute*> m_attributes;
       SoapMethod *m_pSoapMethod;
       SoapFault *m_pSoapFault;
  -    /* string m_strBodySerialized; */
   
   public:    
   
  -#ifdef UNIT_TESTING_ON
  -    int initializeForTesting();
  -#endif
       void addAttribute(Attribute* attr);
  -    /* string& serialize(); */
       int serialize(SoapSerializer& pSZ, SOAP_VERSION eSoapVersion);
  -    /* int serialize(string&, SOAP_VERSION eSoapVersion); */
       void setSoapFault(SoapFault* pSoapFault);
       void setSoapMethod(SoapMethod* ptrSoapMethod);
       SoapBody();
  
  
  
  1.33      +6 -126    ws-axis/c/src/soap/SoapEnvelope.cpp
  
  Index: SoapEnvelope.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapEnvelope.cpp,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- SoapEnvelope.cpp	14 Feb 2005 13:45:47 -0000	1.32
  +++ SoapEnvelope.cpp	9 Jun 2005 05:05:54 -0000	1.33
  @@ -16,6 +16,7 @@
    
   /*
    * @author Roshan Weerasuriya (roshan@jkcs.slt.lk)
  + * @author Samisa Abeysinghe (samisa.abeysinghe@gmail.com)
    */
   
   #ifdef WIN32
  @@ -41,7 +42,7 @@
   
   SoapEnvelope::~SoapEnvelope()
   {
  -    /* deletion of attributes */
  +    // deletion of attributes 
       list<Attribute*>::iterator itCurrAttribute= m_attributes.begin();
   
       while (itCurrAttribute != m_attributes.end())
  @@ -52,7 +53,7 @@
   
       m_attributes.clear();
   
  -    /* deletion of namespace declerations */
  +    // deletion of namespace declerations 
       list<Attribute*>::iterator itCurrNamespaceDecls= m_namespaceDecls.begin();
   
       while (itCurrNamespaceDecls != m_namespaceDecls.end())
  @@ -63,13 +64,13 @@
   
       m_namespaceDecls.clear();
   
  -    /* deletion of soap header */
  +    // deletion of soap header 
       if (m_pSoapHeader)
       {
           delete m_pSoapHeader;
       }
   
  -    /* deletion of soap body */
  +    // deletion of soap body 
       if (m_pSoapBody)
       {
           delete m_pSoapBody;
  @@ -116,9 +117,7 @@
           }
           else
           {
  -            /* throw exception
  -             * iStatus = AXIS_FAIL;
  -             */
  +             iStatus = AXIS_FAIL;
           }
                   
           pSZ.serialize("</", gs_SoapEnvVersionsStruct[eSoapVersion].pchPrefix,
  @@ -129,59 +128,6 @@
       return iStatus;
   }
   
  -/*
  -commented on 10Jul2003
  -int SoapEnvelope::serialize(string &sSerialized, SOAP_VERSION eSoapVersion)
  -{    
  -    
  -    int iStatus= AXIS_SUCCESS;
  -
  -    do
  -    {
  -        sSerialized= "<"+ string(gs_SoapEnvVersionsStruct
  -        [eSoapVersion].pchPrefix) + ":"+ gs_SoapEnvVersionsStruct
  -        [eSoapVersion].pchWords[SKW_ENVELOPE];
  -
  -        serializeNamespaceDecl(sSerialized);
  -        serializeAttributes(sSerialized);
  -
  -        sSerialized= sSerialized + ">"+ "\n";
  -
  -        if (m_pSoapHeader!=NULL)
  -        {
  -            iStatus= m_pSoapHeader->serialize(sSerialized, eSoapVersion);
  -            if(iStatus == AXIS_FAIL)
  -            {
  -                break;
  -            }
  -        }
  -
  -        if (m_pSoapBody!=NULL)
  -        {
  -            iStatus= m_pSoapBody->serialize(sSerialized, eSoapVersion);
  -            if(iStatus == AXIS_FAIL)
  -            {
  -                break;
  -            }
  -        }
  -        else
  -        {
  -            //throw exception
  -            //iStatus = AXIS_FAIL;
  -        }
  -        
  -        sSerialized+= "</"+ string(gs_SoapEnvVersionsStruct
  -        [eSoapVersion].pchPrefix) + ":"+ gs_SoapEnvVersionsStruct
  -        [eSoapVersion].pchWords[SKW_ENVELOPE]+ ">";    
  -    } while (0);
  -
  -    return iStatus;
  -}*/
  -
  -/*
  - * The added attrubute will be deleted by the destructor of this 
  - * SoapEnvelope.
  - */
   int SoapEnvelope::addAttribute(Attribute *pAttribute)
   {
       m_attributes.push_back(pAttribute);
  @@ -189,10 +135,6 @@
       return AXIS_SUCCESS;
   }
   
  -/*
  - * The added NamespaceDecl will be deleted by the destructor of this 
  - * SoapEnvelope.
  - */
   int SoapEnvelope::addNamespaceDecl(Attribute *pAttribute)
   {
       m_namespaceDecls.push_back(pAttribute);
  @@ -213,22 +155,6 @@
       return AXIS_SUCCESS;    
   }
   
  -/*
  -commented on 10Jul2003 3.30 pm
  -int SoapEnvelope::serializeAttributes(string& sSerialized)
  -{    
  -    list<Attribute*>::iterator itCurrAttribute= m_attributes.begin();
  -
  -    while (itCurrAttribute != m_attributes.end())
  -    {        
  -        (*itCurrAttribute)->serialize(sSerialized);
  -        itCurrAttribute++;        
  -    }    
  -
  -    return AXIS_SUCCESS;    
  -}
  -*/
  -
   int SoapEnvelope::serializeNamespaceDecl(SoapSerializer& pSZ)
   {    
   
  @@ -244,30 +170,6 @@
       return AXIS_SUCCESS;
   }
   
  -/*
  -commented on 10Jul2003 3.30 pm
  -int SoapEnvelope::serializeNamespaceDecl(string& sSerialized)
  -{    
  -
  -    list<Attribute*>::iterator itCurrNamespaceDecl= m_namespaceDecls.begin();
  -
  -    while (itCurrNamespaceDecl != m_namespaceDecls.end())
  -    {            
  -        (*itCurrNamespaceDecl)->serialize(sSerialized);
  -        itCurrNamespaceDecl++;        
  -    }    
  -
  -    return AXIS_SUCCESS;
  -}
  -*/
  -
  -/*
  - * This method is needed in the situation where we create and fill a 
  - * SoapEnvelope object when deserializing a incoming soap request.
  - * But this method is not needed in serializing a soap request, because
  - * the version specific prefix is taken from the SoapEnvVersions.h at 
  - * that time.
  - */
   int SoapEnvelope::setPrefix(const AxisChar* prefix)
   {
       m_sPrefix= prefix;
  @@ -300,25 +202,3 @@
   
   AXIS_CPP_NAMESPACE_END
   
  -#ifdef UNIT_TESTING_ON
  -int SoapEnvelope::initializeForTesting(SOAP_VERSION eSoapVersion)
  -{
  -    if (eSoapVersion == SOAP_VER_1_2)
  -    {
  -        setPrefix("env");
  -
  -        Attribute* pAttribute = new Attribute();
  -        pAttribute->setPrefix("xmlns");
  -        pAttribute->setLocalName("env");
  -        pAttribute->setURI("http://www.w3.org/2003/05/soap-envelope");
  -        addNamespaceDecl(pAttribute);
  -
  -        SoapBody* pSoapBody = new SoapBody();
  -        pSoapBody->initializeForTesting();
  -
  -        setSoapBody(pSoapBody);
  -    }
  -
  -    return AXIS_SUCCESS;
  -}
  -#endif
  
  
  
  1.18      +18 -8     ws-axis/c/src/soap/SoapEnvelope.h
  
  Index: SoapEnvelope.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapEnvelope.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- SoapEnvelope.h	14 Feb 2005 13:45:47 -0000	1.17
  +++ SoapEnvelope.h	9 Jun 2005 05:05:54 -0000	1.18
  @@ -26,6 +26,7 @@
    * @brief interface for the SoapEnvelope class.
    *
    * @author Roshan Weerasuriya (roshan@jkcs.slt.lk)
  + * @author Samisa Abeysinghe (samisa.abeysinghe@gmail.com)
    */
   
   AXIS_CPP_NAMESPACE_START
  @@ -39,27 +40,36 @@
       int addStandardNamespaceDecl(const Attribute* pAttribute);
       void clearStandardNamespaceDecl();
       int serializeNamespaceDecl(SoapSerializer& pSZ);
  -    /* int serializeNamespaceDecl(string&); */
       int serializeAttributes(SoapSerializer& pSZ);
  -    /* int serializeAttributes(string&); */
       SoapHeader *m_pSoapHeader;
       SoapBody *m_pSoapBody;
  -    /* string m_strEnvelopSerialized; */
       list<Attribute*> m_attributes;
       list<Attribute*> m_namespaceDecls;
       list<const Attribute*> m_StandardNamespaceDecls;
       AxisString m_sPrefix;    
   
   public:    
  -
  -#ifdef UNIT_TESTING_ON
  -    int initializeForTesting(SOAP_VERSION eSoapVersion);
  -#endif
  +  /**
  +    * This method is needed in the situation where we create and fill a 
  +    * SoapEnvelope object when deserializing a incoming soap request.
  +    * But this method is not needed in serializing a soap request, because
  +    * the version specific prefix is taken from the SoapEnvVersions.h at 
  +    * that time.
  +    */
       int setPrefix(const AxisChar* prefix);
  +
  +  /**
  +    * The added NamespaceDecl will be deleted by the destructor of this 
  +    * SoapEnvelope.
  +    */
       int addNamespaceDecl(Attribute* pAttribute);
  +
  +  /**
  +    * The added attrubute will be deleted by the destructor of this 
  +    * SoapEnvelope.
  +    */
       int addAttribute(Attribute* pAttribute);    
       int serialize(SoapSerializer& pSZ, SOAP_VERSION eSoapVersion);
  -    /* int serialize(string &sSerialized, SOAP_VERSION eSoapVersion); */
       void setSoapBody(SoapBody* soapBody);
       void setSoapHeader(SoapHeader* soapHeader);
       SoapEnvelope();
  
  
  
  1.54      +7 -45     ws-axis/c/src/soap/SoapFault.cpp
  
  Index: SoapFault.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapFault.cpp,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- SoapFault.cpp	25 May 2005 16:03:16 -0000	1.53
  +++ SoapFault.cpp	9 Jun 2005 05:05:54 -0000	1.54
  @@ -20,27 +20,6 @@
    * @author Damitha Kumarage (damitha@opensource.lk, damitha@jkcsworld.com)
    */
   
  -/*
  - * Revision 1.1  2004/June/02 roshan
  - * The following changes were done during correcting a Runtime error in the
  - *  windows platform.
  - * Added deletion of pointers to the Destrutor
  - * Added "pParam->m_Value.pStrValue = strdup((char*)(pValue));" to the setParam
  - *  method and removed the line
  - *   "pParam->m_Value.pStrValue = *((char**)(pValue));".
  - * Changed setFaultcode, setFaultstring, setFaultactor, setFaultDetail methods
  - *  to send a char pointer to the setParam method.
  - *  eg: In the setFaultcode method, changed passing of &sFaultcode to 
  - *  sFaultcode.c_str()
  - *  i.e Before change:
  - *      setParam(m_pFaultcodeParam, "faultcode", &sFaultcode, XSD_STRING); 
  - *      After change:
  - *      setParam(m_pFaultcodeParam, "faultcode", sFaultcode.c_str(), XSD_STRING); 
  - *
  - * Changed. The "SOAP-ENV" prefix was hard-coded in the "serialize" method.
  - *  Corrected it to serialize the correct prefix.
  - */
  -
   #include "SoapFault.h"
   #include "SoapSerializer.h"
   #include "SoapDeSerializer.h"
  @@ -50,11 +29,10 @@
   #include "../common/AxisConfig.h"
   
   
  -/*
  - * This array of structure is used to store all the soap faults
  - * which are used in Axis C++. Each time a fault object is needed it is
  - * created using this array, in SoapFault class.
  - */
  +// This array of structure is used to store all the soap faults
  +// which are used in Axis C++. Each time a fault object is needed it is
  +// created using this array, in SoapFault class.
  +
   static SoapFaultStruct* s_parrSoapFaultStruct;
   
   extern AxisConfig* g_pConfig;
  @@ -82,7 +60,7 @@
   
   int SoapFault::serialize(SoapSerializer& pSZ, SOAP_VERSION eSoapVersion)
   {
  -    /* written according to SOAP Version 1.1 */
  +    // written according to SOAP Version 1.1 
       int iStatus= AXIS_SUCCESS;
       if(m_bIsSimpleDetail)
       {
  @@ -91,14 +69,11 @@
           gs_SoapEnvVersionsStruct[eSoapVersion].pchWords[SKW_FAULT], ">\n", NULL); 
   	
       m_pFaultcodeParam->serialize(pSZ);
  -    //pSZ.serialize("<faultcode>", m_sFaultcode.c_str(), "</faultcode>", NULL);
       m_pFaultstringParam->serialize(pSZ);
  -    //pSZ.serialize("<faultstring>", m_sFaultstring.c_str(), "</faultstring>",
NULL);
   
       if(m_pFaultactorParam)
       {        
           m_pFaultactorParam->serialize(pSZ);
  -        //pSZ.serialize("<faultactor>", m_sFaultactor.c_str(), "</faultactor>",
NULL);
       } 
   
       if(m_pFaultDetail)
  @@ -115,28 +90,18 @@
           gs_SoapEnvVersionsStruct[eSoapVersion].pchWords[SKW_FAULT], ">\n", NULL);
   
       m_pFaultcodeParam->serialize(pSZ);
  -    //pSZ.serialize("<faultcode>", m_sFaultcode.c_str(), "</faultcode>", NULL);
       m_pFaultstringParam->serialize(pSZ);
  -    //pSZ.serialize("<faultstring>", m_sFaultstring.c_str(), "</faultstring>",
NULL);
   
       if(m_pFaultactorParam)
       {
           m_pFaultactorParam->serialize(pSZ);
  -        //pSZ.serialize("<faultactor>", m_sFaultactor.c_str(), "</faultactor>",
NULL);
       }
   
       if(m_pFaultDetail)
       {
  -        /*if(m_bIsSimpleDetail)
  -        {
  -            m_pFaultDetail->serialize(pSZ);
  -        }
  -        else
  -        {*/
  -            pSZ.serialize("<detail>", NULL);
  +         pSZ.serialize("<detail>", NULL);
               m_pFaultDetail->serialize(pSZ);
               pSZ.serialize("</detail>\n", NULL);
  -        //}
       }
   
           pSZ.serialize("</", gs_SoapEnvVersionsStruct[eSoapVersion].pchPrefix, ":",
  @@ -225,7 +190,7 @@
   {   
       SoapFault* pSoapFault= NULL;
   
  -    /* fill the soap fault object */
  +    // fill the soap fault object 
       pSoapFault= new SoapFault();
           
       /* TODO *********************************************** */
  @@ -235,10 +200,7 @@
        string strFaultcode = s_parrSoapFaultStruct[iFaultCode].pcFaultcode;
        string strSoapEnvVerStruct = gs_SoapEnvVersionsStruct[SOAP_VER_1_1].pchPrefix;
        pSoapFault->setFaultcode((strSoapEnvVerStruct + ":" + strFaultcode).c_str());
  -     //pSoapFault->setFaultcode(string(gs_SoapEnvVersionsStruct[SOAP_VER_1_1].pchPrefix)
+ 
  -     //    ":" + s_parrSoapFaultStruct[iFaultCode].pcFaultcode);
        pSoapFault->setFaultstring(s_parrSoapFaultStruct[iFaultCode].pcFaultstring);
  -     //pSoapFault->setFaultactor(s_parrSoapFaultStruct[iFaultCode].pcFaultactor);
        /* Fault actor should be set to the node url in which Axis C++ running.
         * Currently it is hardcoded to localhost
         */
  
  
  
  1.15      +0 -11     ws-axis/c/src/soap/SoapFault.h
  
  Index: SoapFault.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapFault.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- SoapFault.h	25 May 2005 16:03:16 -0000	1.14
  +++ SoapFault.h	9 Jun 2005 05:05:54 -0000	1.15
  @@ -48,18 +48,10 @@
    *  @class SoapFault
    *  @brief interface for the SoapFault class.
    *
  - *
    *  @author Roshan Weerasuriya (roshan@jkcs.slt.lk)
    *  @author damitha kumarage (damitha@jkcsworld.com, damitha@opensource.lk)
    */
   
  -/*
  - * Revision 1.1  2004/June/02 roshan
  - * Changed. The "SOAP-ENV" prefix was hard-coded in the "serialize" method.
  - *  Corrected it to serialize the correct prefix. Added the parameter
  - *  "SOAP_VERSION eSoapVersion" to the "serialize" method.
  - */
  -
   AXIS_CPP_NAMESPACE_START
   
   class SoapSerializer;
  @@ -87,8 +79,6 @@
   
       void setDeSerializer(SoapDeSerializer* pDZ);
   
  -    /* int serialize(string&); */
  -
       virtual ~SoapFault();
   
       int setFaultDetail(const AxisChar* sDetail);
  @@ -129,7 +119,6 @@
       int setParam(Param* pParam, const AxisChar* pchName, const AxisChar* pValue, XSDTYPE
type);
   
   private:
  -    /* string m_sFaultSerialized; */
       string m_sFaultDetail;
       string m_sFaultactor;
       string m_sFaultstring;
  
  
  
  1.39      +8 -19     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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- SoapHeader.cpp	8 Jun 2005 04:25:08 -0000	1.38
  +++ SoapHeader.cpp	9 Jun 2005 05:05:54 -0000	1.39
  @@ -47,22 +47,12 @@
   
   SoapHeader::~SoapHeader()
   {
  -    /* 
  -     * header blocks are not deleted here any more. Its the responsibility of
  -     * either a handler or stub etc to delete any header block created by them
  -     */
  -    /*
  -    list<IHeaderBlock*>::iterator itCurrHeaderBlock= m_headerBlocks.begin();
  -
  -    while(itCurrHeaderBlock != m_headerBlocks.end())
  -    {        
  -        delete *itCurrHeaderBlock;
  -        itCurrHeaderBlock++;
  -    }
  -    */
  +    // Header blocks are not deleted here any more. Its the responsibility of
  +    // either a handler or stub etc to delete any header block created by them
  +    // Here we will just clear the list of header block pointers
       m_headerBlocks.clear();
   
  -    /* deletion of attributes */
  +    // deletion of attributes 
       list<Attribute*>::iterator itCurrAttribute= m_attributes.begin();
   
       while(itCurrAttribute != m_attributes.end())
  @@ -312,13 +302,12 @@
   }
   void SoapHeader::clear()
   {
  -    /*
  -     * header blocks are not deleted here any more. Its the responsibility of
  -     * either a handler or stub etc to delete any header block created by them
  -     */
  +    // Header blocks are not deleted here. Its the responsibility of
  +    // either a handler or stub etc to delete any header block created by them
  +    // Here we will just clear the list of header block pointers
       m_headerBlocks.clear();
   
  -    /* deletion of attributes */
  +    // deletion of attributes 
       list<Attribute*>::iterator itCurrAttribute= m_attributes.begin();
   
       while(itCurrAttribute != m_attributes.end())
  
  
  
  1.18      +1 -11     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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- SoapHeader.h	8 Jun 2005 04:25:08 -0000	1.17
  +++ SoapHeader.h	9 Jun 2005 05:05:54 -0000	1.18
  @@ -44,16 +44,6 @@
   #include <list>
   using namespace std;
   
  -/*
  - * Revision 1.1  2004/06/13 roshan
  - * Added doxygen comments to help autobuild API docs
  - */
  -
  -/*
  - * Revision 1.2  2004/07/01 roshan
  - * Added doxygen comments to help autobuild API docs
  - */
  -
   typedef enum 
   { 
       HEADER_LEVEL=0, HEADER_BLOCK_LEVEL, HEADER_BLOCK_INSIDE_LEVEL
  @@ -142,7 +132,7 @@
         */
       void addHeaderBlock(IHeaderBlock* headerBlock);
   
  -/**
  +  /**
         * Deletes a header block.
         *
         * 
  
  
  
  1.18      +4 -4      ws-axis/c/src/soap/SoapKeywordMapping.cpp
  
  Index: SoapKeywordMapping.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapKeywordMapping.cpp,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- SoapKeywordMapping.cpp	23 Mar 2005 15:44:59 -0000	1.17
  +++ SoapKeywordMapping.cpp	9 Jun 2005 05:05:54 -0000	1.18
  @@ -27,7 +27,6 @@
   
   extern SoapEnvVersionsStruct gs_SoapEnvVersionsStruct[VERSION_LAST];
   
  -//map<int, SoapKeywordStruct> SoapKeywordMapping::m_Map;
   SoapKeywordStruct SoapKeywordMapping::m_Map[VERSION_LAST];
   volatile bool SoapKeywordMapping::m_bInit = false;
   
  @@ -60,14 +59,14 @@
               }
           }
           std::list<Attribute*> attributeList;
  -        /* soap 1.1 envelop attributes */
  +        // soap 1.1 envelop attributes 
           m_Map[SOAP_VER_1_1].pEnv = new Attribute( attributeList, "SOAP-ENV","xmlns","",
               "http://schemas.xmlsoap.org/soap/envelope/");
           m_Map[SOAP_VER_1_1].pXsi = new Attribute( attributeList, "xsi","xmlns","",
               "http://www.w3.org/2001/XMLSchema-instance");
           m_Map[SOAP_VER_1_1].pXsd = new Attribute( attributeList, "xsd","xmlns","",
               "http://www.w3.org/2001/XMLSchema");
  -        /* soap 1.2 envelop attributes */
  +        // soap 1.2 envelop attributes 
           m_Map[SOAP_VER_1_2].pEnv = new Attribute( attributeList, "env","xmlns","",
               "http://www.w3.org/2003/05/soap-envelope");
           m_Map[SOAP_VER_1_2].pXsi = new Attribute( attributeList, "xsi","xmlns","",
  @@ -82,7 +81,7 @@
   {
       if (m_bInit)
       {
  -        /* soap 1.1 envelop attributes */
  +        // soap 1.1 envelop attributes 
           delete m_Map[SOAP_VER_1_1].pEnv;
           delete m_Map[SOAP_VER_1_1].pXsi;
           delete m_Map[SOAP_VER_1_1].pXsd;
  @@ -98,3 +97,4 @@
       return m_Map[nVersion];
   }
   AXIS_CPP_NAMESPACE_END	
  +
  
  
  
  1.14      +0 -1      ws-axis/c/src/soap/SoapKeywordMapping.h
  
  Index: SoapKeywordMapping.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapKeywordMapping.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SoapKeywordMapping.h	23 Nov 2004 17:21:04 -0000	1.13
  +++ SoapKeywordMapping.h	9 Jun 2005 05:05:54 -0000	1.14
  @@ -48,7 +48,6 @@
       SoapKeywordMapping();
       virtual ~SoapKeywordMapping();
   private:
  -    //static map<int, SoapKeywordStruct> m_Map;
       static SoapKeywordStruct m_Map[VERSION_LAST];
       static volatile bool m_bInit;
   public:
  
  
  
  1.33      +2 -9      ws-axis/c/src/soap/SoapMethod.cpp
  
  Index: SoapMethod.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapMethod.cpp,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- SoapMethod.cpp	8 Jun 2005 04:25:08 -0000	1.32
  +++ SoapMethod.cpp	9 Jun 2005 05:05:54 -0000	1.33
  @@ -64,11 +64,6 @@
       }
   }
   
  -/*
  - * This method return AXIS_SUCCESS if it serialize the SoapMethod successfully.
  - * If not it returns AXIS_FAIL. The caller of this method has to deal in a 
  - * appropriate manner after calling this method.
  - */
   int SoapMethod::serialize(SoapSerializer& pSZ)
   {    
       int iStatus= AXIS_SUCCESS;
  @@ -114,9 +109,7 @@
               
               pSZ.serialize(m_strLocalname.c_str(), ">\n", NULL);
   
  -			/*
  -			 * Removing the namespace list of this SOAPMethod from the stack.
  -			 */
  +			// Removing the namespace list of this SOAPMethod from the stack.
   			list<AxisChar*>::iterator itCurrentNamespace = 
   				lstTmpNameSpaceStack.begin();
   			while (itCurrentNamespace != lstTmpNameSpaceStack.end())
  @@ -159,7 +152,7 @@
   {
       bool bStatus= true;    
   
  -    /* checking whether namespace qualified, if not return AXIS_FAIL */
  +    // checking whether namespace qualified, if not return AXIS_FAIL 
       do
       {
           if(m_strPrefix.length() == 0)
  
  
  
  1.24      +6 -14     ws-axis/c/src/soap/SoapMethod.h
  
  Index: SoapMethod.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapMethod.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- SoapMethod.h	8 Jun 2005 04:25:08 -0000	1.23
  +++ SoapMethod.h	9 Jun 2005 05:05:54 -0000	1.24
  @@ -62,33 +62,25 @@
   
   private:
       int serializeAttributes(SoapSerializer& pSZ, list<AxisChar*>& lstTmpNameSpaceStack);
  -    /* int serializeAttributes(string& sSerialized); */
       list<Attribute*> m_attributes;
       bool isSerializable();    
       int serializeOutputParam(SoapSerializer& pSZ);
  -    /* int serializeOutputParam(string&); */
       AxisString m_strPrefix;
       AxisString m_strLocalname;
       AxisString m_strUri;
       list<Param*> m_OutputParams;
  -    /* string m_strMethodSerialized; */
  -    /* test line */
   
   public:    
  -    /*
  -     * Initializes the member variables for testing.
  -     * @return The status indicating success (AXIS_SUCCESS) or failure
  -     * (AXIS_FAIL).
  -     */
  -
  -#ifdef UNIT_TESTING_ON
  -    int initializeForTesting();
  -#endif
       int reset();
       int addAttribute(Attribute* pAttribute);
       const AxisChar* getMethodName();
  +
  +  /**
  +    * This method return AXIS_SUCCESS if it serialize the SoapMethod successfully.
  +    * If not it returns AXIS_FAIL. The caller of this method has to deal in a 
  +    * appropriate manner after calling this method.
  +    */
       int serialize(SoapSerializer& pSZ);
  -    /* int serialize(string&); */
       void addOutputParam(Param *param);
       void setURI(const AxisChar* uri);
       void setLocalName(const AxisChar* localname);
  
  
  
  1.19      +2 -3      ws-axis/c/src/soap/URIMapping.h
  
  Index: URIMapping.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/URIMapping.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- URIMapping.h	23 Mar 2005 15:44:59 -0000	1.18
  +++ URIMapping.h	9 Jun 2005 05:05:54 -0000	1.19
  @@ -42,9 +42,8 @@
   {
   public:
       static void initialize();
  -	static void uninitialize();
  -    //static map<AxisXMLString, URITYPE> m_sURIMap;
  -	static map<std::string, URITYPE> m_sURIMap;
  +    static void uninitialize();
  +    static map<std::string, URITYPE> m_sURIMap;
       static volatile bool m_bInit;
       URIMapping();
       virtual ~URIMapping();
  
  
  

Mime
View raw message