You are viewing a plain text version of this content. The canonical link for it is here.
Posted to c-commits@axis.apache.org by na...@apache.org on 2011/12/28 17:23:37 UTC
svn commit: r1225221 - in /axis/axis1/c/trunk: include/axis/ src/common/
Author: nadiramra
Date: Wed Dec 28 16:23:37 2011
New Revision: 1225221
URL: http://svn.apache.org/viewvc?rev=1225221&view=rev
Log:
AXISCPP-1085 minor add const char * instead of char * in config classes
Modified:
axis/axis1/c/trunk/include/axis/AxisCPPConfigDefaults.h
axis/axis1/c/trunk/include/axis/AxisCPPConfigDefaults.hpp
axis/axis1/c/trunk/src/common/AxisCPPConfigDefaults.cpp
axis/axis1/c/trunk/src/common/AxisCPPConfigDefaultsImpl.cpp
axis/axis1/c/trunk/src/common/AxisCPPConfigDefaultsImpl.hpp
axis/axis1/c/trunk/src/common/AxisConfig.cpp
axis/axis1/c/trunk/src/common/AxisConfig.h
Modified: axis/axis1/c/trunk/include/axis/AxisCPPConfigDefaults.h
URL: http://svn.apache.org/viewvc/axis/axis1/c/trunk/include/axis/AxisCPPConfigDefaults.h?rev=1225221&r1=1225220&r2=1225221&view=diff
==============================================================================
--- axis/axis1/c/trunk/include/axis/AxisCPPConfigDefaults.h (original)
+++ axis/axis1/c/trunk/include/axis/AxisCPPConfigDefaults.h Wed Dec 28 16:23:37 2011
@@ -113,7 +113,7 @@ void axiscConfigDefaultsDestroy(AXISCHAN
* @return location of the client log file.
*/
AXISC_STORAGE_CLASS_INFO
-char * axiscConfigDefaultsGetClientLog(AXISCHANDLE axisCPPConfigDefaults);
+const char * axiscConfigDefaultsGetClientLog(AXISCHANDLE axisCPPConfigDefaults);
/**
* Get the location of the client WSDD file. This is the programmatic equivalent of
@@ -124,7 +124,7 @@ char * axiscConfigDefaultsGetClientLog(A
* @return location of the client WSDD file.
*/
AXISC_STORAGE_CLASS_INFO
-char * axiscConfigDefaultsGetClientWSDDFile(AXISCHANDLE axisCPPConfigDefaults);
+const char * axiscConfigDefaultsGetClientWSDDFile(AXISCHANDLE axisCPPConfigDefaults);
/**
* Get the value for the XML Parser library name. This is the programmatic equivalent of
@@ -133,7 +133,7 @@ char * axiscConfigDefaultsGetClientWSDDF
* @return name of the XML Parser library.
*/
AXISC_STORAGE_CLASS_INFO
-char * axiscConfigDefaultsGetXMLParserLibrary(AXISCHANDLE axisCPPConfigDefaults);
+const char * axiscConfigDefaultsGetXMLParserLibrary(AXISCHANDLE axisCPPConfigDefaults);
/**
* Get the value for the HTTP transport library name. This is the programmatic equivalent of
@@ -144,7 +144,7 @@ char * axiscConfigDefaultsGetXMLParserLi
* @return name of the HTTP Transport library.
*/
AXISC_STORAGE_CLASS_INFO
-char * axiscConfigDefaultsGetHTTPTransportLibrary(AXISCHANDLE axisCPPConfigDefaults);
+const char * axiscConfigDefaultsGetHTTPTransportLibrary(AXISCHANDLE axisCPPConfigDefaults);
/**
* Get the value for the HTTP channel library name. This is the programmatic equivalent of
@@ -155,7 +155,7 @@ char * axiscConfigDefaultsGetHTTPTranspo
* @return name of the HTTP Channel library.
*/
AXISC_STORAGE_CLASS_INFO
-char * axiscConfigDefaultsGetHTTPChannelLibrary(AXISCHANDLE axisCPPConfigDefaults);
+const char * axiscConfigDefaultsGetHTTPChannelLibrary(AXISCHANDLE axisCPPConfigDefaults);
/**
* Get the value for the HTTP SSL channel library name. This is the programmatic equivalent of
@@ -166,7 +166,7 @@ char * axiscConfigDefaultsGetHTTPChannel
* @return name of the HTTP SSL Channel library.
*/
AXISC_STORAGE_CLASS_INFO
-char * axiscConfigDefaultsGetHTTPSSLChannelLibrary(AXISCHANDLE axisCPPConfigDefaults);
+const char * axiscConfigDefaultsGetHTTPSSLChannelLibrary(AXISCHANDLE axisCPPConfigDefaults);
/**
* Get the value for NodeName. This is the programmatic equivalent of
@@ -177,7 +177,7 @@ char * axiscConfigDefaultsGetHTTPSSLChan
* @return nodeName to be set.
*/
AXISC_STORAGE_CLASS_INFO
-char * axiscConfigDefaultsGetNodeName(AXISCHANDLE axisCPPConfigDefaults);
+const char * axiscConfigDefaultsGetNodeName(AXISCHANDLE axisCPPConfigDefaults);
/**
* Get the value for ListenPort. This is the programmatic equivalent of
@@ -188,7 +188,7 @@ char * axiscConfigDefaultsGetNodeName(AX
* @return listenPort to be set.
*/
AXISC_STORAGE_CLASS_INFO
-char * axiscConfigDefaultsGetListenPort(AXISCHANDLE axisCPPConfigDefaults);
+const char * axiscConfigDefaultsGetListenPort(AXISCHANDLE axisCPPConfigDefaults);
/**
* Get the value for SecureInfo. This is the programmatic equivalent of
@@ -199,7 +199,7 @@ char * axiscConfigDefaultsGetListenPort(
* @return secureInfo to be set.
*/
AXISC_STORAGE_CLASS_INFO
-char * axiscConfigDefaultsGetSecureInfo(AXISCHANDLE axisCPPConfigDefaults);
+const char * axiscConfigDefaultsGetSecureInfo(AXISCHANDLE axisCPPConfigDefaults);
/**
* Get the location of AxisHome. This is the programmatic equivalent of
@@ -208,7 +208,7 @@ char * axiscConfigDefaultsGetSecureInfo(
* @return location of AxisHome.
*/
AXISC_STORAGE_CLASS_INFO
-char * axiscConfigDefaultsGetAxisHome(AXISCHANDLE axisCPPConfigDefaults);
+const char * axiscConfigDefaultsGetAxisHome(AXISCHANDLE axisCPPConfigDefaults);
/**
* Set the location of the client log file. This is the programmatic equivalent of
@@ -222,7 +222,7 @@ char * axiscConfigDefaultsGetAxisHome(AX
* @param location of the client log file.
*/
AXISC_STORAGE_CLASS_INFO
-void axiscConfigDefaultsSetClientLog(AXISCHANDLE axisCPPConfigDefaults, char * location);
+void axiscConfigDefaultsSetClientLog(AXISCHANDLE axisCPPConfigDefaults, const char * location);
/**
* Set the location of the client WSDD file. This is the programmatic equivalent of
@@ -236,7 +236,7 @@ void axiscConfigDefaultsSetClientLog(AXI
* @param location of the client WSDD file.
*/
AXISC_STORAGE_CLASS_INFO
-void axiscConfigDefaultsSetClientWSDDFile(AXISCHANDLE axisCPPConfigDefaults, char * location);
+void axiscConfigDefaultsSetClientWSDDFile(AXISCHANDLE axisCPPConfigDefaults, const char * location);
/**
* Set the value for the XML Parser library name. This is the programmatic equivalent of
@@ -248,7 +248,7 @@ void axiscConfigDefaultsSetClientWSDDFil
* @param name of the XML Parser library.
*/
AXISC_STORAGE_CLASS_INFO
-void axiscConfigDefaultsSetXMLParserLibrary(AXISCHANDLE axisCPPConfigDefaults, char * name);
+void axiscConfigDefaultsSetXMLParserLibrary(AXISCHANDLE axisCPPConfigDefaults, const char * name);
/**
* Set the value for the HTTP transport library name. This is the programmatic equivalent of
@@ -262,7 +262,7 @@ void axiscConfigDefaultsSetXMLParserLibr
* @param name of the HTTP Transport library.
*/
AXISC_STORAGE_CLASS_INFO
-void axiscConfigDefaultsSetHTTPTransportLibrary(AXISCHANDLE axisCPPConfigDefaults, char * name);
+void axiscConfigDefaultsSetHTTPTransportLibrary(AXISCHANDLE axisCPPConfigDefaults, const char * name);
/**
* Set the value for the HTTP channel library name. This is the programmatic equivalent of
@@ -276,7 +276,7 @@ void axiscConfigDefaultsSetHTTPTransport
* @param name of the HTTP Channel library.
*/
AXISC_STORAGE_CLASS_INFO
-void axiscConfigDefaultsSetHTTPChannelLibrary(AXISCHANDLE axisCPPConfigDefaults, char * name);
+void axiscConfigDefaultsSetHTTPChannelLibrary(AXISCHANDLE axisCPPConfigDefaults, const char * name);
/**
* Set the value for the HTTP SSL channel library name. This is the programmatic equivalent of
@@ -290,7 +290,7 @@ void axiscConfigDefaultsSetHTTPChannelLi
* @param name of the HTTP SSL Channel library.
*/
AXISC_STORAGE_CLASS_INFO
-void axiscConfigDefaultsSetHTTPSSLChannelLibrary(AXISCHANDLE axisCPPConfigDefaults, char * name);
+void axiscConfigDefaultsSetHTTPSSLChannelLibrary(AXISCHANDLE axisCPPConfigDefaults, const char * name);
/**
* Set the value for NodeName. This is the programmatic equivalent of
@@ -304,7 +304,7 @@ void axiscConfigDefaultsSetHTTPSSLChanne
* @param nodeName to be set.
*/
AXISC_STORAGE_CLASS_INFO
-void axiscConfigDefaultsSetNodeName(AXISCHANDLE axisCPPConfigDefaults, char * nodeName);
+void axiscConfigDefaultsSetNodeName(AXISCHANDLE axisCPPConfigDefaults, const char * nodeName);
/**
* Set the value for ListenPort. This is the programmatic equivalent of
@@ -318,7 +318,7 @@ void axiscConfigDefaultsSetNodeName(AXIS
* @param listenPort to be set.
*/
AXISC_STORAGE_CLASS_INFO
-void axiscConfigDefaultsSetListenPort(AXISCHANDLE axisCPPConfigDefaults, char * listenPort);
+void axiscConfigDefaultsSetListenPort(AXISCHANDLE axisCPPConfigDefaults, const char * listenPort);
/**
* Set the value for SecureInfo. This is the programmatic equivalent of
@@ -332,7 +332,7 @@ void axiscConfigDefaultsSetListenPort(AX
* @param secureInfo to be set.
*/
AXISC_STORAGE_CLASS_INFO
-void axiscConfigDefaultsSetSecureInfo(AXISCHANDLE axisCPPConfigDefaults, char * secureInfo);
+void axiscConfigDefaultsSetSecureInfo(AXISCHANDLE axisCPPConfigDefaults, const char * secureInfo);
/**
* Set the location of AxisHome. This is the programmatic equivalent of
@@ -344,7 +344,7 @@ void axiscConfigDefaultsSetSecureInfo(AX
* @param location of axis home.
*/
AXISC_STORAGE_CLASS_INFO
-void axiscConfigDefaultsSetAxisHome(AXISCHANDLE axisCPPConfigDefaults, char * location);
+void axiscConfigDefaultsSetAxisHome(AXISCHANDLE axisCPPConfigDefaults, const char * location);
/**
* Apply the set configuration values.
Modified: axis/axis1/c/trunk/include/axis/AxisCPPConfigDefaults.hpp
URL: http://svn.apache.org/viewvc/axis/axis1/c/trunk/include/axis/AxisCPPConfigDefaults.hpp?rev=1225221&r1=1225220&r2=1225221&view=diff
==============================================================================
--- axis/axis1/c/trunk/include/axis/AxisCPPConfigDefaults.hpp (original)
+++ axis/axis1/c/trunk/include/axis/AxisCPPConfigDefaults.hpp Wed Dec 28 16:23:37 2011
@@ -49,7 +49,7 @@
* - the value of AXISCPP_DEPLOY
*
* The get/set methods don't have any effect on the ACTUAL defaults. They
- * are mearly a bundle of values which are set on the ACTUAL defaults when
+ * are simply a bundle of values which are set on the ACTUAL defaults when
* the apply() method is issued.
*
* It consists of...
@@ -118,7 +118,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @return location of the client log file.
*/
- char* getClientLog();
+ const char* getClientLog();
/**
* Get the location of the client WSDD file. This is the programmatic equivalent of
@@ -128,7 +128,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @return location of the client WSDD file.
*/
- char* getClientWSDDFile();
+ const char* getClientWSDDFile();
/**
* Get the value for the XML Parser library name. This is the programmatic equivalent of
@@ -136,7 +136,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @return name of the XML Parser library.
*/
- char* getXMLParserLibrary();
+ const char* getXMLParserLibrary();
/**
* Get the value for the HTTP transport library name. This is the programmatic equivalent of
@@ -146,7 +146,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @return name of the HTTP Transport library.
*/
- char* getHTTPTransportLibrary();
+ const char* getHTTPTransportLibrary();
/**
* Get the value for the HTTP channel library name. This is the programmatic equivalent of
@@ -156,7 +156,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @return name of the HTTP Channel library.
*/
- char* getHTTPChannelLibrary();
+ const char* getHTTPChannelLibrary();
/**
* Get the value for the HTTP SSL channel library name. This is the programmatic equivalent of
@@ -166,7 +166,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @return name of the HTTP SSL Channel library.
*/
- char* getHTTPSSLChannelLibrary();
+ const char* getHTTPSSLChannelLibrary();
/**
* Get the value for NodeName. This is the programmatic equivalent of
@@ -176,7 +176,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @return nodeName to be set.
*/
- char* getNodeName();
+ const char* getNodeName();
/**
* Get the value for ListenPort. This is the programmatic equivalent of
@@ -186,7 +186,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @return listenPort to be set.
*/
- char* getListenPort();
+ const char* getListenPort();
/**
* Get the value for SecureInfo. This is the programmatic equivalent of
@@ -196,7 +196,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @return secureInfo to be set.
*/
- char* getSecureInfo();
+ const char* getSecureInfo();
/**
* Get the location of AxisHome. This is the programmatic equivalent of
@@ -204,7 +204,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @return location of AxisHome.
*/
- char* getAxisHome();
+ const char* getAxisHome();
/**
* Set the location of the client log file. This is the programmatic equivalent of
@@ -217,7 +217,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @param location of the client log file.
*/
- void setClientLog(char* location);
+ void setClientLog(const char* location);
/**
* Set the location of the client WSDD file. This is the programmatic equivalent of
@@ -230,7 +230,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @param location of the client WSDD file.
*/
- void setClientWSDDFile(char* location);
+ void setClientWSDDFile(const char* location);
/**
* Set the value for the XML Parser library name. This is the programmatic equivalent of
@@ -241,7 +241,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @param name of the XML Parser library.
*/
- void setXMLParserLibrary(char* name);
+ void setXMLParserLibrary(const char* name);
/**
* Set the value for the HTTP transport library name. This is the programmatic equivalent of
@@ -254,7 +254,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @param name of the HTTP Transport library.
*/
- void setHTTPTransportLibrary(char* name);
+ void setHTTPTransportLibrary(const char* name);
/**
* Set the value for the HTTP channel library name. This is the programmatic equivalent of
@@ -267,7 +267,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @param name of the HTTP Channel library.
*/
- void setHTTPChannelLibrary(char* name);
+ void setHTTPChannelLibrary(const char* name);
/**
* Set the value for the HTTP SSL channel library name. This is the programmatic equivalent of
@@ -280,7 +280,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @param name of the HTTP SSL Channel library.
*/
- void setHTTPSSLChannelLibrary(char* name);
+ void setHTTPSSLChannelLibrary(const char* name);
/**
* Set the value for NodeName. This is the programmatic equivalent of
@@ -293,7 +293,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @param nodeName to be set.
*/
- void setNodeName(char* nodeName);
+ void setNodeName(const char* nodeName);
/**
* Set the value for ListenPort. This is the programmatic equivalent of
@@ -306,7 +306,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @param listenPort to be set.
*/
- void setListenPort(char* listenPort);
+ void setListenPort(const char* listenPort);
/**
* Set the value for SecureInfo. This is the programmatic equivalent of
@@ -319,7 +319,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @param secureInfo to be set.
*/
- void setSecureInfo(char* secureInfo);
+ void setSecureInfo(const char* secureInfo);
/**
* Set the location of AxisHome. This is the programmatic equivalent of
@@ -330,7 +330,7 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
*
* @param location of axis home.
*/
- void setAxisHome(char* location);
+ void setAxisHome(const char* location);
/**
* Apply the set configuration values.
Modified: axis/axis1/c/trunk/src/common/AxisCPPConfigDefaults.cpp
URL: http://svn.apache.org/viewvc/axis/axis1/c/trunk/src/common/AxisCPPConfigDefaults.cpp?rev=1225221&r1=1225220&r2=1225221&view=diff
==============================================================================
--- axis/axis1/c/trunk/src/common/AxisCPPConfigDefaults.cpp (original)
+++ axis/axis1/c/trunk/src/common/AxisCPPConfigDefaults.cpp Wed Dec 28 16:23:37 2011
@@ -50,91 +50,89 @@ void AxisCPPConfigDefaults::apply ()
{
m_pImpl->apply();
}
-void AxisCPPConfigDefaults::setClientLog (char *value)
+void AxisCPPConfigDefaults::setClientLog (const char *value)
{
m_pImpl->setClientLog(value);
}
-void AxisCPPConfigDefaults::setClientWSDDFile (char *value)
+void AxisCPPConfigDefaults::setClientWSDDFile (const char *value)
{
m_pImpl->setClientWSDDFile(value);
}
-void AxisCPPConfigDefaults::setXMLParserLibrary (char *value)
+void AxisCPPConfigDefaults::setXMLParserLibrary (const char *value)
{
m_pImpl->setXMLParserLibrary(value);
}
-void AxisCPPConfigDefaults::setHTTPTransportLibrary (char *value)
+void AxisCPPConfigDefaults::setHTTPTransportLibrary (const char *value)
{
m_pImpl->setHTTPTransportLibrary(value);
}
-void AxisCPPConfigDefaults::setHTTPChannelLibrary (char *value)
+void AxisCPPConfigDefaults::setHTTPChannelLibrary (const char *value)
{
m_pImpl->setHTTPChannelLibrary(value);
}
-void AxisCPPConfigDefaults::setHTTPSSLChannelLibrary (char *value)
+void AxisCPPConfigDefaults::setHTTPSSLChannelLibrary (const char *value)
{
m_pImpl->setHTTPSSLChannelLibrary(value);
}
-void AxisCPPConfigDefaults::setNodeName (char *value)
+void AxisCPPConfigDefaults::setNodeName (const char *value)
{
m_pImpl->setNodeName(value);
}
-void AxisCPPConfigDefaults::setListenPort (char *value)
+void AxisCPPConfigDefaults::setListenPort (const char *value)
{
m_pImpl->setListenPort(value);
}
-void AxisCPPConfigDefaults::setSecureInfo (char *value)
+void AxisCPPConfigDefaults::setSecureInfo (const char *value)
{
m_pImpl->setSecureInfo(value);
}
-void AxisCPPConfigDefaults::setAxisHome (char *value)
+void AxisCPPConfigDefaults::setAxisHome (const char *value)
{
m_pImpl->setAxisHome(value);
}
-char* AxisCPPConfigDefaults::getClientLog ()
+const char* AxisCPPConfigDefaults::getClientLog ()
{
- return(char*)m_pImpl->getClientLog();
+ return m_pImpl->getClientLog();
}
-char* AxisCPPConfigDefaults::getClientWSDDFile ()
+const char* AxisCPPConfigDefaults::getClientWSDDFile ()
{
- return(char*)m_pImpl->getClientWSDDFile();
+ return m_pImpl->getClientWSDDFile();
}
-char* AxisCPPConfigDefaults::getXMLParserLibrary ()
+const char* AxisCPPConfigDefaults::getXMLParserLibrary ()
{
- return(char*)m_pImpl->getXMLParserLibrary();
+ return m_pImpl->getXMLParserLibrary();
}
-char* AxisCPPConfigDefaults::getHTTPTransportLibrary ()
+const char* AxisCPPConfigDefaults::getHTTPTransportLibrary ()
{
- return(char*)m_pImpl->getHTTPTransportLibrary();
+ return m_pImpl->getHTTPTransportLibrary();
}
-char* AxisCPPConfigDefaults::getHTTPChannelLibrary ()
+const char* AxisCPPConfigDefaults::getHTTPChannelLibrary ()
{
- return(char*)m_pImpl->getHTTPChannelLibrary();
+ return m_pImpl->getHTTPChannelLibrary();
}
-char* AxisCPPConfigDefaults::getHTTPSSLChannelLibrary ()
+const char* AxisCPPConfigDefaults::getHTTPSSLChannelLibrary ()
{
- return(char*)m_pImpl->getHTTPSSLChannelLibrary();
+ return m_pImpl->getHTTPSSLChannelLibrary();
}
-char* AxisCPPConfigDefaults::getNodeName ()
+const char* AxisCPPConfigDefaults::getNodeName ()
{
- return(char*)m_pImpl->getNodeName();
+ return m_pImpl->getNodeName();
}
-char* AxisCPPConfigDefaults::getListenPort ()
+const char* AxisCPPConfigDefaults::getListenPort ()
{
- return(char*)m_pImpl->getListenPort();
+ return m_pImpl->getListenPort();
}
-char* AxisCPPConfigDefaults::getSecureInfo ()
+const char* AxisCPPConfigDefaults::getSecureInfo ()
{
- return(char*)m_pImpl->getSecureInfo();
+ return m_pImpl->getSecureInfo();
}
-char* AxisCPPConfigDefaults::getAxisHome ()
+const char* AxisCPPConfigDefaults::getAxisHome ()
{
- return(char*)m_pImpl->getAxisHome();
+ return m_pImpl->getAxisHome();
}
-/** /todo place some sample code here
-*/
AXIS_CPP_NAMESPACE_END
Modified: axis/axis1/c/trunk/src/common/AxisCPPConfigDefaultsImpl.cpp
URL: http://svn.apache.org/viewvc/axis/axis1/c/trunk/src/common/AxisCPPConfigDefaultsImpl.cpp?rev=1225221&r1=1225220&r2=1225221&view=diff
==============================================================================
--- axis/axis1/c/trunk/src/common/AxisCPPConfigDefaultsImpl.cpp (original)
+++ axis/axis1/c/trunk/src/common/AxisCPPConfigDefaultsImpl.cpp Wed Dec 28 16:23:37 2011
@@ -61,7 +61,7 @@ void AxisCPPConfigDefaultsImpl::apply ()
/* only allow user to apply once befor initialization and NOT AT ALL after */
if(!g_pConfig)
{
- char *pszValue=0;
+ const char *pszValue=0;
g_pConfig = new AxisConfig ();
//todo set each value, if set
pszValue = getClientLog();
@@ -110,97 +110,97 @@ void AxisCPPConfigDefaultsImpl::apply ()
}
}
-void AxisCPPConfigDefaultsImpl::setClientLog (char *value)
+void AxisCPPConfigDefaultsImpl::setClientLog (const char *value)
{
m_pcClientLog = value;
}
-void AxisCPPConfigDefaultsImpl::setClientWSDDFile (char *value)
+void AxisCPPConfigDefaultsImpl::setClientWSDDFile (const char *value)
{
m_pcClientWSDDFile = value;
}
-void AxisCPPConfigDefaultsImpl::setXMLParserLibrary (char *value)
+void AxisCPPConfigDefaultsImpl::setXMLParserLibrary (const char *value)
{
m_pcXMLParserLibrary = value;
}
-void AxisCPPConfigDefaultsImpl::setHTTPTransportLibrary (char *value)
+void AxisCPPConfigDefaultsImpl::setHTTPTransportLibrary (const char *value)
{
m_pcHTTPTransportLibrary = value;
}
-void AxisCPPConfigDefaultsImpl::setHTTPChannelLibrary (char *value)
+void AxisCPPConfigDefaultsImpl::setHTTPChannelLibrary (const char *value)
{
m_pcHTTPChannelLibrary = value;
}
-void AxisCPPConfigDefaultsImpl::setHTTPSSLChannelLibrary (char *value)
+void AxisCPPConfigDefaultsImpl::setHTTPSSLChannelLibrary (const char *value)
{
m_pcHTTPSSLChannelLibrary = value;
}
-void AxisCPPConfigDefaultsImpl::setNodeName (char *value)
+void AxisCPPConfigDefaultsImpl::setNodeName (const char *value)
{
m_pcNodeName = value;
}
-void AxisCPPConfigDefaultsImpl::setListenPort (char *value)
+void AxisCPPConfigDefaultsImpl::setListenPort (const char *value)
{
m_pcListenPort = value;
}
-void AxisCPPConfigDefaultsImpl::setSecureInfo (char *value)
+void AxisCPPConfigDefaultsImpl::setSecureInfo (const char *value)
{
m_pcSecureInfo = value;
}
-void AxisCPPConfigDefaultsImpl::setAxisHome (char *value)
+void AxisCPPConfigDefaultsImpl::setAxisHome (const char *value)
{
m_pcAxisHome = value;
}
-char* AxisCPPConfigDefaultsImpl::getClientLog ()
+const char* AxisCPPConfigDefaultsImpl::getClientLog ()
{
if (0 == m_pcClientLog.length()) return NULL;
- return (char*)(m_pcClientLog.c_str());
+ return m_pcClientLog.c_str();
}
-char* AxisCPPConfigDefaultsImpl::getClientWSDDFile ()
+const char* AxisCPPConfigDefaultsImpl::getClientWSDDFile ()
{
if (0 == m_pcClientWSDDFile.length()) return NULL;
- return (char*)(m_pcClientWSDDFile.c_str());
+ return m_pcClientWSDDFile.c_str();
}
-char* AxisCPPConfigDefaultsImpl::getXMLParserLibrary ()
+const char* AxisCPPConfigDefaultsImpl::getXMLParserLibrary ()
{
if (0 == m_pcXMLParserLibrary.length()) return NULL;
- return (char*)(m_pcXMLParserLibrary.c_str());
+ return m_pcXMLParserLibrary.c_str();
}
-char* AxisCPPConfigDefaultsImpl::getHTTPTransportLibrary ()
+const char* AxisCPPConfigDefaultsImpl::getHTTPTransportLibrary ()
{
if (0 == m_pcHTTPTransportLibrary.length()) return NULL;
- return (char*)(m_pcHTTPTransportLibrary.c_str());
+ return m_pcHTTPTransportLibrary.c_str();
}
-char* AxisCPPConfigDefaultsImpl::getHTTPChannelLibrary ()
+const char* AxisCPPConfigDefaultsImpl::getHTTPChannelLibrary ()
{
if (0 == m_pcHTTPChannelLibrary.length()) return NULL;
- return (char*)(m_pcHTTPChannelLibrary.c_str());
+ return m_pcHTTPChannelLibrary.c_str();
}
-char* AxisCPPConfigDefaultsImpl::getHTTPSSLChannelLibrary ()
+const char* AxisCPPConfigDefaultsImpl::getHTTPSSLChannelLibrary ()
{
if (0 == m_pcHTTPSSLChannelLibrary.length()) return NULL;
- return (char*)(m_pcHTTPSSLChannelLibrary.c_str());
+ return m_pcHTTPSSLChannelLibrary.c_str();
}
-char* AxisCPPConfigDefaultsImpl::getNodeName ()
+const char* AxisCPPConfigDefaultsImpl::getNodeName ()
{
if (0 == m_pcNodeName.length()) return NULL;
- return (char*)(m_pcNodeName.c_str());
+ return m_pcNodeName.c_str();
}
-char* AxisCPPConfigDefaultsImpl::getListenPort ()
+const char* AxisCPPConfigDefaultsImpl::getListenPort ()
{
if (0 == m_pcListenPort.length()) return NULL;
- return (char*)(m_pcListenPort.c_str());
+ return m_pcListenPort.c_str();
}
-char* AxisCPPConfigDefaultsImpl::getSecureInfo ()
+const char* AxisCPPConfigDefaultsImpl::getSecureInfo ()
{
if (0 == m_pcSecureInfo.length()) return NULL;
- return (char*)(m_pcSecureInfo.c_str());
+ return m_pcSecureInfo.c_str();
}
-char* AxisCPPConfigDefaultsImpl::getAxisHome ()
+const char* AxisCPPConfigDefaultsImpl::getAxisHome ()
{
if (0 == m_pcAxisHome.length()) return NULL;
- return (char*)(m_pcAxisHome.c_str());
+ return m_pcAxisHome.c_str();
}
AXIS_CPP_NAMESPACE_END
Modified: axis/axis1/c/trunk/src/common/AxisCPPConfigDefaultsImpl.hpp
URL: http://svn.apache.org/viewvc/axis/axis1/c/trunk/src/common/AxisCPPConfigDefaultsImpl.hpp?rev=1225221&r1=1225220&r2=1225221&view=diff
==============================================================================
--- axis/axis1/c/trunk/src/common/AxisCPPConfigDefaultsImpl.hpp (original)
+++ axis/axis1/c/trunk/src/common/AxisCPPConfigDefaultsImpl.hpp Wed Dec 28 16:23:37 2011
@@ -45,27 +45,27 @@ class STORAGE_CLASS_INFO AxisCPPConfigDe
AxisCPPConfigDefaultsImpl();
~AxisCPPConfigDefaultsImpl();
- char* getClientLog();
- char* getClientWSDDFile();
- char* getXMLParserLibrary();
- char* getHTTPTransportLibrary();
- char* getHTTPChannelLibrary();
- char* getHTTPSSLChannelLibrary();
- char* getNodeName();
- char* getListenPort();
- char* getSecureInfo();
- char* getAxisHome();
+ const char* getClientLog();
+ const char* getClientWSDDFile();
+ const char* getXMLParserLibrary();
+ const char* getHTTPTransportLibrary();
+ const char* getHTTPChannelLibrary();
+ const char* getHTTPSSLChannelLibrary();
+ const char* getNodeName();
+ const char* getListenPort();
+ const char* getSecureInfo();
+ const 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(const char*);
+ void setClientWSDDFile(const char*);
+ void setXMLParserLibrary(const char*);
+ void setHTTPTransportLibrary(const char*);
+ void setHTTPChannelLibrary(const char*);
+ void setHTTPSSLChannelLibrary(const char*);
+ void setNodeName(const char*);
+ void setListenPort(const char*);
+ void setSecureInfo(const char*);
+ void setAxisHome(const char*);
void apply();
@@ -87,3 +87,4 @@ AXIS_CPP_NAMESPACE_END
#endif
+
Modified: axis/axis1/c/trunk/src/common/AxisConfig.cpp
URL: http://svn.apache.org/viewvc/axis/axis1/c/trunk/src/common/AxisConfig.cpp?rev=1225221&r1=1225220&r2=1225221&view=diff
==============================================================================
--- axis/axis1/c/trunk/src/common/AxisConfig.cpp (original)
+++ axis/axis1/c/trunk/src/common/AxisConfig.cpp Wed Dec 28 16:23:37 2011
@@ -92,7 +92,7 @@ AxisConfig( AxisConfig * pOrgAxisConfig)
m_pcKeyArray[AXCONF_LISTENPORT] = AXCONF_LISTENPORT_TAGNAME;
m_pcKeyArray[AXCONF_SECUREINFO] = AXCONF_SECUREINFO_TAGNAME;
- char * pszDefaultValues[] = {
+ const char * pszDefaultValues[] = {
"", // (AXCONF_WSDDFILEPATH) Server WSDD File Path
PLATFORM_LOG_PATH, // (AXCONF_LOGPATH) Server log path
PLATFORM_CLIENTLOG_PATH, // (AXCONF_CLIENTLOGPATH) Client log path
@@ -213,7 +213,7 @@ readConfFile ()
}
void AxisConfig::
-setValue (int valuelength, g_axconfig valueindex, char *value)
+setValue (int valuelength, g_axconfig valueindex, const char *value)
{
// m_pcValueArray is a string and the string class will copy the value, so
// no need to copy the value into our own storage here.
Modified: axis/axis1/c/trunk/src/common/AxisConfig.h
URL: http://svn.apache.org/viewvc/axis/axis1/c/trunk/src/common/AxisConfig.h?rev=1225221&r1=1225220&r2=1225221&view=diff
==============================================================================
--- axis/axis1/c/trunk/src/common/AxisConfig.h (original)
+++ axis/axis1/c/trunk/src/common/AxisConfig.h Wed Dec 28 16:23:37 2011
@@ -103,7 +103,7 @@ class AxisConfig
*/
char* getAxisConfProperty(g_axconfig property);
- void setValue(int valuelength, g_axconfig valueindex, char* value);
+ void setValue(int valuelength, g_axconfig valueindex, const char* value);
/**
* Return values in properties file as a string.