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 ro...@apache.org on 2004/04/08 14:51:55 UTC
cvs commit: ws-axis/c/src/wsdd WSDDDeployment.cpp WSDDDeployment.h WSDDDocument.h WSDDDocumentExpat.cpp WSDDDocumentXerces.cpp WSDDDocumentXerces.h WSDDKeywords.cpp WSDDService.cpp WSDDTransport.cpp
roshan 2004/04/08 05:51:55
Modified: c/src/wsdd WSDDDeployment.cpp WSDDDeployment.h
WSDDDocument.h WSDDDocumentExpat.cpp
WSDDDocumentXerces.cpp WSDDDocumentXerces.h
WSDDKeywords.cpp WSDDService.cpp WSDDTransport.cpp
Log:
Applied Coding Conventions
Revision Changes Path
1.31 +9 -5 ws-axis/c/src/wsdd/WSDDDeployment.cpp
Index: WSDDDeployment.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDeployment.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- WSDDDeployment.cpp 7 Apr 2004 13:52:01 -0000 1.30
+++ WSDDDeployment.cpp 8 Apr 2004 12:51:55 -0000 1.31
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- * @author Sanjaya Singharage
- * @author Roshan Weerasuriya (roshan@jkcs.slt.lk, roshan@opensource.lk)
- * @author Susantha Kumara (skumara@virtusa.com, susantha@opensource.lk)
+ * @author Sanjaya Singharage
+ * @author Roshan Weerasuriya (roshan@jkcs.slt.lk, roshan@opensource.lk)
+ * @author Susantha Kumara (skumara@virtusa.com, susantha@opensource.lk)
*
*/
@@ -137,8 +137,12 @@
if(!file) return AXIS_FAIL;
do
{
- if (fputs("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", file) < 0) break;
- if (fputs("<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\"xmlns:C=\"http://xml.apache.org/axis/wsdd/providers/C\" xmlns:CPP=\"http://xml.apache.org/axis/wsdd/providers/CPP\">\n", file) < 0) break;
+ if (fputs("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", file) < 0)
+ break;
+ if (fputs("<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\
+ \"xmlns:C=\"http://xml.apache.org/axis/wsdd/providers/C\" xmlns:\
+ CPP=\"http://xml.apache.org/axis/wsdd/providers/CPP\">\n",
+ file) < 0) break;
if (fputs("\t<globalConfiguration>\n", file) < 0) break;
WSDDHandlerList::iterator iter;
if(m_GlobalRequestHandlers)
1.16 +1 -1 ws-axis/c/src/wsdd/WSDDDeployment.h
Index: WSDDDeployment.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDeployment.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- WSDDDeployment.h 7 Apr 2004 13:52:01 -0000 1.15
+++ WSDDDeployment.h 8 Apr 2004 12:51:55 -0000 1.16
@@ -33,7 +33,7 @@
/*
* @class WSDDDeployment
* @brief interface for the WSDDDeployment class.
- * @author Susantha Kumara (skumara@virtusa.com)
+ * @author Susantha Kumara (skumara@virtusa.com)
*/
class WSDDDeployment
{
1.15 +8 -8 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WSDDDocument.h 7 Apr 2004 13:52:01 -0000 1.14
+++ WSDDDocument.h 8 Apr 2004 12:51:55 -0000 1.15
@@ -46,14 +46,14 @@
WSDDLevels m_lev1; /* gets values WSDD_REQFLOW or WSDD_RESFLOW */
WSDDLevels m_lev2; /* gets values WSDD_HANDLER or WSDD_CHAIN */
map<AxisXMLString, AxisXMLString> m_NsStack;
- WSDDService* m_pService; /* Place holder for currently created Service
- object */
- WSDDHandler* m_pHandler; /* Place holder for currently created Handler
- object */
- AXIS_PROTOCOL_TYPE m_CurTrType; /* Current transport type of transport
- handlers */
- AxisChar m_Buffer[TRANSCODE_BUFFER_SIZE]; /* used to transcode 'XMLCh'
- to AxisChar */
+ WSDDService* m_pService;
+ /* Place holder for currently created Service object */
+ WSDDHandler* m_pHandler;
+ /* Place holder for currently created Handler object */
+ AXIS_PROTOCOL_TYPE m_CurTrType;
+ /* Current transport type of transport handlers */
+ AxisChar m_Buffer[TRANSCODE_BUFFER_SIZE];
+ /* used to transcode 'XMLCh' to AxisChar */
public:
virtual ~WSDDDocument(){};
virtual int GetDeployment(const AxisChar* sWSDD,
1.4 +14 -14 ws-axis/c/src/wsdd/WSDDDocumentExpat.cpp
Index: WSDDDocumentExpat.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDocumentExpat.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSDDDocumentExpat.cpp 7 Apr 2004 13:52:01 -0000 1.3
+++ WSDDDocumentExpat.cpp 8 Apr 2004 12:51:55 -0000 1.4
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- * @author Sanjaya Singharage
- * @author Suasntha Kumara (skumara@virtusa.com, susantha@opensource.lk)
+ * @author Sanjaya Singharage
+ * @author Suasntha Kumara (skumara@virtusa.com, susantha@opensource.lk)
*
*/
@@ -53,8 +53,8 @@
int WSDDDocumentExpat::GetDeployment(const AxisChar* sWSDD,
WSDDDeployment* pDeployment)
{
- m_pDeployment = pDeployment; /* this enables the access to Deployment
- object while parsing */
+ m_pDeployment = pDeployment;
+ /* this enables the access to Deployment object while parsing */
if (AXIS_SUCCESS != ParseDocument(sWSDD))
{
AXISTRACE1("Deployment descripter loading failed", CRITICAL);
@@ -108,8 +108,8 @@
int WSDDDocumentExpat::UpdateDeployment(const AxisChar* sWSDD,
WSDDDeployment* pDeployment)
{
- m_pDeployment = pDeployment; /* this enables the access to Deployment
- object while parsing */
+ m_pDeployment = pDeployment;
+ /* this enables the access to Deployment object while parsing */
XML_Parser Parser = XML_ParserCreateNS(NULL, NAMESPACESEPARATOR);
XML_SetUserData(Parser, this);
XML_SetNamespaceDeclHandler(Parser, s_startPrefixMapping,
@@ -130,11 +130,11 @@
{
QName qn;
qn.SplitQNameString(qname,NAMESPACESEPARATOR);
- if (0 != strcmp(qn.localname, kw_param)) /* just neglect endElement
- of parameter */
+ if (0 != strcmp(qn.localname, kw_param))
+ /* just neglect endElement of parameter */
{
- if (m_lev1 == WSDD_UNKNOWN) /* not inside a requestFlow or
- responseFlow elements */
+ if (m_lev1 == WSDD_UNKNOWN)
+ /* not inside a requestFlow or responseFlow elements */
{
switch(m_lev0)
{
@@ -462,8 +462,8 @@
{
QName qn;
qn.SplitQNameString(qname,NAMESPACESEPARATOR);
- if (m_lev1 == WSDD_UNKNOWN) /* not inside a requestFlow or
- responseFlow elements */
+ if (m_lev1 == WSDD_UNKNOWN)
+ /* not inside a requestFlow or responseFlow elements */
{
switch(m_lev0)
{
@@ -575,8 +575,8 @@
{
if(0 == strcmp(qn.localname, kw_param))
{
- GetParameters(m_lev2, attrs); /* must be parameters of
- a handler or a chain */
+ GetParameters(m_lev2, attrs);
+ /* must be parameters of a handler or a chain */
}
else if(0 == strcmp(qn.localname, kw_hdl))
1.4 +16 -15 ws-axis/c/src/wsdd/WSDDDocumentXerces.cpp
Index: WSDDDocumentXerces.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDocumentXerces.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSDDDocumentXerces.cpp 7 Apr 2004 13:52:01 -0000 1.3
+++ WSDDDocumentXerces.cpp 8 Apr 2004 12:51:55 -0000 1.4
@@ -50,8 +50,8 @@
int WSDDDocumentXerces::GetDeployment(const AxisChar* sWSDD,
WSDDDeployment* pDeployment)
{
- m_pDeployment = pDeployment; /* this enables the access to Deployment
- object while parsing */
+ m_pDeployment = pDeployment;
+ /* this enables the access to Deployment object while parsing */
if (AXIS_SUCCESS != ParseDocument(sWSDD))
{
AXISTRACE1("Deployment descripter loading failed", CRITICAL);
@@ -81,8 +81,8 @@
int WSDDDocumentXerces::UpdateDeployment(const AxisChar* sWSDD,
WSDDDeployment* pDeployment)
{
- m_pDeployment = pDeployment; /* this enables the access to Deployment
- object while parsing */
+ m_pDeployment = pDeployment;
+ /* this enables the access to Deployment object while parsing */
try
{
MemBufInputSource Input((const unsigned char*)sWSDD, strlen(sWSDD) ,
@@ -112,11 +112,11 @@
{
AxisXMLString sLname = __XTRC(localname);
const AxisXMLCh* lname = sLname.c_str();
- if (!XMLString::equals(lname, kw_param)) /* just neglect endElement
- of parameter */
+ if (!XMLString::equals(lname, kw_param))
+ /* just neglect endElement of parameter */
{
- if (m_lev1 == WSDD_UNKNOWN) /* not inside a requestFlow or
- responseFlow elements */
+ if (m_lev1 == WSDD_UNKNOWN)
+ /* not inside a requestFlow or responseFlow elements */
{
switch(m_lev0)
{
@@ -278,7 +278,8 @@
/* we get the libname for the hanlder here ??? */
m_pHandler->SetLibName(value);
if (m_pLibNameIdMap->find(value) !=
- m_pLibNameIdMap->end()) /* libray name already in the map */
+ m_pLibNameIdMap->end())
+ /* libray name already in the map */
{
m_pHandler->SetLibId((*m_pLibNameIdMap)[value]);
}
@@ -596,8 +597,8 @@
{
if(XMLString::equals(lname, kw_param))
{
- GetParameters(m_lev2, attrs); /* must be parameters of
- a handler or a chain */
+ GetParameters(m_lev2, attrs);
+ /* must be parameters of a handler or a chain */
}
else if(XMLString::equals(lname, kw_hdl))
@@ -622,15 +623,15 @@
void WSDDDocumentXerces::startPrefixMapping(const XMLCh* const prefix,
const XMLCh* const uri)
{
- m_NsStack[__XTRC(prefix)] = __XTRC(uri); /* I think the same prifix
- cannot repeat ??? */
+ m_NsStack[__XTRC(prefix)] = __XTRC(uri);
+ /* I think the same prifix cannot repeat ??? */
}
void WSDDDocumentXerces::endPrefixMapping(const XMLCh* const prefix)
{
// string sPrifix = prefix;
- m_NsStack.erase(__XTRC(prefix)); /* I think the same prifix cannot
- repeat ??? */
+ m_NsStack.erase(__XTRC(prefix));
+ /* I think the same prifix cannot repeat ??? */
}
void WSDDDocumentXerces::characters (const XMLCh *const chars,
1.3 +6 -6 ws-axis/c/src/wsdd/WSDDDocumentXerces.h
Index: WSDDDocumentXerces.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDocumentXerces.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WSDDDocumentXerces.h 7 Apr 2004 13:52:01 -0000 1.2
+++ WSDDDocumentXerces.h 8 Apr 2004 12:51:55 -0000 1.3
@@ -55,9 +55,9 @@
int GetDeployment(const AxisChar* sWSDD, WSDDDeployment* pDeployment);
int UpdateDeployment(const AxisChar* sWSDD, WSDDDeployment* pDeployment);
- // -----------------------------------------------------------------------
- // Implementations of the SAX DocumentHandler interface
- // -----------------------------------------------------------------------
+
+ /* Implementations of the SAX DocumentHandler interface */
+
void startElement(const XMLCh *const uri, const XMLCh *const localname,
const XMLCh *const qname, const Attributes &attrs);
void characters (const XMLCh *const chars, const unsigned int length);
@@ -66,9 +66,9 @@
void startPrefixMapping(const XMLCh* const prefix, const XMLCh* const uri);
void endPrefixMapping(const XMLCh* const prefix);
- // -----------------------------------------------------------------------
- // Implementations of the SAX ErrorHandler interface
- // -----------------------------------------------------------------------
+
+ /* Implementations of the SAX ErrorHandler interface */
+
void warning(const SAXParseException& exception);
void error(const SAXParseException& exception);
void fatalError(const SAXParseException& exception);
1.12 +2 -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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WSDDKeywords.cpp 7 Apr 2004 13:52:01 -0000 1.11
+++ WSDDKeywords.cpp 8 Apr 2004 12:51:55 -0000 1.12
@@ -78,8 +78,8 @@
kw_tr = __TRC("transport");
kw_name = __TRC("name");
kw_value = __TRC("value");
- kw_type = __TRC("type"); /* what about this ? change to
- libname ? */
+ kw_type = __TRC("type");
+ /* what about this ? change to libname ? */
kw_scope = __TRC("scope");
kw_http = __TRC("http");
kw_smtp = __TRC("smtp");
1.20 +2 -2 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- WSDDService.cpp 7 Apr 2004 13:52:01 -0000 1.19
+++ WSDDService.cpp 8 Apr 2004 12:51:55 -0000 1.20
@@ -134,7 +134,7 @@
{
if (bRequestFlow)
{
- //AXISTRACE1("WSDDService::AddHandler");
+ /* AXISTRACE1("WSDDService::AddHandler"); */
if (!m_RequestHandlers) m_RequestHandlers = new WSDDHandlerList;
m_RequestHandlers->push_back(pHandler);
}
@@ -214,7 +214,7 @@
}
PrintTabs(tabcount+1); *this <<
"<parameter name=\"allowedMethods\" value=\"";
- //for looop
+ /* for looop */
for (list<AxisString>::iterator itrs = m_AllowedMethods.begin();
itrs != m_AllowedMethods.end(); itrs++)
{
1.11 +6 -3 ws-axis/c/src/wsdd/WSDDTransport.cpp
Index: WSDDTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDTransport.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- WSDDTransport.cpp 7 Apr 2004 13:52:01 -0000 1.10
+++ WSDDTransport.cpp 8 Apr 2004 12:51:55 -0000 1.11
@@ -164,13 +164,16 @@
{
WSDDHandlerList &list =
(*m_ResponseHandlers)[(AXIS_PROTOCOL_TYPE)type];
- if (fputs("\t\t<responseFlow>\n", wsddfile) < 0) return AXIS_FAIL;
+ if (fputs("\t\t<responseFlow>\n", wsddfile) < 0)
+ return AXIS_FAIL;
for(iter2 = list.begin(); iter2 != list.end(); iter2++)
{
if (AXIS_SUCCESS !=
- (*iter2)->UpdateWSDD(wsddfile, tabcount)) return AXIS_FAIL;
+ (*iter2)->UpdateWSDD(wsddfile, tabcount))
+ return AXIS_FAIL;
}
- if (fputs("\t\t</responseFlow>\n", wsddfile) < 0) return AXIS_FAIL;
+ if (fputs("\t\t</responseFlow>\n", wsddfile) < 0)
+ return AXIS_FAIL;
}
if (fputs("\t</transport>\n", wsddfile) < 0) return AXIS_FAIL;
}