Merge pull request #6423 from wangkx/logging_gold

HPCC-12099 Add 4 componentTypes for ESP logging service

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Gleb Aronsky <Gleb.Aronsky@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

deployment/deployutils/deployutils.cpp

@@ -867,6 +867,34 @@ public:
               extraInfo = strBuf.str();
               //ret->m_bAddEmpty = true;
             }
+            else if (strcmp(type, "espprocessType")==0)
+            {
+              nCtrlType = 4;//LVC_COMBO;
+              bAddBlank = true;
+              LoadComboBox("Software/EspProcess", bAddBlank, m_pEnv, m_pEnv, strBuf);
+              extraInfo = strBuf.str();
+            }
+            else if (strcmp(type, "mysqlloggingagentType")==0)
+            {
+              nCtrlType = 4;//LVC_COMBO;
+              bAddBlank = true;
+              LoadComboBox("Software/MySQLLoggingAgent", bAddBlank, m_pEnv, m_pEnv, strBuf);
+              extraInfo = strBuf.str();
+            }
+            else if (strcmp(type, "esploggingagentType")==0)
+            {
+              nCtrlType = 4;//LVC_COMBO;
+              bAddBlank = true;
+              LoadComboBox("Software/ESPLoggingAgent", bAddBlank, m_pEnv, m_pEnv, strBuf);
+              extraInfo = strBuf.str();
+            }
+            else if (strcmp(type, "loggingmanagerType")==0)
+            {
+              nCtrlType = 4;//LVC_COMBO;
+              bAddBlank = true;
+              LoadComboBox("Software/LoggingManager", bAddBlank, m_pEnv, m_pEnv, strBuf);
+              extraInfo = strBuf.str();
+            }
             else if (strcmp(type, "ldapServerType")==0)
             {
               nCtrlType = 4;//LVC_COMBO;
@@ -1630,6 +1658,26 @@ public:
           tempPath.clear().append("./Software/MySQLProcess[1]/@name");
           wizDefVal.clear().append(m_pEnv->queryProp(tempPath.str()));
         }
+        else if(!strcmp(type,"espprocessType"))
+        {
+          tempPath.clear().append("./Software/EspProcess[1]/@name");
+          wizDefVal.clear().append(m_pEnv->queryProp(tempPath.str()));
+        }
+        else if(!strcmp(type,"mysqlloggingagentType"))
+        {
+          tempPath.clear().append("./Software/MySQLLoggingAgent[1]/@name");
+          wizDefVal.clear().append(m_pEnv->queryProp(tempPath.str()));
+        }
+        else if(!strcmp(type,"esploggingagentType"))
+        {
+          tempPath.clear().append("./Software/ESPLoggingAgent[1]/@name");
+          wizDefVal.clear().append(m_pEnv->queryProp(tempPath.str()));
+        }
+        else if(!strcmp(type,"loggingmanagerType"))
+        {
+          tempPath.clear().append("./Software/LoggingManager[1]/@name");
+          wizDefVal.clear().append(m_pEnv->queryProp(tempPath.str()));
+        }
         else if(!strcmp(type,"daliServersType"))
         {
           tempPath.clear().append("./Software/DaliServerProcess[1]/@name");

esp/src/d3

@@ -1 +1 @@
-Subproject commit 48ad44fdeef32b518c6271bb99a9aed376c1a1d6
+Subproject commit a4bd16705e2a054f570310d6a8adac663923ab92

esp/src/dgrid

@@ -1 +1 @@
-Subproject commit 24564450a03aa08cc98c2ac89d77d99d7c1be8c3
+Subproject commit 62b4967eb2c8e3dd8c52a02ce73093989cb8c7ca

esp/src/dijit

@@ -1 +1 @@
-Subproject commit 86f5a760b9e712630c55f3d067f57442c9bc71bd
+Subproject commit 17ae4b907e1d6696da2d85588f03ed9061563ad1

esp/src/dojo

@@ -1 +1 @@
-Subproject commit f0e9f59a00d49e2da12a4dd6bb22e4ec5f81a8b6
+Subproject commit b58a3f5fae22468449bf823a88d3712c753cdb91

esp/src/dojox

@@ -1 +1 @@
-Subproject commit 2cee937968e983d99430940a0d51414b72dc8f18
+Subproject commit 0767ecd14bfc7ecf448a329c06c926c756aaf0c7

esp/src/topojson

@@ -1 +1 @@
-Subproject commit 834e274f0f08622cc8f76dbfdb3417dd3a716236
+Subproject commit 94d2786c3435c916c87ed043a57893d1a9fe9911

esp/src/util

@@ -1 +1 @@
-Subproject commit 8aecb8f3173fd1c12ed920a303dd4c239a210c48
+Subproject commit d17885ccf2a3a88d27682f4732b14206ea5282d3