Return-Path: 
 <axis-dev-return-22001-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org
Received: (qmail 78876 invoked by uid 500); 2 Jul 2003 05:09:31 -0000
Mailing-List: contact axis-dev-help@ws.apache.org; run by ezmlm
Precedence: bulk
Reply-To: axis-dev@ws.apache.org
list-help: <mailto:axis-dev-help@ws.apache.org>
list-unsubscribe: <mailto:axis-dev-unsubscribe@ws.apache.org>
list-post: <mailto:axis-dev@ws.apache.org>
Delivered-To: mailing list axis-dev@ws.apache.org
Received: (qmail 78864 invoked by uid 500); 2 Jul 2003 05:09:31 -0000
Delivered-To: apmail-xml-axis-cvs@apache.org
Date: 2 Jul 2003 05:09:29 -0000
Message-ID: <20030702050929.95651.qmail@icarus.apache.org>
From: damitha@apache.org
To: xml-axis-cvs@apache.org
Subject: cvs commit: xml-axis/c/src/wsdd WSDDHandler.cpp WSDDHandler.h
 WSDDDocument.cpp
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

damitha     2003/07/01 22:09:29

  Modified:    c/src/wsdd WSDDHandler.cpp WSDDHandler.h WSDDDocument.cpp
  Log:
  in WSDDDocument.cpp added
  DEBUG1("After tempHandler->SetOption");
  
  in WSDDHandler.h and WSDDHandler.cpp changed
  map<string, string> m_Option; to
  map<string, string>* m_Option;
  and other changes accordingly
  
  Revision  Changes    Path
  1.2       +8 -6      xml-axis/c/src/wsdd/WSDDHandler.cpp
  
  Index: WSDDHandler.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/wsdd/WSDDHandler.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WSDDHandler.cpp	25 Jun 2003 05:55:48 -0000	1.1
  +++ WSDDHandler.cpp	2 Jul 2003 05:09:29 -0000	1.2
  @@ -73,12 +73,12 @@
   
   WSDDHandler::WSDDHandler()
   {
  -
  +  m_Option = new map<string, string>;
   }
   
   WSDDHandler::~WSDDHandler()
   {
  -
  +  delete(m_Option);
   }
   
   void WSDDHandler::SetLibName(string& sLibName)
  @@ -94,14 +94,16 @@
   
   string WSDDHandler::GetOption(string sArg)
   {
  -  return m_Option[sArg]; 
  +  return (*m_Option)[sArg]; 
   }
   
   void WSDDHandler::SetOption(string sOption, string sValue)
   {
  -  //m_Option[m_sOption.c_str]=m_Value;
  -  m_Option[sOption] = sValue;
  +  (*m_Option)[sOption] = sValue; 
   }
   
  -
  +map<string, string>* WSDDHandler::GetOptionList()
  +{
  +  return m_Option;
  +}
   
  
  
  
  1.2       +2 -1      xml-axis/c/src/wsdd/WSDDHandler.h
  
  Index: WSDDHandler.h
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/wsdd/WSDDHandler.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WSDDHandler.h	25 Jun 2003 05:55:48 -0000	1.1
  +++ WSDDHandler.h	2 Jul 2003 05:09:29 -0000	1.2
  @@ -89,11 +89,12 @@
   	virtual ~WSDDHandler();
     string GetOption(string sArg);
     void SetOption(string sOption, string Value);
  +  virtual map<string, string>* GetOptionList(); 
   
   protected:
   	string m_sName;
   	string m_sLibName;
  -	map<string, string> m_Option;
  +	map<string, string>* m_Option;
   };
   
   typedef list<WSDDHandler*> WSDDHandlerList;
  
  
  
  1.3       +80 -49    xml-axis/c/src/wsdd/WSDDDocument.cpp
  
  Index: WSDDDocument.cpp
  ===================================================================
  RCS file: /home/cvs/xml-axis/c/src/wsdd/WSDDDocument.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WSDDDocument.cpp	30 Jun 2003 14:07:25 -0000	1.2
  +++ WSDDDocument.cpp	2 Jul 2003 05:09:29 -0000	1.3
  @@ -64,6 +64,7 @@
   #include "WSDDDocument.h"
   #include <iostream>
   #include <string>
  +#include "../common/Debug.h"
   
   #define toString(X) XMLString::transcode(X)
   #define toXMLCh(X) XMLString::transcode(X)
  @@ -82,7 +83,11 @@
   	tempTr = new WSDDTransport();
   	protocol = APTOTHER;
   	ch = NULL;
  -	xch = NULL;
  +	//xch = NULL;
  +	xchName = NULL;
  +	xchValue = NULL;
  +	xchType = NULL;
  +	svsch = NULL;
   }
   
   WSDDDocument::~WSDDDocument()
  @@ -92,7 +97,8 @@
   
   int WSDDDocument::GetDeployment(string& sWSDD, WSDDDeployment * dep)
   {
  -	if (SUCCESS != ParseDocument(sWSDD)) return FAIL;
  +	if (SUCCESS != ParseDocument(sWSDD)) return FAIL;    
  +
   	dep->SetGlobalRequestFlowHandlers(globReqFlowHanList);
   	dep->SetGlobalResponseFlowHandlers(globResFlowHanList);
   	dep->SetServices(svsMap);
  @@ -103,12 +109,14 @@
   
   int WSDDDocument::ParseDocument(string& sWSDD)
   {
  -	try 
  +	try
   	{
   		SAX2XMLReader * parser = XMLReaderFactory::createXMLReader();
   		parser->setContentHandler(this);
  -		parser->setErrorHandler(this);
  -		parser->parse(sWSDD.c_str());
  +		parser->setErrorHandler(this);     
  +    DEBUG1("BEFORE parser->parse(sWSDD.c_str());");
  +		parser->parse(sWSDD.c_str());      
  +
   	}
   	catch (...)
   	{
  @@ -118,11 +126,12 @@
   }
   
   
  -void WSDDDocument::startElement(const XMLCh *const uri, 
  -							const XMLCh *const localname, 
  -							const XMLCh *const qname, 
  +void WSDDDocument::startElement(const XMLCh *const uri,
  +							const XMLCh *const localname,
  +							const XMLCh *const qname,
   							const Attributes &attrs)
   {
  +
   	ch = XMLString::transcode(localname);
   	xchName = toXMLCh("name");
   	xchValue = toXMLCh("value");
  @@ -134,15 +143,18 @@
   		case WSDD_UNKNOWN:
   
   			if(strcmp(ch, "globalConfiguration")==0)
  -			{
  +			{  
  +
   				lev0=WSDD_GLOBCONF;
   			}
   			if(strcmp(ch, "service")==0)
  -			{
  +			{  
  +
   				lev0=WSDD_SERVICE;
   			}
   			if(strcmp(ch, "transport")==0)
  -			{
  +			{  
  +
   				lev0=WSDD_TRANSPORT;
   			}
   			if(lev0==WSDD_UNKNOWN)
  @@ -152,83 +164,97 @@
   		break;
   	}
   
  -	
  +
   	switch(lev0)
  -	{
  +	{  
  +
   		case WSDD_GLOBCONF:
  -			//cout<<"we are in glob conf"<<endl;
  +			//cout<<"we are in glob conf"<<endl;  
  +
   			if(strcmp(ch, "requestFlow")==0)
   			{
   				globReqFlowHanList = new WSDDHandlerList();
   				lev1=WSDD_REQFLOW;
  -			}
  +			}  
  +
   			if(strcmp(ch, "responseFlow")==0)
   			{
   				globResFlowHanList = new WSDDHandlerList();
   				lev1=WSDD_RESFLOW;
  -			}
  +			}  
   
  -			xch = toXMLCh("type");			
  +			//xch = toXMLCh("type");
   			switch(lev1)
   			{
   				case WSDD_REQFLOW:
  -					//cout<<"we are in glob conf>requestflow"<<endl;
  +					//cout<<"we are in glob conf>requestflow"<<endl;  
  +
   					if(strcmp(ch, "handler")==0)
   					{
   						tempHandler = new WSDDHandler();
  -						string sLibName = toString(attrs.getValue(xch));
  +						string sLibName = toString(attrs.getValue(xchType));
   						tempHandler->SetLibName(sLibName);
   						globReqFlowHanList->push_back(tempHandler);
   						tempHandler = NULL;
  -					}
  +					}  
  +
   				break;
   				case WSDD_RESFLOW:
   					if(strcmp(ch, "handler")==0)
   					{
   						tempHandler = new WSDDHandler();
  -						string sLibName = toString(attrs.getValue(xch));
  +						string sLibName = toString(attrs.getValue(xchType));
   						tempHandler->SetLibName(sLibName);
   						globResFlowHanList->push_back(tempHandler);
   						tempHandler = NULL;
  -					}
  +					}  
   
   				break;
   			}
  -			REL(&xch);
  +
  +			//REL(&xch);
   		break;
   
   
  -		case WSDD_SERVICE:
  +		case WSDD_SERVICE:      
   			if(strcmp(ch, "service")==0)
   			{
  +
   				tempService = new WSDDService();
   				string sSrvName = toString(attrs.getValue(xchName));
   				tempService->SetServiceName(sSrvName);
   				(*svsMap)[toString(attrs.getValue(xchName))]=tempService;
   
   				cout<<toString(attrs.getValue(toXMLCh("name")))<<endl;
  -			}
  +			}  
  +
   			//The check for lev1==WSDD_UNKNOWN is necessary because
   			//parameter elements can occur inside handler elements
   			if(strcmp(ch, "parameter")==0 && (lev1==WSDD_UNKNOWN))
   			{
   				lev1=WSDD_PARAM;
  -			}
  -			if(strcmp(ch, "requestFlow")==0)
  +			} 
  +
  +
  +      if(strcmp(ch, "requestFlow")==0)
   			{
   				lev1=WSDD_REQFLOW;
   				tempHandlerList = new WSDDHandlerList();
  -			}
  -			if(strcmp(ch, "responseFlow")==0)
  +			}  
  +
  +      if(strcmp(ch, "responseFlow")==0)
   			{
   				lev1=WSDD_RESFLOW;
   				tempHandlerList = new WSDDHandlerList();
   			}
  -			switch(lev1)
  +
  +
  +      switch(lev1)
   			{
   				case WSDD_PARAM:
   					if(strcmp(svsch, "className")==0)
  -					{
  +					{ 
  +
   						string sLibName = toString(attrs.getValue(xchValue));
   						tempService->SetLibName(sLibName);
   						//cout<<toString(attrs.getValue(toXMLCh("value")))<<" The class name"<<endl;
  @@ -237,7 +263,7 @@
   					{
   						string sLibName = toString(attrs.getValue(xchValue));
   						//cout<<toString(attrs.getValue(toXMLCh("value")))<<" The class name"<<endl;
  -						
  +
   						char * x = toString(attrs.getValue(xchValue));
   						char * y;
   						if(x)
  @@ -248,11 +274,11 @@
   								string sY = y;
   								tempService->SetAllowedMethod(sY);
   								y=strtok(NULL," ");
  -							} 
  +							}
   						}
   						REL(&x);
   						delete y;
  -						
  +
   						x=NULL;
   						y=NULL;
   					}
  @@ -274,6 +300,9 @@
   							{
   								tempHandler->SetOption(toString(attrs.getValue(xchName)),
   														toString(attrs.getValue(xchValue)));
  +
  +                  DEBUG1("After tempHandler->SetOption");
  +
   							}
   						break;
   					}
  @@ -287,7 +316,7 @@
   						string sLibName = toString(attrs.getValue(xchType));
   						tempHandler->SetLibName(sLibName);
   						tempHandlerList->push_back(tempHandler);
  -						//tempHandler = NULL;					
  +						//tempHandler = NULL;
   					}
   					switch(lev2)
   					{
  @@ -302,7 +331,7 @@
   				break;
   			}
   
  -		break;
  +		break;  
   
   		case WSDD_TRANSPORT:
   			if(strcmp(ch, "transport")==0)
  @@ -356,7 +385,7 @@
   						tempHandlerList->push_back(tempHandler);
   						tempHandler = NULL;
   					}
  -				break;				
  +				break;
   
   			}
   
  @@ -368,15 +397,16 @@
   	REL(&xchType);
   	REL(&svsch);
   
  -}	
  +}
   
  -void  WSDDDocument::endElement (const XMLCh *const uri, 
  -				  const XMLCh *const localname, 
  +void  WSDDDocument::endElement (const XMLCh *const uri,
  +				  const XMLCh *const localname,
   				  const XMLCh *const qname)
   {
   	ch = XMLString::transcode(localname);
   	switch (lev0)
  -	{
  +	{  
  +
   		case WSDD_GLOBCONF:
   			if(strcmp(ch, "globalConfiguration")==0)
   			{
  @@ -398,7 +428,7 @@
   							}
   						break;
   					}
  -					
  +
   				break;
   				case WSDD_RESFLOW:
   					if(strcmp(ch, "responseFlow")==0)
  @@ -423,7 +453,7 @@
   			{
   				lev0=WSDD_UNKNOWN;
   			}
  -		break;
  +		break; 
   
   		case WSDD_SERVICE:
   			if(strcmp(ch, "service")==0)
  @@ -462,7 +492,7 @@
   								lev2=WSDD_UNKNOWN;
   								tempHandler = NULL;
   							}
  -							
  +
   						break;
   					}
   				break;
  @@ -489,12 +519,12 @@
   								lev2=WSDD_UNKNOWN;
   								tempHandler = NULL;
   							}
  -							
  +
   						break;
   					}
   				break;
   			}
  -		break;
  +		break;  
   
   		case WSDD_TRANSPORT:
   			if(strcmp(ch, "transport")==0)
  @@ -515,22 +545,23 @@
   				break;
   
   				case WSDD_RESFLOW:
  -					
  +
   					if(strcmp(ch, "responseFlow")==0)
   					{
   						tempTr->SetResponseFlowHandlers(protocol, tempHandlerList);
   						tempHandlerList = NULL;
   						lev1=WSDD_UNKNOWN;
   					}
  -					
  +
   				break;
   			}
   		break;
   	}
   	REL(&ch);
  +
   }
   
  -void  WSDDDocument::characters (const XMLCh *const chars, 
  +void  WSDDDocument::characters (const XMLCh *const chars,
   				  const unsigned int length)
   {
   	//cout<<"==="<<XMLString::transcode(chars)<<"==="<<endl;