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 na...@apache.org on 2008/12/03 06:26:26 UTC
svn commit: r722781 - /webservices/axis/trunk/c/src/common/
Author: nadiramra
Date: Tue Dec 2 21:26:22 2008
New Revision: 722781
URL: http://svn.apache.org/viewvc?rev=722781&view=rev
Log:
Minor - remove tabs from code.....replace with spaces.
Modified:
webservices/axis/trunk/c/src/common/AdminUtils.cpp
webservices/axis/trunk/c/src/common/AdminUtils.h
webservices/axis/trunk/c/src/common/ArrayBean.cpp
webservices/axis/trunk/c/src/common/AxisCPPConfigDefaultsImpl.hpp
webservices/axis/trunk/c/src/common/AxisConfig.cpp
webservices/axis/trunk/c/src/common/AxisConfig.h
webservices/axis/trunk/c/src/common/AxisFile.h
webservices/axis/trunk/c/src/common/AxisGenException.h
webservices/axis/trunk/c/src/common/AxisTrace.cpp
webservices/axis/trunk/c/src/common/AxisTrace.h
webservices/axis/trunk/c/src/common/AxisUserAPI.cpp
webservices/axis/trunk/c/src/common/AxisUtils.cpp
webservices/axis/trunk/c/src/common/AxisUtils.h
webservices/axis/trunk/c/src/common/BasicTypeSerializer.cpp
webservices/axis/trunk/c/src/common/BasicTypeSerializer.h
webservices/axis/trunk/c/src/common/MessageData.cpp
webservices/axis/trunk/c/src/common/Param.cpp
webservices/axis/trunk/c/src/common/Param.h
webservices/axis/trunk/c/src/common/TypeMapping.cpp
Modified: webservices/axis/trunk/c/src/common/AdminUtils.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/AdminUtils.cpp?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AdminUtils.cpp (original)
+++ webservices/axis/trunk/c/src/common/AdminUtils.cpp Tue Dec 2 21:26:22 2008
@@ -41,7 +41,7 @@
int AdminUtils::updateWSDD(AxisChar* wsdd)
{
- return g_pWSDDDeployment->updateWSDD(wsdd);
+ return g_pWSDDDeployment->updateWSDD(wsdd);
}
Modified: webservices/axis/trunk/c/src/common/AdminUtils.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/AdminUtils.h?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AdminUtils.h (original)
+++ webservices/axis/trunk/c/src/common/AdminUtils.h Tue Dec 2 21:26:22 2008
@@ -59,7 +59,7 @@
/**
*
*/
- void stopAxis();
+ void stopAxis();
};
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/common/ArrayBean.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/ArrayBean.cpp?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/ArrayBean.cpp (original)
+++ webservices/axis/trunk/c/src/common/ArrayBean.cpp Tue Dec 2 21:26:22 2008
@@ -38,8 +38,8 @@
ArrayBean::
ArrayBean()
{
- logEntryEngine("ArrayBean::ArrayBean")
-
+ logEntryEngine("ArrayBean::ArrayBean")
+
m_type = XSD_UNKNOWN;
m_ItemName = "";
m_value.sta = NULL;
@@ -50,7 +50,7 @@
ArrayBean::
~ArrayBean()
{
- logEntryEngine("ArrayBean::~ArrayBean")
+ logEntryEngine("ArrayBean::~ArrayBean")
if (USER_TYPE == m_type)
{
@@ -75,29 +75,29 @@
}
else if (AxisEngine::m_bServer && m_value.sta)
{
- // TODO - Why do we only do this for server? I think we need to do for client also.
+ // TODO - Why do we only do this for server? I think we need to do for client also.
if (m_nSize > 0)
{
for (int count = 0 ; count < m_nSize ; count++)
- if (((void **) m_value.sta)[count] != NULL)
- Axis::AxisDelete(((void **) m_value.sta)[count], m_type);
+ if (((void **) m_value.sta)[count] != NULL)
+ Axis::AxisDelete(((void **) m_value.sta)[count], m_type);
}
delete [] m_value.sta;
}
-
- logExit()
+
+ logExit()
}
int ArrayBean::
GetArraySize()
-{
+{
return m_nSize;
}
int ArrayBean::
Serialize(SoapSerializer& pSZ)
-{
- logEntryEngine("ArrayBean::Serialize")
+{
+ logEntryEngine("ArrayBean::Serialize")
if (USER_TYPE == m_type)
{
@@ -114,26 +114,26 @@
{
pItem = ptrval[x];
- // try to find the prefix - array prefix overrides the
- // serializer prefix
- const AxisChar* pNamespace = pSZ.getNamespace();
- const AxisChar* pPrefix = NULL;
+ // try to find the prefix - array prefix overrides the
+ // serializer prefix
+ const AxisChar* pNamespace = pSZ.getNamespace();
+ const AxisChar* pPrefix = NULL;
bool blnIsNewPrefix = false;
- if (NULL != pNamespace)
- if (strlen(pNamespace) > 0)
- pPrefix = pSZ.getNamespacePrefix(pNamespace, blnIsNewPrefix);
+ if (NULL != pNamespace)
+ if (strlen(pNamespace) > 0)
+ pPrefix = pSZ.getNamespacePrefix(pNamespace, blnIsNewPrefix);
- if (pPrefix != NULL)
+ if (pPrefix != NULL)
{
- pSZ.serialize("<", pPrefix, ":", m_ItemName.c_str(), NULL);
+ pSZ.serialize("<", pPrefix, ":", m_ItemName.c_str(), NULL);
if (blnIsNewPrefix)
{
pSZ.serialize(" xmlns:", pPrefix, "=\"", pNamespace, "\"", NULL);
}
}
- else
- pSZ.serialize("<", m_ItemName.c_str(), NULL);
-
+ else
+ pSZ.serialize("<", m_ItemName.c_str(), NULL);
+
// note : ">" is not serialized to enable the type's serializer
// to add attributes
@@ -145,10 +145,10 @@
logDebugArg2("Returned from calling object serializer function %p, status %d", m_value.cta->pSZFunct, stat)
// no matter true or false is passed
- if (pPrefix != NULL)
- pSZ.serialize("</", pPrefix, ":", m_ItemName.c_str(), ">", NULL);
- else
- pSZ.serialize("</", m_ItemName.c_str(), ">", NULL);
+ if (pPrefix != NULL)
+ pSZ.serialize("</", pPrefix, ":", m_ItemName.c_str(), ">", NULL);
+ else
+ pSZ.serialize("</", m_ItemName.c_str(), ">", NULL);
if (blnIsNewPrefix)
{
@@ -181,10 +181,10 @@
// this is to prevent serializing type information for basic array elements
- const AxisChar* pNamespace = pSZ.getNamespace();
-
- if (RPC_ENCODED == nStyle)
- pSZ.setStyle(RPC_LITERAL);
+ const AxisChar* pNamespace = pSZ.getNamespace();
+
+ if (RPC_ENCODED == nStyle)
+ pSZ.setStyle(RPC_LITERAL);
void ** p = (void **) m_value.sta;
for (int ix = 0 ; ix < m_nSize ; ix++ )
@@ -192,13 +192,13 @@
pSZ.serializeAsElement(m_ItemName.c_str(), pNamespace, p[ix], m_type);
}
- // restore Serializer's style after array serialization is finished
- if (RPC_ENCODED == nStyle)
- pSZ.setStyle(RPC_ENCODED);
+ // restore Serializer's style after array serialization is finished
+ if (RPC_ENCODED == nStyle)
+ pSZ.setStyle(RPC_ENCODED);
}
-
- logExitWithReturnCode(AXIS_SUCCESS)
-
+
+ logExitWithReturnCode(AXIS_SUCCESS)
+
return AXIS_SUCCESS;
}
@@ -235,17 +235,17 @@
void ArrayBean::
RemoveArrayPointer()
{
- logEntryEngine("ArrayBean::RemoveArrayPointer")
+ logEntryEngine("ArrayBean::RemoveArrayPointer")
if (USER_TYPE == m_type)
{
if (m_value.cta)
- m_value.cta->pObject = NULL;
+ m_value.cta->pObject = NULL;
}
else
m_value.sta = NULL;
-
- logExit()
+
+ logExit()
}
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/common/AxisCPPConfigDefaultsImpl.hpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/AxisCPPConfigDefaultsImpl.hpp?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisCPPConfigDefaultsImpl.hpp (original)
+++ webservices/axis/trunk/c/src/common/AxisCPPConfigDefaultsImpl.hpp Tue Dec 2 21:26:22 2008
@@ -45,41 +45,41 @@
AxisCPPConfigDefaultsImpl();
~AxisCPPConfigDefaultsImpl();
- char* getClientLog();
- char* getClientWSDDFile();
- char* getXMLParserLibrary();
- char* getHTTPTransportLibrary();
- char* getHTTPChannelLibrary();
- char* getHTTPSSLChannelLibrary();
- char* getNodeName();
- char* getListenPort();
- char* getSecureInfo();
- char* getAxisHome();
+ char* getClientLog();
+ char* getClientWSDDFile();
+ char* getXMLParserLibrary();
+ char* getHTTPTransportLibrary();
+ char* getHTTPChannelLibrary();
+ char* getHTTPSSLChannelLibrary();
+ char* getNodeName();
+ char* getListenPort();
+ char* getSecureInfo();
+ char* getAxisHome();
- void setClientLog(char*);
- void setClientWSDDFile(char*);
- void setXMLParserLibrary(char*);
- void setHTTPTransportLibrary(char*);
- void setHTTPChannelLibrary(char*);
- void setHTTPSSLChannelLibrary(char*);
- void setNodeName(char*);
- void setListenPort(char*);
- void setSecureInfo(char*);
- void setAxisHome(char*);
+ void setClientLog(char*);
+ void setClientWSDDFile(char*);
+ void setXMLParserLibrary(char*);
+ void setHTTPTransportLibrary(char*);
+ void setHTTPChannelLibrary(char*);
+ void setHTTPSSLChannelLibrary(char*);
+ void setNodeName(char*);
+ void setListenPort(char*);
+ void setSecureInfo(char*);
+ void setAxisHome(char*);
void apply();
private:
- std::string m_pcClientLog;
- std::string m_pcClientWSDDFile;
- std::string m_pcXMLParserLibrary;
- std::string m_pcHTTPTransportLibrary;
- std::string m_pcHTTPChannelLibrary;
- std::string m_pcHTTPSSLChannelLibrary;
- std::string m_pcNodeName;
- std::string m_pcListenPort;
- std::string m_pcSecureInfo;
- std::string m_pcAxisHome;
+ std::string m_pcClientLog;
+ std::string m_pcClientWSDDFile;
+ std::string m_pcXMLParserLibrary;
+ std::string m_pcHTTPTransportLibrary;
+ std::string m_pcHTTPChannelLibrary;
+ std::string m_pcHTTPSSLChannelLibrary;
+ std::string m_pcNodeName;
+ std::string m_pcListenPort;
+ std::string m_pcSecureInfo;
+ std::string m_pcAxisHome;
};
Modified: webservices/axis/trunk/c/src/common/AxisConfig.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/AxisConfig.cpp?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisConfig.cpp (original)
+++ webservices/axis/trunk/c/src/common/AxisConfig.cpp Tue Dec 2 21:26:22 2008
@@ -93,7 +93,7 @@
m_pcKeyArray[AXCONF_SECUREINFO] = AXCONF_SECUREINFO_TAGNAME;
char * pszDefaultValues[] = {
- "", // (AXCONF_WSDDFILEPATH) Server WSDD File Path
+ "", // (AXCONF_WSDDFILEPATH) Server WSDD File Path
PLATFORM_LOG_PATH, // (AXCONF_LOGPATH) Server log path
PLATFORM_CLIENTLOG_PATH, // (AXCONF_CLIENTLOGPATH) Client log path
"", // (AXCONF_CLIENTWSDDFILEPATH) Client WSDD File Path
Modified: webservices/axis/trunk/c/src/common/AxisConfig.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/AxisConfig.h?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisConfig.h (original)
+++ webservices/axis/trunk/c/src/common/AxisConfig.h Tue Dec 2 21:26:22 2008
@@ -26,20 +26,20 @@
#if !defined(__AXIS_AXISCONFIG_H_OF_AXIS_INCLUDED__)
#define __AXIS_AXISCONFIG_H_OF_AXIS_INCLUDED__
-#define CONFBUFFSIZE 1024
+#define CONFBUFFSIZE 1024
-#define AXCONF_WSDDFILEPATH_TAGNAME "WSDDFilePath"
-#define AXCONF_LOGPATH_TAGNAME "LogPath"
-#define AXCONF_CLIENTLOGPATH_TAGNAME "ClientLogPath"
-#define AXCONF_CLIENTWSDDFILEPATH_TAGNAME "ClientWSDDFilePath"
-#define AXCONF_TRANSPORTHTTP_TAGNAME "Transport_http"
-#define AXCONF_SSLCHANNEL_HTTP_TAGNAME "Channel_HTTP_SSL"
-#define AXCONF_CHANNEL_HTTP_TAGNAME "Channel_HTTP"
-#define AXCONF_TRANSPORTSMTP_TAGNAME "Transport_smtp"
-#define AXCONF_XMLPARSER_TAGNAME "XMLParser"
-#define AXCONF_NODENAME_TAGNAME "NodeName"
-#define AXCONF_LISTENPORT_TAGNAME "ListenPort"
-#define AXCONF_SECUREINFO_TAGNAME "SecureInfo"
+#define AXCONF_WSDDFILEPATH_TAGNAME "WSDDFilePath"
+#define AXCONF_LOGPATH_TAGNAME "LogPath"
+#define AXCONF_CLIENTLOGPATH_TAGNAME "ClientLogPath"
+#define AXCONF_CLIENTWSDDFILEPATH_TAGNAME "ClientWSDDFilePath"
+#define AXCONF_TRANSPORTHTTP_TAGNAME "Transport_http"
+#define AXCONF_SSLCHANNEL_HTTP_TAGNAME "Channel_HTTP_SSL"
+#define AXCONF_CHANNEL_HTTP_TAGNAME "Channel_HTTP"
+#define AXCONF_TRANSPORTSMTP_TAGNAME "Transport_smtp"
+#define AXCONF_XMLPARSER_TAGNAME "XMLParser"
+#define AXCONF_NODENAME_TAGNAME "NodeName"
+#define AXCONF_LISTENPORT_TAGNAME "ListenPort"
+#define AXCONF_SECUREINFO_TAGNAME "SecureInfo"
#define AXCONF_LOGFILTER_TAGNAME "LogFilter"
@@ -61,21 +61,21 @@
enum g_axconfig
{
- AXCONF_WSDDFILEPATH=0,
- AXCONF_LOGPATH,
- AXCONF_CLIENTLOGPATH,
- AXCONF_CLIENTWSDDFILEPATH,
- AXCONF_AXISHOME,
- AXCONF_TRANSPORTHTTP,
- AXCONF_TRANSPORTSMTP,
- AXCONF_XMLPARSER,
- AXCONF_NODENAME,
- AXCONF_LISTENPORT,
- AXCONF_SSLCHANNEL_HTTP,
- AXCONF_CHANNEL_HTTP,
- AXCONF_SECUREINFO,
- AXCONF_LOGFILTER,
- AXCONF_LAST
+ AXCONF_WSDDFILEPATH=0,
+ AXCONF_LOGPATH,
+ AXCONF_CLIENTLOGPATH,
+ AXCONF_CLIENTWSDDFILEPATH,
+ AXCONF_AXISHOME,
+ AXCONF_TRANSPORTHTTP,
+ AXCONF_TRANSPORTSMTP,
+ AXCONF_XMLPARSER,
+ AXCONF_NODENAME,
+ AXCONF_LISTENPORT,
+ AXCONF_SSLCHANNEL_HTTP,
+ AXCONF_CHANNEL_HTTP,
+ AXCONF_SECUREINFO,
+ AXCONF_LOGFILTER,
+ AXCONF_LAST
};
AXIS_CPP_NAMESPACE_START
@@ -97,12 +97,12 @@
/**
* This is called to get the value of a property as defined by the g_axconfig
- * enumeration.
+ * enumeration.
*
* @return the requested value or NULL if the property is not set.
*/
- char* getAxisConfProperty(g_axconfig property);
+ char* getAxisConfProperty(g_axconfig property);
void setValue(int valuelength, g_axconfig valueindex, char* value);
/**
@@ -111,8 +111,8 @@
std::string toString();
private:
- std::string m_pcKeyArray [AXCONF_LAST];
- std::string m_pcValueArray [AXCONF_LAST];
+ std::string m_pcKeyArray [AXCONF_LAST];
+ std::string m_pcValueArray [AXCONF_LAST];
};
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/common/AxisFile.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/AxisFile.h?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisFile.h (original)
+++ webservices/axis/trunk/c/src/common/AxisFile.h Tue Dec 2 21:26:22 2008
@@ -54,7 +54,7 @@
*/
AxisFile()
{
- pFILEFile = NULL;
+ pFILEFile = NULL;
}
/**
@@ -86,14 +86,14 @@
int fileGet(char* sLine, int iBufferSize)
{
if(fgets (sLine, iBufferSize, pFILEFile) != NULL )
- {
- char * newline = strpbrk(sLine, "\n");
- if(newline)
- {
- *newline = '\0';
- }
- return AXIS_SUCCESS;
- }
+ {
+ char * newline = strpbrk(sLine, "\n");
+ if(newline)
+ {
+ *newline = '\0';
+ }
+ return AXIS_SUCCESS;
+ }
return AXIS_FAIL;
}
@@ -104,8 +104,8 @@
int filePuts (const char* pcWrite)
{
if (-1 < fputs(pcWrite, pFILEFile))
- return AXIS_SUCCESS;
- return AXIS_FAIL;
+ return AXIS_SUCCESS;
+ return AXIS_FAIL;
}
/** Use this flush the buffer
@@ -113,8 +113,8 @@
int fileFlush ()
{
if (0 == fflush(pFILEFile))
- return AXIS_SUCCESS;
- return AXIS_FAIL;
+ return AXIS_SUCCESS;
+ return AXIS_FAIL;
}
~AxisFile()
Modified: webservices/axis/trunk/c/src/common/AxisGenException.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/AxisGenException.h?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisGenException.h (original)
+++ webservices/axis/trunk/c/src/common/AxisGenException.h Tue Dec 2 21:26:22 2008
@@ -37,7 +37,7 @@
setMessage(iExceptionCode, "AxisGenException:", pcMessage);
}
AxisGenException(const AxisGenException& e): AxisException ((const AxisException)e) { }
- AxisGenException(const AxisException& e): AxisException (e) { }
+ AxisGenException(const AxisException& e): AxisException (e) { }
virtual ~AxisGenException() throw() { }
};
Modified: webservices/axis/trunk/c/src/common/AxisTrace.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/AxisTrace.cpp?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisTrace.cpp (original)
+++ webservices/axis/trunk/c/src/common/AxisTrace.cpp Tue Dec 2 21:26:22 2008
@@ -57,7 +57,7 @@
//******************************************************************************
int AxisTrace::
startTrace(const char* logFilePath,
- bool dumpEnvironment)
+ bool dumpEnvironment)
{
// If startTrace() already invoked, just return.
if (NULL == logFilePath || 0x00 == *logFilePath)
@@ -78,31 +78,31 @@
// Now dump out environment information
if (dumpEnvironment)
{
- string text = "************ Start Display Current Environment ************\n";
- text += "Axis C++ libraries built on ";
- text += __DATE__;
- text += " at ";
- text += __TIME__;
- text += "\n";
- writeTrace(text);
-
- char *envVars[]={"AXISCPP_DEPLOY", "PATH","LIBPATH","LD_LIBRARY_PATH","SHLIB_PATH",
- "PWD","CLASSPATH","INCLUDE","LIB","NLSPATH","OS",
- "COMPUTERNAME","USERNAME","HOSTNAME","LANG","LOGIN","LOGNAME",
- "MACHTYPE","OSTYPE","UID","USER"};
- for (unsigned i=0; i<(sizeof(envVars)/sizeof(char*)); i++)
- {
- text = envVars[i];
- const char *value = getenv(envVars[i]);
- if (NULL!=value)
- {
- text += "=";
- text += value;
- text += "\n";
- writeTrace(text);
- }
- }
- writeTrace("************* End Display Current Environment *************\n");
+ string text = "************ Start Display Current Environment ************\n";
+ text += "Axis C++ libraries built on ";
+ text += __DATE__;
+ text += " at ";
+ text += __TIME__;
+ text += "\n";
+ writeTrace(text);
+
+ char *envVars[]={"AXISCPP_DEPLOY", "PATH","LIBPATH","LD_LIBRARY_PATH","SHLIB_PATH",
+ "PWD","CLASSPATH","INCLUDE","LIB","NLSPATH","OS",
+ "COMPUTERNAME","USERNAME","HOSTNAME","LANG","LOGIN","LOGNAME",
+ "MACHTYPE","OSTYPE","UID","USER"};
+ for (unsigned i=0; i<(sizeof(envVars)/sizeof(char*)); i++)
+ {
+ text = envVars[i];
+ const char *value = getenv(envVars[i]);
+ if (NULL!=value)
+ {
+ text += "=";
+ text += value;
+ text += "\n";
+ writeTrace(text);
+ }
+ }
+ writeTrace("************* End Display Current Environment *************\n");
}
return AXIS_SUCCESS;
@@ -116,8 +116,8 @@
void AxisTrace::
stopTrace()
{
- m_logFilePath = "";
- m_logFileIsSet = false;
+ m_logFilePath = "";
+ m_logFileIsSet = false;
}
//******************************************************************************
@@ -128,8 +128,8 @@
void AxisTrace::
setLogFilter(const char *filters)
{
- resetLogFilter();
-
+ resetLogFilter();
+
if (filters == NULL || *filters == 0x00)
return;
@@ -159,25 +159,25 @@
string AxisTrace::
getLogFilter()
{
- string filters = "";
- string delimiter = ";";
-
- if (m_noEntryExit)
- filters += TRACE_FILTER_NOENTRYEXIT + delimiter;
-
- if (m_stubLogLevelEnabled)
- filters += TRACE_FILTER_STUB + delimiter;
-
- if (m_engineLogLevelEnabled)
- filters += TRACE_FILTER_ENGINE + delimiter;
-
- if (m_parserLogLevelEnabled)
- filters += TRACE_FILTER_PARSER + delimiter;
-
- if (m_transportLogLevelEnabled)
- filters += TRACE_FILTER_TRANSPORT + delimiter;
-
- return filters;
+ string filters = "";
+ string delimiter = ";";
+
+ if (m_noEntryExit)
+ filters += TRACE_FILTER_NOENTRYEXIT + delimiter;
+
+ if (m_stubLogLevelEnabled)
+ filters += TRACE_FILTER_STUB + delimiter;
+
+ if (m_engineLogLevelEnabled)
+ filters += TRACE_FILTER_ENGINE + delimiter;
+
+ if (m_parserLogLevelEnabled)
+ filters += TRACE_FILTER_PARSER + delimiter;
+
+ if (m_transportLogLevelEnabled)
+ filters += TRACE_FILTER_TRANSPORT + delimiter;
+
+ return filters;
}
//******************************************************************************
@@ -188,11 +188,11 @@
void AxisTrace::
resetLogFilter()
{
- m_stubLogLevelEnabled = true;
- m_engineLogLevelEnabled = true;
- m_parserLogLevelEnabled = true;
- m_transportLogLevelEnabled = true;
- m_noEntryExit = false;
+ m_stubLogLevelEnabled = true;
+ m_engineLogLevelEnabled = true;
+ m_parserLogLevelEnabled = true;
+ m_transportLogLevelEnabled = true;
+ m_noEntryExit = false;
}
//******************************************************************************
@@ -224,14 +224,14 @@
//******************************************************************************
void AxisTrace::
writeEntry (const char* component,
- const char* functionName,
+ const char* functionName,
const char * fmt,
...)
{
- // If logging is not enabled, just return
- if (!isLoggingEnabled())
- return;
-
+ // If logging is not enabled, just return
+ if (!isLoggingEnabled())
+ return;
+
// Filter out entry/exit? If so, simply return.
if (m_noEntryExit)
return;
@@ -255,14 +255,14 @@
//******************************************************************************
void AxisTrace::
writeExit (const char* component,
- const char* functionName,
+ const char* functionName,
const char * fmt,
...)
{
- // If logging is not enabled, just return
- if (!isLoggingEnabled())
- return;
-
+ // If logging is not enabled, just return
+ if (!isLoggingEnabled())
+ return;
+
// Filter out entry/exit? If so, simply return.
if (m_noEntryExit)
return;
@@ -286,15 +286,15 @@
//******************************************************************************
void AxisTrace::
writeTrace (const char* component,
- const char* type,
+ const char* type,
const char* functionName,
const char * fmt,
...)
{
- // If logging is not enabled, just return
- if (!isLoggingEnabled())
- return;
-
+ // If logging is not enabled, just return
+ if (!isLoggingEnabled())
+ return;
+
// Construct final formatter
char myfmt[1024];
if (NULL == fmt)
@@ -314,17 +314,17 @@
//******************************************************************************
void AxisTrace::
writeTrace (const char* component,
- const char* type,
+ const char* type,
const char* functionName,
int lineNumber,
const char* fileName,
const char * fmt,
...)
{
- // If logging is not enabled, just return
- if (!isLoggingEnabled())
- return;
-
+ // If logging is not enabled, just return
+ if (!isLoggingEnabled())
+ return;
+
// Construct final formatter
char myfmt[1024];
if (NULL == fmt)
@@ -344,16 +344,16 @@
//******************************************************************************
void AxisTrace::
writeTrace(const char* component,
- const char* type,
- const char* functionName,
+ const char* type,
+ const char* functionName,
bool hexFormat,
int dataLen,
const char *data)
{
- // If logging is not enabled, just return
- if (!isLoggingEnabled())
- return;
-
+ // If logging is not enabled, just return
+ if (!isLoggingEnabled())
+ return;
+
int len = 0;
if (NULL == data || dataLen==0)
@@ -380,7 +380,7 @@
if (m_consoleMode)
{
- fprintf(stdout, myfmt, dataLen, data);
+ fprintf(stdout, myfmt, dataLen, data);
fflush(stdout);
}
}
@@ -393,10 +393,10 @@
void AxisTrace::
writeTrace(const char* data, int dataLen, bool hexFormat)
{
- // If logging is not enabled, just return
- if (!isLoggingEnabled())
- return;
-
+ // If logging is not enabled, just return
+ if (!isLoggingEnabled())
+ return;
+
int len = 0;
if (NULL == data || dataLen==0)
@@ -428,10 +428,10 @@
void AxisTrace::
writeTrace(string& s)
{
- // If logging is not enabled, just return
- if (!isLoggingEnabled())
- return;
-
+ // If logging is not enabled, just return
+ if (!isLoggingEnabled())
+ return;
+
writeTrace(s.c_str(), s.length());
}
@@ -478,7 +478,7 @@
{
if (NULL == fmt)
fmt = "";
-
+
const int workBufLen=1024;
char workBuf[workBufLen];
memset(workBuf,0,workBufLen);
Modified: webservices/axis/trunk/c/src/common/AxisTrace.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/AxisTrace.h?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisTrace.h (original)
+++ webservices/axis/trunk/c/src/common/AxisTrace.h Tue Dec 2 21:26:22 2008
@@ -82,44 +82,44 @@
*/
class AxisTrace
{
-public:
- // Starting and stopping trace. If log file path is not set, no logging is done
- // unless ConsoleMode is enabled, in which case log records will be written to stdout.
- static int startTrace(const char* logFilePath, bool dumpEnvironment=true);
- static void stopTrace();
- static bool isLoggingEnabled() { return (m_logFileIsSet || m_consoleMode); }
-
- static std::string& getLogFilePath() { return m_logFilePath; }
-
- // Setting log filters. The string filter is a semicolon delimited string
- // of possible filters. For example, setLogFilter("noEntryExit;").
- static void setLogFilter(const char *filters);
- static std::string getLogFilter();
-
- // Rest log filters to default values, which is: "stub;engine;transport;parser"
- static void resetLogFilter();
-
- // Whether to print log records to the console (i.e. stdout).
- static void enableConsoleMode();
- static void disableConsoleMode();
-
- // Entry/exit tracing.
- static void writeEntry (const char* component, const char* functionName, const char * fmt, ...);
- static void writeExit (const char* component, const char* functionName, const char * fmt, ...);
-
- // Write trace data. Trace records will include prefix (i.e. timestamp, etc).
- static void writeTrace (const char* component, const char* type, const char* functionName,
- const char * fmt, ...);
- static void writeTrace (const char* component, const char* type, const char* functionName,
- int lineNumber, const char* fileName, const char * fmt, ...);
- static void writeTrace (const char* component, const char* type, const char* functionName,
- bool hexFormat, int dataLen, const char *data);
- static void writeTrace (const char *fmt, va_list vargs);
-
- // Write trace data. No trace record prefix is printed out (i.e. no timestamp, etc).
- static void writeTrace (std::string& s);
- static void writeTrace (const char *data, int dataLen, bool hexFormat=false);
- static void writeTrace (const char *str) { writeTrace(str, strlen(str)); }
+public:
+ // Starting and stopping trace. If log file path is not set, no logging is done
+ // unless ConsoleMode is enabled, in which case log records will be written to stdout.
+ static int startTrace(const char* logFilePath, bool dumpEnvironment=true);
+ static void stopTrace();
+ static bool isLoggingEnabled() { return (m_logFileIsSet || m_consoleMode); }
+
+ static std::string& getLogFilePath() { return m_logFilePath; }
+
+ // Setting log filters. The string filter is a semicolon delimited string
+ // of possible filters. For example, setLogFilter("noEntryExit;").
+ static void setLogFilter(const char *filters);
+ static std::string getLogFilter();
+
+ // Rest log filters to default values, which is: "stub;engine;transport;parser"
+ static void resetLogFilter();
+
+ // Whether to print log records to the console (i.e. stdout).
+ static void enableConsoleMode();
+ static void disableConsoleMode();
+
+ // Entry/exit tracing.
+ static void writeEntry (const char* component, const char* functionName, const char * fmt, ...);
+ static void writeExit (const char* component, const char* functionName, const char * fmt, ...);
+
+ // Write trace data. Trace records will include prefix (i.e. timestamp, etc).
+ static void writeTrace (const char* component, const char* type, const char* functionName,
+ const char * fmt, ...);
+ static void writeTrace (const char* component, const char* type, const char* functionName,
+ int lineNumber, const char* fileName, const char * fmt, ...);
+ static void writeTrace (const char* component, const char* type, const char* functionName,
+ bool hexFormat, int dataLen, const char *data);
+ static void writeTrace (const char *fmt, va_list vargs);
+
+ // Write trace data. No trace record prefix is printed out (i.e. no timestamp, etc).
+ static void writeTrace (std::string& s);
+ static void writeTrace (const char *data, int dataLen, bool hexFormat=false);
+ static void writeTrace (const char *str) { writeTrace(str, strlen(str)); }
// To determine when a log component is enabled.
static bool isStubLoggingEnabled() { return m_stubLogLevelEnabled; }
@@ -128,20 +128,20 @@
static bool isTransportLoggingEnabled() { return m_transportLogLevelEnabled; }
private:
- // Internal function for writing trace data
- static void generatePrefix(std::string &prefix, const char *fmt);
+ // Internal function for writing trace data
+ static void generatePrefix(std::string &prefix, const char *fmt);
- // Data fields.
- static bool m_logFileIsSet;
-
- static bool m_stubLogLevelEnabled;
- static bool m_engineLogLevelEnabled;
- static bool m_parserLogLevelEnabled;
- static bool m_transportLogLevelEnabled;
-
- static bool m_consoleMode;
-
- static bool m_noEntryExit;
+ // Data fields.
+ static bool m_logFileIsSet;
+
+ static bool m_stubLogLevelEnabled;
+ static bool m_engineLogLevelEnabled;
+ static bool m_parserLogLevelEnabled;
+ static bool m_transportLogLevelEnabled;
+
+ static bool m_consoleMode;
+
+ static bool m_noEntryExit;
static std::string m_logFilePath;
};
@@ -181,7 +181,7 @@
logSetFunctionNameStub(lFunctionName) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeEntry(logComponent, logFunctionName, NULL); \
+ AxisTrace::writeEntry(logComponent, logFunctionName, NULL); \
} \
}
@@ -189,7 +189,7 @@
logSetFunctionNameEngine(lFunctionName) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeEntry(logComponent, logFunctionName, NULL); \
+ AxisTrace::writeEntry(logComponent, logFunctionName, NULL); \
} \
}
@@ -197,7 +197,7 @@
logSetFunctionNameParser(lFunctionName) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeEntry(logComponent, logFunctionName, NULL); \
+ AxisTrace::writeEntry(logComponent, logFunctionName, NULL); \
} \
}
@@ -205,7 +205,7 @@
logSetFunctionNameTransport(lFunctionName) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeEntry(logComponent, logFunctionName, NULL); \
+ AxisTrace::writeEntry(logComponent, logFunctionName, NULL); \
} \
}
@@ -216,49 +216,49 @@
#define logExit() \
{ \
if (loggingEnabled) { \
- AxisTrace::writeExit(logComponent, logFunctionName, NULL); \
+ AxisTrace::writeExit(logComponent, logFunctionName, NULL); \
} \
}
#define logExitWithReturnCode(lRC) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeExit(logComponent, logFunctionName, "Exit with return code of %s", lRC == AXIS_SUCCESS ? "AXIS_SUCCESS" : "AXIS_FAIL"); \
+ AxisTrace::writeExit(logComponent, logFunctionName, "Exit with return code of %s", lRC == AXIS_SUCCESS ? "AXIS_SUCCESS" : "AXIS_FAIL"); \
} \
}
#define logExitWithInteger(lint) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeExit(logComponent, logFunctionName, "Exit with integer value of %d", lint); \
+ AxisTrace::writeExit(logComponent, logFunctionName, "Exit with integer value of %d", lint); \
} \
}
#define logExitWithPointer(lPointer) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeExit(logComponent, logFunctionName, "Exit with object pointer %p", lPointer); \
+ AxisTrace::writeExit(logComponent, logFunctionName, "Exit with object pointer %p", lPointer); \
} \
}
#define logExitWithString(lString) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeExit(logComponent, logFunctionName, "Exit with string \"%s\"", lString); \
+ AxisTrace::writeExit(logComponent, logFunctionName, "Exit with string \"%s\"", lString); \
} \
}
#define logExitWithBoolean(lBoolean) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeExit(logComponent, logFunctionName, "Exit with boolean %s", lBoolean ? "true" : "false"); \
+ AxisTrace::writeExit(logComponent, logFunctionName, "Exit with boolean %s", lBoolean ? "true" : "false"); \
} \
}
#define logExitWithMessage(lfmt) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeExit(logComponent, logFunctionName, lfmt); \
+ AxisTrace::writeExit(logComponent, logFunctionName, lfmt); \
} \
}
@@ -269,23 +269,23 @@
#define logThrowException(lException) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeTrace(logComponent, TRACE_TYPE_EXCEPT, logFunctionName, __LINE__, __FILE__, lException); \
- AxisTrace::writeExit(logComponent, logFunctionName, NULL); \
+ AxisTrace::writeTrace(logComponent, TRACE_TYPE_EXCEPT, logFunctionName, __LINE__, __FILE__, lException); \
+ AxisTrace::writeExit(logComponent, logFunctionName, NULL); \
} \
}
#define logThrowExceptionWithData(lException, lExceptionMessage) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeTrace(logComponent, TRACE_TYPE_EXCEPT, logFunctionName, __LINE__, __FILE__, "%s: %s", lException, lExceptionMessage); \
- AxisTrace::writeExit(logComponent, logFunctionName, NULL); \
+ AxisTrace::writeTrace(logComponent, TRACE_TYPE_EXCEPT, logFunctionName, __LINE__, __FILE__, "%s: %s", lException, lExceptionMessage); \
+ AxisTrace::writeExit(logComponent, logFunctionName, NULL); \
} \
}
#define logRethrowException() \
{ \
if (loggingEnabled) { \
- AxisTrace::writeExit(logComponent, logFunctionName, "%s", "Rethrowing exception"); \
+ AxisTrace::writeExit(logComponent, logFunctionName, "%s", "Rethrowing exception"); \
} \
}
@@ -296,42 +296,42 @@
#define logDebug(lFmt) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeTrace(logComponent, TRACE_TYPE_DEBUG, logFunctionName, lFmt); \
+ AxisTrace::writeTrace(logComponent, TRACE_TYPE_DEBUG, logFunctionName, lFmt); \
} \
}
#define logDebugArg1(lFmt, lArg1) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeTrace(logComponent, TRACE_TYPE_DEBUG, logFunctionName, lFmt, lArg1); \
+ AxisTrace::writeTrace(logComponent, TRACE_TYPE_DEBUG, logFunctionName, lFmt, lArg1); \
} \
}
#define logDebugArg2(lFmt, lArg1, lArg2) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeTrace(logComponent, TRACE_TYPE_DEBUG, logFunctionName, lFmt, lArg1, lArg2); \
+ AxisTrace::writeTrace(logComponent, TRACE_TYPE_DEBUG, logFunctionName, lFmt, lArg1, lArg2); \
} \
}
#define logDebugArg3(lFmt, lArg1, lArg2, lArg3) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeTrace(logComponent, TRACE_TYPE_DEBUG, logFunctionName, lFmt, lArg1, lArg2, lArg3); \
+ AxisTrace::writeTrace(logComponent, TRACE_TYPE_DEBUG, logFunctionName, lFmt, lArg1, lArg2, lArg3); \
} \
}
#define logDebugArg4(lFmt, lArg1, lArg2, lArg3, lArg4) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeTrace(logComponent, TRACE_TYPE_DEBUG, logFunctionName, lFmt, lArg1, lArg2, lArg3, lArg4); \
+ AxisTrace::writeTrace(logComponent, TRACE_TYPE_DEBUG, logFunctionName, lFmt, lArg1, lArg2, lArg3, lArg4); \
} \
}
#define logDebugBuffer(lBuf, lBufLen) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeTrace(logComponent, TRACE_TYPE_DEBUG, logFunctionName, false, lBufLen, lBuf); \
+ AxisTrace::writeTrace(logComponent, TRACE_TYPE_DEBUG, logFunctionName, false, lBufLen, lBuf); \
} \
}
@@ -339,7 +339,7 @@
#define logWarning(lFmt) \
{ \
if (loggingEnabled) { \
- AxisTrace::writeTrace(logComponent, TRACE_TYPE_WARN, logFunctionName, lFmt); \
+ AxisTrace::writeTrace(logComponent, TRACE_TYPE_WARN, logFunctionName, lFmt); \
} \
}
Modified: webservices/axis/trunk/c/src/common/AxisUserAPI.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/AxisUserAPI.cpp?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisUserAPI.cpp (original)
+++ webservices/axis/trunk/c/src/common/AxisUserAPI.cpp Tue Dec 2 21:26:22 2008
@@ -162,7 +162,7 @@
AnyType::~AnyType()
{
- // TODO add code to free storage!
+ // TODO add code to free storage!
}
Axis_Array::Axis_Array()
@@ -215,12 +215,12 @@
switch (m_Type)
{
- case XSD_STRING:
- {
- ((xsd__string*) m_Array)[count] = new char[strlen(((xsd__string*) array)[count])+1];
- strcpy(((xsd__string*) m_Array)[count], ((xsd__string*) array)[count]);
- break;
- }
+ case XSD_STRING:
+ {
+ ((xsd__string*) m_Array)[count] = new char[strlen(((xsd__string*) array)[count])+1];
+ strcpy(((xsd__string*) m_Array)[count], ((xsd__string*) array)[count]);
+ break;
+ }
case XSD_DURATION:
{
((xsd__duration**) m_Array)[count] = new xsd__duration();
@@ -531,12 +531,12 @@
{
switch (m_Type)
{
- case XSD_STRING:
- {
- ((xsd__string*) m_Array)[m_Size] = new char[strlen((xsd__string) element)+1];
- strcpy(((xsd__string*) m_Array)[m_Size], (xsd__string) element);
- break;
- }
+ case XSD_STRING:
+ {
+ ((xsd__string*) m_Array)[m_Size] = new char[strlen((xsd__string) element)+1];
+ strcpy(((xsd__string*) m_Array)[m_Size], (xsd__string) element);
+ break;
+ }
case XSD_DURATION:
{
((xsd__duration**) m_Array)[m_Size] = new xsd__duration();
@@ -836,7 +836,7 @@
{
for (int count = 0 ; count < m_Size ; count++)
if (m_Array[count] != NULL)
- Axis::AxisDelete(m_Array[count], m_Type);
+ Axis::AxisDelete(m_Array[count], m_Type);
m_Size = 0;
}
@@ -845,7 +845,7 @@
delete [] m_Array;
else
{
- // Warning!! This could introduce memory leaks if used incorrectly!!!
+ // Warning!! This could introduce memory leaks if used incorrectly!!!
m_Array = NULL;
m_belongsToAxisEngine = true;
}
Modified: webservices/axis/trunk/c/src/common/AxisUtils.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/AxisUtils.cpp?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisUtils.cpp (original)
+++ webservices/axis/trunk/c/src/common/AxisUtils.cpp Tue Dec 2 21:26:22 2008
@@ -138,29 +138,29 @@
xsd__base64Binary * AxisUtils::decodeFromBase64Binary(const AxisChar *pValue)
{
xsd__base64Binary* value = new xsd__base64Binary();
- int size = apr_base64_decode_len (pValue);
- xsd__unsignedByte * pTemp = new unsigned char[size + 1];
- size = apr_base64_decode_binary (pTemp, pValue);
- pTemp[size] = 0; // Null terminate so it could be used as a string
- value->set(pTemp, size);
- delete [] pTemp;
+ int size = apr_base64_decode_len (pValue);
+ xsd__unsignedByte * pTemp = new unsigned char[size + 1];
+ size = apr_base64_decode_binary (pTemp, pValue);
+ pTemp[size] = 0; // Null terminate so it could be used as a string
+ value->set(pTemp, size);
+ delete [] pTemp;
return value;
}
bool AxisUtils::isStringOnlyWithSpaces(const char* pchWord)
{
- bool blnStatus = true;
+ bool blnStatus = true;
- int iLen = strlen(pchWord);
+ int iLen = strlen(pchWord);
- for (int i=0; i<iLen; i++) {
- if (pchWord[i] != ' ') {
- blnStatus = false;
- break;
- }
- }
+ for (int i=0; i<iLen; i++) {
+ if (pchWord[i] != ' ') {
+ blnStatus = false;
+ break;
+ }
+ }
- return blnStatus;
+ return blnStatus;
}
IAnySimpleType* AxisUtils::createSimpleTypeObject(XSDTYPE type)
@@ -170,61 +170,61 @@
IAnySimpleType* AxisUtils::createSimpleTypeObject(void * pValue, XSDTYPE type)
{
- logEntryEngine("AxisUtils::createSimpleTypeObject")
+ logEntryEngine("AxisUtils::createSimpleTypeObject")
IAnySimpleType* xsdValue = NULL;
// Put commonly used type at top of switch statement!
switch (type)
{
- case XSD_STRING:
- xsdValue = new String((xsd__string) pValue);
- break;
- case XSD_NORMALIZEDSTRING:
- xsdValue = new NormalizedString((xsd__normalizedString) pValue);
- break;
- case XSD_DECIMAL:
- xsdValue = new Decimal((xsd__decimal*) pValue);
- break;
- case XSD_INTEGER:
- xsdValue = new Integer((xsd__integer*) pValue);
- break;
- case XSD_LONG:
- xsdValue = new Long((xsd__long*) pValue);
- break;
- case XSD_INT:
- xsdValue = new Int((xsd__int*) pValue);
- break;
- case XSD_SHORT:
- xsdValue = new Short((xsd__short*) pValue);
- break;
- case XSD_BYTE:
- xsdValue = new Byte((xsd__byte*) pValue);
- break;
- case XSD_NONNEGATIVEINTEGER:
- xsdValue = new NonNegativeInteger((xsd__nonNegativeInteger*) pValue);
- break;
- case XSD_UNSIGNEDLONG:
- xsdValue = new UnsignedLong((xsd__unsignedLong*) pValue);
- break;
- case XSD_UNSIGNEDINT:
- xsdValue = new UnsignedInt((xsd__unsignedInt*) pValue);
- break;
- case XSD_UNSIGNEDSHORT:
- xsdValue = new UnsignedShort((xsd__unsignedShort*) pValue);
- break;
- case XSD_UNSIGNEDBYTE:
- xsdValue = new UnsignedByte((xsd__unsignedByte*) pValue);
- break;
- case XSD_POSITIVEINTEGER:
- xsdValue = new PositiveInteger((xsd__positiveInteger*) pValue);
- break;
- case XSD_NONPOSITIVEINTEGER:
- xsdValue = new NonPositiveInteger((xsd__nonPositiveInteger*) pValue);
- break;
- case XSD_NEGATIVEINTEGER:
- xsdValue = new NegativeInteger((xsd__negativeInteger*) pValue);
- break;
+ case XSD_STRING:
+ xsdValue = new String((xsd__string) pValue);
+ break;
+ case XSD_NORMALIZEDSTRING:
+ xsdValue = new NormalizedString((xsd__normalizedString) pValue);
+ break;
+ case XSD_DECIMAL:
+ xsdValue = new Decimal((xsd__decimal*) pValue);
+ break;
+ case XSD_INTEGER:
+ xsdValue = new Integer((xsd__integer*) pValue);
+ break;
+ case XSD_LONG:
+ xsdValue = new Long((xsd__long*) pValue);
+ break;
+ case XSD_INT:
+ xsdValue = new Int((xsd__int*) pValue);
+ break;
+ case XSD_SHORT:
+ xsdValue = new Short((xsd__short*) pValue);
+ break;
+ case XSD_BYTE:
+ xsdValue = new Byte((xsd__byte*) pValue);
+ break;
+ case XSD_NONNEGATIVEINTEGER:
+ xsdValue = new NonNegativeInteger((xsd__nonNegativeInteger*) pValue);
+ break;
+ case XSD_UNSIGNEDLONG:
+ xsdValue = new UnsignedLong((xsd__unsignedLong*) pValue);
+ break;
+ case XSD_UNSIGNEDINT:
+ xsdValue = new UnsignedInt((xsd__unsignedInt*) pValue);
+ break;
+ case XSD_UNSIGNEDSHORT:
+ xsdValue = new UnsignedShort((xsd__unsignedShort*) pValue);
+ break;
+ case XSD_UNSIGNEDBYTE:
+ xsdValue = new UnsignedByte((xsd__unsignedByte*) pValue);
+ break;
+ case XSD_POSITIVEINTEGER:
+ xsdValue = new PositiveInteger((xsd__positiveInteger*) pValue);
+ break;
+ case XSD_NONPOSITIVEINTEGER:
+ xsdValue = new NonPositiveInteger((xsd__nonPositiveInteger*) pValue);
+ break;
+ case XSD_NEGATIVEINTEGER:
+ xsdValue = new NegativeInteger((xsd__negativeInteger*) pValue);
+ break;
case XSD_FLOAT:
xsdValue = new Float((xsd__float*) pValue);
break;
Modified: webservices/axis/trunk/c/src/common/AxisUtils.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/AxisUtils.h?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisUtils.h (original)
+++ webservices/axis/trunk/c/src/common/AxisUtils.h Tue Dec 2 21:26:22 2008
@@ -118,56 +118,56 @@
static bool isStringOnlyWithSpaces(const char* pchWord);
- /**
- * Decodes the given base64 string and returns it.
- */
+ /**
+ * Decodes the given base64 string and returns it.
+ */
static xsd__base64Binary * decodeFromBase64Binary(const AxisChar* pValue);
/*
- * Converts the given character pointer value to lowercase.
- * @param pchWord The character pointer to be converted.
- * @return The converted lowercase character value
- */
+ * Converts the given character pointer value to lowercase.
+ * @param pchWord The character pointer to be converted.
+ * @return The converted lowercase character value
+ */
static char *toLowerCase (const char* pchWord);
/*
- * Converts the given string to lowercase.
- * @param pchWord The string to be converted.
- * @return The converted lowercase string value
- */
+ * Converts the given string to lowercase.
+ * @param pchWord The string to be converted.
+ * @return The converted lowercase string value
+ */
static string toLowerCase (const string sWord);
/*
- * Converts the given character pointer value to uppercase.
- * @param pchWord The character pointer to be converted.
- * @return The converted uppercase character value
- */
+ * Converts the given character pointer value to uppercase.
+ * @param pchWord The character pointer to be converted.
+ * @return The converted uppercase character value
+ */
static char *toUpperCase (const char* pchWord);
/*
- * Converts the given string to uppercase.
- * @param pchWord The string to be converted.
- * @return The converted uppercase string value
- */
+ * Converts the given string to uppercase.
+ * @param pchWord The string to be converted.
+ * @return The converted uppercase string value
+ */
static string toUpperCase (const string sWord);
/*
- * Searchs for the specified character in the given character array and
- * returns whether it is found or not.
- * @param pchStringToSearch The character array to be searched.
- * @param cCharacter The character to search.
- */
+ * Searchs for the specified character in the given character array and
+ * returns whether it is found or not.
+ * @param pchStringToSearch The character array to be searched.
+ * @param cCharacter The character to search.
+ */
static bool isCharacterAvailable (const char* pchStringToSearch,
const char cCharacter);
/*
- * Searchs for the specified character in the given string and returns
- * whether it is found or not.
- * @param sString The string array to be searched.
- * @param cCharacter The character to search.
- */
+ * Searchs for the specified character in the given string and returns
+ * whether it is found or not.
+ * @param sString The string array to be searched.
+ * @param cCharacter The character to search.
+ */
static bool isCharacterAvailable (const string &sString,
const char cCharacter);
/*
- * Clears the content of passed character array
- * @param arrCh The character array which is to be cleared.
- * @param iSize The size of the array which is to be cleared.
- */
+ * Clears the content of passed character array
+ * @param arrCh The character array which is to be cleared.
+ * @param iSize The size of the array which is to be cleared.
+ */
static int clearArray (char* arrCh, int iSize);
static void initialize ();
static const AxisXMLCh* ToAxisXMLCh (const AxisChar* pch);
Modified: webservices/axis/trunk/c/src/common/BasicTypeSerializer.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/BasicTypeSerializer.cpp?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/BasicTypeSerializer.cpp (original)
+++ webservices/axis/trunk/c/src/common/BasicTypeSerializer.cpp Tue Dec 2 21:26:22 2008
@@ -36,7 +36,7 @@
BasicTypeSerializer::
BasicTypeSerializer ()
{
- logEntryEngine("BasicTypeSerializer::BasicTypeSerializer")
+ logEntryEngine("BasicTypeSerializer::BasicTypeSerializer")
m_sSZ = "";
@@ -46,7 +46,7 @@
BasicTypeSerializer::
~BasicTypeSerializer ()
{
- logEntryEngine("BasicTypeSerializer::~BasicTypeSerializer")
+ logEntryEngine("BasicTypeSerializer::~BasicTypeSerializer")
logExit()
}
@@ -55,7 +55,7 @@
serializeAsElement (const AxisChar* pName,
IAnySimpleType* pSimpleType)
{
- return serializeAsElement(pName, NULL, pSimpleType);
+ return serializeAsElement(pName, NULL, pSimpleType);
}
const AxisChar* BasicTypeSerializer::
@@ -72,14 +72,14 @@
const AxisChar* pNamespace,
IAnySimpleType* pSimpleType)
{
- logEntryEngine("BasicTypeSerializer::serializeAsElement")
+ logEntryEngine("BasicTypeSerializer::serializeAsElement")
m_sSZ = "<";
- if (NULL != pPrefix)
- {
- m_sSZ += pPrefix;
- m_sSZ += ":";
- }
+ if (NULL != pPrefix)
+ {
+ m_sSZ += pPrefix;
+ m_sSZ += ":";
+ }
m_sSZ += pName;
@@ -127,11 +127,11 @@
m_sSZ += pSimpleType->serialize();
m_sSZ += "</";
- if (NULL != pPrefix)
- {
- m_sSZ += pPrefix;
- m_sSZ += ":";
- }
+ if (NULL != pPrefix)
+ {
+ m_sSZ += pPrefix;
+ m_sSZ += ":";
+ }
m_sSZ += pName;
m_sSZ += ">\n";
@@ -142,10 +142,10 @@
const AxisChar* BasicTypeSerializer::
serializeAsAttribute (const AxisChar* pName,
- const AxisChar* pPrefix,
+ const AxisChar* pPrefix,
IAnySimpleType* pSimpleType)
{
- logEntryEngine("BasicTypeSerializer::serializeAsAttribute")
+ logEntryEngine("BasicTypeSerializer::serializeAsAttribute")
m_sSZ = ' ';
if (pPrefix)
Modified: webservices/axis/trunk/c/src/common/BasicTypeSerializer.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/BasicTypeSerializer.h?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/BasicTypeSerializer.h (original)
+++ webservices/axis/trunk/c/src/common/BasicTypeSerializer.h Tue Dec 2 21:26:22 2008
@@ -84,7 +84,7 @@
* @param pPrefix the optional prefix for this element.
* @param pSimpleType the value for this element.
*/
- const AxisChar* serializeAsElement(const AxisChar* pName,
+ const AxisChar* serializeAsElement(const AxisChar* pName,
const AxisChar* pPrefix, IAnySimpleType* pSimpleType);
/**
* Serializes a SOAP Element.
Modified: webservices/axis/trunk/c/src/common/MessageData.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/MessageData.cpp?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/MessageData.cpp (original)
+++ webservices/axis/trunk/c/src/common/MessageData.cpp Tue Dec 2 21:26:22 2008
@@ -39,7 +39,7 @@
MessageData::
MessageData ()
{
- logEntryEngine("MessageData::MessageData")
+ logEntryEngine("MessageData::MessageData")
m_pSZ = NULL;
m_pDZ = NULL;
@@ -51,14 +51,14 @@
MessageData::
~MessageData ()
{
- logEntryEngine("MessageData::~MessageData")
+ logEntryEngine("MessageData::~MessageData")
map < const AxisChar*, const AxisChar*, ltstr >::const_iterator itCurrentItem = m_Properties.begin ();
while (itCurrentItem != m_Properties.end ())
{
delete [] (char*)(*itCurrentItem).first;
- delete [] (char*)(*itCurrentItem).second;
+ delete [] (char*)(*itCurrentItem).second;
itCurrentItem++;
}
@@ -83,12 +83,12 @@
void MessageData::
setOperationName(const AxisChar* pchOperation)
{
- m_sOperationName = pchOperation;
+ m_sOperationName = pchOperation;
}
const AxisChar* MessageData::
getOperationName()
{
- return m_sOperationName.c_str();
+ return m_sOperationName.c_str();
}
void MessageData::
@@ -151,7 +151,7 @@
int MessageData::
setProperty (const AxisChar* pachName,
- const AxisChar* pachValue)
+ const AxisChar* pachValue)
{
AxisChar* pachTmpName = new AxisChar[strlen (pachName) + 1];
strcpy (pachTmpName, pachName);
@@ -165,8 +165,8 @@
int MessageData::
setProperty (const AxisChar* pachName,
- const void* pachValue,
- int len)
+ const void* pachValue,
+ int len)
{
AxisChar* pachTmpName = new AxisChar[strlen (pachName) + 1];
strcpy (pachTmpName, pachName);
@@ -180,8 +180,8 @@
void MessageData::
setComplexProperty(const AxisChar* pachName,
- void* pValue,
- int iObjectSize)
+ void* pValue,
+ int iObjectSize)
{
AxisChar* pachTmpName = new AxisChar[strlen (pachName) + 1];
strcpy (pachTmpName, pachName);
@@ -215,7 +215,7 @@
return m_ComplexProperties[pachName];
}
- return NULL;
+ return NULL;
}
void MessageData::
Modified: webservices/axis/trunk/c/src/common/Param.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/Param.cpp?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/Param.cpp (original)
+++ webservices/axis/trunk/c/src/common/Param.cpp Tue Dec 2 21:26:22 2008
@@ -45,7 +45,7 @@
Param::
~Param ()
{
- logEntryEngine("Param::~Param")
+ logEntryEngine("Param::~Param")
if (m_AnySimpleType)
{
@@ -76,7 +76,7 @@
int Param::
serialize (SoapSerializer &pSZ)
{
- logEntryEngine("Param::serialize")
+ logEntryEngine("Param::serialize")
AxisString ATprefix;
switch (m_Type)
@@ -116,8 +116,8 @@
// If null input, serialize as nil element.
// ======================================================================
- pSZ.serializeAsAttribute( "xsi:nil", 0, (void*)&(xsd_boolean_true), XSD_BOOLEAN);
- pSZ.serialize( ">", NULL);
+ pSZ.serializeAsAttribute( "xsi:nil", 0, (void*)&(xsd_boolean_true), XSD_BOOLEAN);
+ pSZ.serialize( ">", NULL);
}
else
{
@@ -185,11 +185,11 @@
}
else
{
- // In order to support doc/lit unwrapped, m_sName (qualified element name) is passed as a null
- // string in the stub code. So we do not want to serialize null string in this case.
- //
- // NOTE: ">" is not serialized to enable the type's serializer to add attributes.
- if (!m_sName.empty())
+ // In order to support doc/lit unwrapped, m_sName (qualified element name) is passed as a null
+ // string in the stub code. So we do not want to serialize null string in this case.
+ //
+ // NOTE: ">" is not serialized to enable the type's serializer to add attributes.
+ if (!m_sName.empty())
pSZ.serialize ("<", m_sName.c_str (), NULL);
logDebugArg2("Calling serializer function %p for complex object %p", m_Value.pCplxObj->pSZFunct, m_Value.pCplxObj->pObject)
@@ -222,7 +222,7 @@
setValue(XSDTYPE nType,
IAnySimpleType* value)
{
- logEntryEngine("Param::setValue")
+ logEntryEngine("Param::setValue")
m_Type = nType;
m_AnySimpleType = value;
@@ -245,7 +245,7 @@
AXIS_DESERIALIZE_FUNCT pDZFunct,
AXIS_OBJECT_DELETE_FUNCT pDelFunct)
{
- logEntryEngine("Param::setUserType")
+ logEntryEngine("Param::setUserType")
if (m_Type != USER_TYPE)
return AXIS_FAIL;
@@ -263,20 +263,20 @@
int Param::
setArrayElements (void* pElements)
{
- logEntryEngine("Param::setArrayElements")
-
- int rc = AXIS_FAIL;
+ logEntryEngine("Param::setArrayElements")
+
+ int rc = AXIS_FAIL;
if (m_Type == XSD_ARRAY)
{
- if (m_Value.pArray)
- {
- if (m_Value.pArray->m_type != USER_TYPE)
- {
- m_Value.pArray->m_value.sta = pElements;
- rc = AXIS_SUCCESS;
- }
- }
+ if (m_Value.pArray)
+ {
+ if (m_Value.pArray->m_type != USER_TYPE)
+ {
+ m_Value.pArray->m_value.sta = pElements;
+ rc = AXIS_SUCCESS;
+ }
+ }
}
logExitWithReturnCode(rc)
@@ -290,24 +290,24 @@
AXIS_DESERIALIZE_FUNCT pDZFunct,
AXIS_OBJECT_DELETE_FUNCT pDelFunct)
{
- logEntryEngine("Param::setArrayElements")
+ logEntryEngine("Param::setArrayElements")
- int rc = AXIS_FAIL;
+ int rc = AXIS_FAIL;
if (m_Type == XSD_ARRAY)
{
- if (m_Value.pArray)
- {
- if (m_Value.pArray->m_type == USER_TYPE)
- {
- m_Value.pArray->m_value.cta = new ComplexObjectHandler;
- m_Value.pArray->m_value.cta->pDZFunct = pDZFunct;
- m_Value.pArray->m_value.cta->pDelFunct = pDelFunct;
- m_Value.pArray->m_value.cta->pObject = pObject;
-
- rc = AXIS_SUCCESS;
- }
- }
+ if (m_Value.pArray)
+ {
+ if (m_Value.pArray->m_type == USER_TYPE)
+ {
+ m_Value.pArray->m_value.cta = new ComplexObjectHandler;
+ m_Value.pArray->m_value.cta->pDZFunct = pDZFunct;
+ m_Value.pArray->m_value.cta->pDelFunct = pDelFunct;
+ m_Value.pArray->m_value.cta->pObject = pObject;
+
+ rc = AXIS_SUCCESS;
+ }
+ }
}
logExitWithReturnCode(rc)
@@ -324,17 +324,17 @@
ComplexObjectHandler::
ComplexObjectHandler ()
{
- logEntryEngine("ComplexObjectHandler::ComplexObjectHandler")
+ logEntryEngine("ComplexObjectHandler::ComplexObjectHandler")
init ();
-
+
logExit()
}
ComplexObjectHandler::
~ComplexObjectHandler ()
{
- logEntryEngine("ComplexObjectHandler::~ComplexObjectHandler")
+ logEntryEngine("ComplexObjectHandler::~ComplexObjectHandler")
/* At client side we do not delete either output or return objects */
if (AxisEngine::m_bServer)
@@ -348,7 +348,7 @@
logDebugArg1("Returned from object delete function %p", pDelFunct)
}
}
-
+
logExit()
}
Modified: webservices/axis/trunk/c/src/common/Param.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/Param.h?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/Param.h (original)
+++ webservices/axis/trunk/c/src/common/Param.h Tue Dec 2 21:26:22 2008
@@ -33,7 +33,7 @@
ArrayBean* pArray; /* this is used to hold arrays */
ComplexObjectHandler* pCplxObj;
AnyType* pAnyObject; /* used to hold AnyType struct for xsd:any and xsd:anyType */
- SoapAttachmentReference* pAttachmentRef;
+ SoapAttachmentReference* pAttachmentRef;
};
/*
Modified: webservices/axis/trunk/c/src/common/TypeMapping.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/common/TypeMapping.cpp?rev=722781&r1=722780&r2=722781&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/TypeMapping.cpp (original)
+++ webservices/axis/trunk/c/src/common/TypeMapping.cpp Tue Dec 2 21:26:22 2008
@@ -108,10 +108,10 @@
void TypeMapping::uninitialize()
{
if (m_bInit)
- {
+ {
m_sTypeMap.clear();
- m_bInit = false;
- }
+ m_bInit = false;
+ }
}