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 sa...@apache.org on 2005/08/17 10:39:01 UTC
cvs commit: ws-axis/c/src/wsdd WSDDDocument.cpp WSDDDocument.h WSDDKeywords.cpp WSDDKeywords.h WSDDService.cpp WSDDService.h
samisa 2005/08/17 01:39:01
Modified: c/src/wsdd WSDDDocument.cpp WSDDDocument.h WSDDKeywords.cpp
WSDDKeywords.h WSDDService.cpp WSDDService.h
Log:
removed the need for operationRequestMap in server.wsdd file
Revision Changes Path
1.43 +0 -28 ws-axis/c/src/wsdd/WSDDDocument.cpp
Index: WSDDDocument.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDocument.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- WSDDDocument.cpp 4 Aug 2005 09:53:07 -0000 1.42
+++ WSDDDocument.cpp 17 Aug 2005 08:39:01 -0000 1.43
@@ -458,10 +458,6 @@
{
addAllowedMethodsToService(pcValue);
}
- else if (0 == strcmp(pcName, kw_operation_request_map))
- {
- addOperationToRequestMappingsToService( pcValue );
- }
else if(0 == strcmp(pcName, kw_cn))
{
m_pService->setLibName(pcValue);
@@ -544,30 +540,6 @@
}
}
-void WSDDDocument::addOperationToRequestMappingsToService(const AxisXMLCh* pcValue)
-{
- AxisString sValue = pcValue;
- unsigned int prepos = 0, pos = 0;
- do
- {
- pos = sValue.find(METHODNAME_SEPARATOR, prepos);
- if (AxisString::npos == pos) // Handle the case of no trailing space in AllowedMethods
- pos = sValue.size();
- if (pos <= prepos) break;
- AxisString operationRequestPair = sValue.substr(prepos, pos - prepos);
- unsigned int seperatorPoint = operationRequestPair.find(TAG_NAME_SEPARATOR, 0 );
- if (AxisString::npos != seperatorPoint)
- {
- AxisString operationName = operationRequestPair.substr(0, seperatorPoint );
- AxisString requestName = operationRequestPair.substr( seperatorPoint + 1, operationRequestPair.length() );
- m_pService->addOperationRequestMapping(operationName, requestName);
- }
- prepos = pos + 1;
- } while (true);
-}
-
-
-
void WSDDDocument::startElement(const AnyElement* pEvent)
{
if (m_lev1 == WSDD_UNKNOWN)
1.22 +0 -1 ws-axis/c/src/wsdd/WSDDDocument.h
Index: WSDDDocument.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDocument.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- WSDDDocument.h 4 Aug 2005 09:53:07 -0000 1.21
+++ WSDDDocument.h 17 Aug 2005 08:39:01 -0000 1.22
@@ -92,7 +92,6 @@
void getParameters(WSDDLevels eElementType, const AnyElement* pEvent);
void addAllowedRolesToService(const AxisXMLCh* pcValue);
void addAllowedMethodsToService(const AxisXMLCh* pcValue);
- void addOperationToRequestMappingsToService(const AxisXMLCh* pcValue);
int parseDocument(const AxisChar* pcWSDDFileName);
protected:
bool m_bFatalError;
1.16 +0 -2 ws-axis/c/src/wsdd/WSDDKeywords.cpp
Index: WSDDKeywords.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDKeywords.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- WSDDKeywords.cpp 4 Aug 2005 09:53:07 -0000 1.15
+++ WSDDKeywords.cpp 17 Aug 2005 08:39:01 -0000 1.16
@@ -34,7 +34,6 @@
const AxisXMLCh* kw_prv;
const AxisXMLCh* kw_cn; /* must be changed to libname or so */
const AxisXMLCh* kw_am;
-const AxisXMLCh* kw_operation_request_map; //To handle the mapping between operation name and request tag name
const AxisXMLCh* kw_ar;
const AxisXMLCh* kw_rqf;
const AxisXMLCh* kw_rsf;
@@ -77,7 +76,6 @@
kw_prv = __TRC("provider");
kw_cn = __TRC("className"); /* must be changed to libname or so */
kw_am = __TRC("allowedMethods");
- kw_operation_request_map = __TRC("operationRequestMap");
kw_ar = __TRC("allowedRoles");
kw_rqf = __TRC("requestFlow");
kw_rsf = __TRC("responseFlow");
1.12 +0 -1 ws-axis/c/src/wsdd/WSDDKeywords.h
Index: WSDDKeywords.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDKeywords.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WSDDKeywords.h 4 Aug 2005 09:53:07 -0000 1.11
+++ WSDDKeywords.h 17 Aug 2005 08:39:01 -0000 1.12
@@ -31,7 +31,6 @@
extern const AxisXMLCh* kw_prv;
extern const AxisXMLCh* kw_cn; /* must be changed to libname or so */
extern const AxisXMLCh* kw_am;
-extern const AxisXMLCh* kw_operation_request_map; //To handle the mapping between operation name and request tag name
extern const AxisXMLCh* kw_ar;
extern const AxisXMLCh* kw_rqf;
extern const AxisXMLCh* kw_rsf;
1.28 +0 -24 ws-axis/c/src/wsdd/WSDDService.cpp
Index: WSDDService.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDService.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- WSDDService.cpp 4 Aug 2005 09:53:07 -0000 1.27
+++ WSDDService.cpp 17 Aug 2005 08:39:01 -0000 1.28
@@ -251,28 +251,4 @@
return 0;
}
-void WSDDService::addOperationRequestMapping(AxisString operation, AxisString request)
-{
- operationRequestMap[operation] = request;
-}
-
-const char* WSDDService::getOperationForRequest(const char* request) const
-{
- AxisString strRequest = request;
- map<AxisString, AxisString>::const_iterator itr = operationRequestMap.find(strRequest);
-
- if (itr != operationRequestMap.end() ) // handle the case where the tag name is the same as the operation name
- return (*itr).first.c_str();
-
- itr = operationRequestMap.begin();
-
- while (itr != operationRequestMap.end() && (*itr).second != strRequest)
- ++itr;
-
- if (itr != operationRequestMap.end())
- return (*itr).first.c_str();
- else
- return NULL;
-}
-
AXIS_CPP_NAMESPACE_END
1.14 +0 -3 ws-axis/c/src/wsdd/WSDDService.h
Index: WSDDService.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDService.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WSDDService.h 4 Aug 2005 09:53:07 -0000 1.13
+++ WSDDService.h 17 Aug 2005 08:39:01 -0000 1.14
@@ -37,8 +37,6 @@
const AxisChar* getServiceName() const;
bool isAllowedMethod(const AxisChar* sMethodName) const;
void addAllowedMethod(const AxisChar* sMethodName);
- void addOperationRequestMapping(AxisString operation, AxisString request);
- const char* getOperationForRequest(const char* request) const;
const WSDDHandlerList* getResponseFlowHandlers() const;
void addHandler(bool bRequestFlow, WSDDHandler* pHandler);
int removeHandler(bool bRequestFlow, WSDDHandler* pHandler);
@@ -56,7 +54,6 @@
WSDDHandlerList* m_RequestHandlers;
WSDDHandlerList* m_ResponseHandlers;
list<AxisString> m_AllowedRoles;
- map<AxisString, AxisString> operationRequestMap;
};
typedef map<AxisString, WSDDService*> WSDDServiceMap;