You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pr...@apache.org on 2006/03/15 15:58:26 UTC

svn commit: r386088 - in /webservices/axis/trunk/c/src/common: AxisConfig.cpp AxisConfig.h

Author: prestonf
Date: Wed Mar 15 06:58:24 2006
New Revision: 386088

URL: http://svn.apache.org/viewcvs?rev=386088&view=rev
Log:
Moved some hard coded tag names out into the header file.

Modified:
    webservices/axis/trunk/c/src/common/AxisConfig.cpp
    webservices/axis/trunk/c/src/common/AxisConfig.h

Modified: webservices/axis/trunk/c/src/common/AxisConfig.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/common/AxisConfig.cpp?rev=386088&r1=386087&r2=386088&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisConfig.cpp (original)
+++ webservices/axis/trunk/c/src/common/AxisConfig.cpp Wed Mar 15 06:58:24 2006
@@ -36,20 +36,20 @@
 
 AxisConfig::AxisConfig()
 {
-    m_pcKeyArray[AXCONF_WSDDFILEPATH]       = "WSDDFilePath";
-    m_pcKeyArray[AXCONF_LOGPATH]            = "LogPath";
-    m_pcKeyArray[AXCONF_CLIENTLOGPATH]      = "ClientLogPath";
-    m_pcKeyArray[AXCONF_CLIENTWSDDFILEPATH] = "ClientWSDDFilePath";
+    m_pcKeyArray[AXCONF_WSDDFILEPATH]       = AXCONF_WSDDFILEPATH_TAGNAME;
+    m_pcKeyArray[AXCONF_LOGPATH]            = AXCONF_LOGPATH_TAGNAME;
+    m_pcKeyArray[AXCONF_CLIENTLOGPATH]      = AXCONF_CLIENTLOGPATH_TAGNAME;
+    m_pcKeyArray[AXCONF_CLIENTWSDDFILEPATH] = AXCONF_CLIENTWSDDFILEPATH_TAGNAME;
   
     m_pcKeyArray[AXCONF_AXISHOME]       = "\0"; // will be obtained dynamically.
-    m_pcKeyArray[AXCONF_TRANSPORTHTTP]  = "Transport_http";
-    m_pcKeyArray[AXCONF_SSLCHANNEL_HTTP]= "Channel_HTTP_SSL";
-    m_pcKeyArray[AXCONF_CHANNEL_HTTP]   = "Channel_HTTP";
-    m_pcKeyArray[AXCONF_TRANSPORTSMTP]  = "Transport_smtp";
-    m_pcKeyArray[AXCONF_XMLPARSER]      = "XMLParser";
-    m_pcKeyArray[AXCONF_NODENAME]       = "NodeName";
-    m_pcKeyArray[AXCONF_LISTENPORT]     = "ListenPort";
-    m_pcKeyArray[AXCONF_SECUREINFO]     = "SecureInfo";
+    m_pcKeyArray[AXCONF_TRANSPORTHTTP]  = AXCONF_TRANSPORTHTTP_TAGNAME;
+    m_pcKeyArray[AXCONF_SSLCHANNEL_HTTP]= AXCONF_SSLCHANNEL_HTTP_TAGNAME;
+    m_pcKeyArray[AXCONF_CHANNEL_HTTP]   = AXCONF_CHANNEL_HTTP_TAGNAME;
+    m_pcKeyArray[AXCONF_TRANSPORTSMTP]  = AXCONF_TRANSPORTSMTP_TAGNAME;
+    m_pcKeyArray[AXCONF_XMLPARSER]      = AXCONF_XMLPARSER_TAGNAME;
+    m_pcKeyArray[AXCONF_NODENAME]       = AXCONF_NODENAME_TAGNAME;
+    m_pcKeyArray[AXCONF_LISTENPORT]     = AXCONF_LISTENPORT_TAGNAME;
+    m_pcKeyArray[AXCONF_SECUREINFO]     = AXCONF_SECUREINFO_TAGNAME;
 
     m_pcValueArray[AXCONF_NODENAME]          = "server name";
     m_pcValueArray[AXCONF_LISTENPORT]        = "listen port";
@@ -66,20 +66,20 @@
 //AxisConfig::AxisConfig( bool bDefaultsOnly)
 AxisConfig::AxisConfig( AxisConfig * pOrgAxisConfig)
 {
-    m_pcKeyArray[AXCONF_WSDDFILEPATH]       = "WSDDFilePath";
-    m_pcKeyArray[AXCONF_LOGPATH]            = "LogPath";
-    m_pcKeyArray[AXCONF_CLIENTLOGPATH]      = "ClientLogPath";
-    m_pcKeyArray[AXCONF_CLIENTWSDDFILEPATH] = "ClientWSDDFilePath";
+    m_pcKeyArray[AXCONF_WSDDFILEPATH]       = AXCONF_WSDDFILEPATH_TAGNAME;
+    m_pcKeyArray[AXCONF_LOGPATH]            = AXCONF_LOGPATH_TAGNAME;
+    m_pcKeyArray[AXCONF_CLIENTLOGPATH]      = AXCONF_CLIENTLOGPATH_TAGNAME;
+    m_pcKeyArray[AXCONF_CLIENTWSDDFILEPATH] = AXCONF_CLIENTWSDDFILEPATH_TAGNAME;
   
     m_pcKeyArray[AXCONF_AXISHOME]       = "\0"; // will be obtained dynamically.
-    m_pcKeyArray[AXCONF_TRANSPORTHTTP]  = "Transport_http";
-    m_pcKeyArray[AXCONF_SSLCHANNEL_HTTP]= "Channel_HTTP_SSL";
-    m_pcKeyArray[AXCONF_CHANNEL_HTTP]   = "Channel_HTTP";
-    m_pcKeyArray[AXCONF_TRANSPORTSMTP]  = "Transport_smtp";
-    m_pcKeyArray[AXCONF_XMLPARSER]      = "XMLParser";
-    m_pcKeyArray[AXCONF_NODENAME]       = "NodeName";
-    m_pcKeyArray[AXCONF_LISTENPORT]     = "ListenPort";
-    m_pcKeyArray[AXCONF_SECUREINFO]     = "SecureInfo";
+    m_pcKeyArray[AXCONF_TRANSPORTHTTP]  = AXCONF_TRANSPORTHTTP_TAGNAME;
+    m_pcKeyArray[AXCONF_SSLCHANNEL_HTTP]= AXCONF_SSLCHANNEL_HTTP_TAGNAME;
+    m_pcKeyArray[AXCONF_CHANNEL_HTTP]   = AXCONF_CHANNEL_HTTP_TAGNAME;
+    m_pcKeyArray[AXCONF_TRANSPORTSMTP]  = AXCONF_TRANSPORTSMTP_TAGNAME;
+    m_pcKeyArray[AXCONF_XMLPARSER]      = AXCONF_XMLPARSER_TAGNAME;
+    m_pcKeyArray[AXCONF_NODENAME]       = AXCONF_NODENAME_TAGNAME;
+    m_pcKeyArray[AXCONF_LISTENPORT]     = AXCONF_LISTENPORT_TAGNAME;
+    m_pcKeyArray[AXCONF_SECUREINFO]     = AXCONF_SECUREINFO_TAGNAME;
 
 	char *	pszDefaultValues[] = {"",							// (AXCONF_WSDDFILEPATH) Server WSDD File Path
 								  PLATFORM_LOG_PATH,			// (AXCONF_LOGPATH) Server log path

Modified: webservices/axis/trunk/c/src/common/AxisConfig.h
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/common/AxisConfig.h?rev=386088&r1=386087&r2=386088&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/common/AxisConfig.h (original)
+++ webservices/axis/trunk/c/src/common/AxisConfig.h Wed Mar 15 06:58:24 2006
@@ -26,7 +26,20 @@
 #if !defined(__AXIS_AXISCONFIG_H_OF_AXIS_INCLUDED__)
 #define __AXIS_AXISCONFIG_H_OF_AXIS_INCLUDED__
 
-#define CONFBUFFSIZE 256
+#define CONFBUFFSIZE						256
+#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"
+
 #include <axis/GDefine.hpp>
 #include <string>
 /**