HPCC-14732 Address Cleaner Plugin options with ConfigMgr

Signed-off-by: Mark Kelly <mark.kelly@lexisnexis.com>

deployment/deploy/XMLTags.h

@@ -67,6 +67,7 @@
 #define XML_TAG_NODE                   "Node"
 #define XML_TAG_NODES                  "Nodes"
 #define XML_TAG_NODEREF                "NodeRef"
+#define XML_TAG_PLUGINTYPE             "PluginType"
 #define XML_TAG_PLUGINPROCESS          "PluginProcess"
 #define XML_TAG_PLUGINREF              "PluginRef"
 #define XML_TAG_ROXIE_FARM             "RoxieFarmProcess"

deployment/deployutils/deployutils.cpp

@@ -827,10 +827,13 @@ public:
               LoadComboBox("Software/DaliServerProcess", bAddBlank, m_pEnv, m_pEnv, strBuf);
               extraInfo = strBuf.str();
             }
-            else if (strcmp(type, "addrCleanerPluginType")==0)
+            else if (strstr(type, XML_TAG_PLUGINTYPE) != NULL)
             {
+              StringBuffer pluginName(XML_TAG_SOFTWARE);
+              pluginName.append("/").append(type);
+              pluginName.replaceString(XML_TAG_PLUGINTYPE, XML_TAG_PLUGINPROCESS);
               nCtrlType = 4;//LVC_COMBO;
-              LoadComboBox("Software/AddrCleanerPluginProcess", bAddBlank, m_pEnv, m_pEnv, strBuf);
+              LoadComboBox(pluginName.str(), bAddBlank, m_pEnv, m_pEnv, strBuf);
               extraInfo = strBuf.str();
             }
             else if (strcmp(type, "securityManagerType")==0)

initfiles/componentfiles/configxml/RoxieTopology.xsl

@@ -157,7 +157,7 @@
                     <xsl:copy-of select="@priority"/>
                 </xsl:copy>
             </xsl:for-each>
-            @XSL_PLUGIN_DEFINITION1@
+            @XSL_PLUGIN_DEFINITION@
             <xsl:for-each select="RoxieFarmProcess">
                 <xsl:element name="RoxieFarmProcess">
                     <xsl:copy-of select="@*[name()!='name' and name()!='level']"/>

initfiles/componentfiles/configxml/roxie.xsd.in

@@ -402,7 +402,7 @@
           </xs:appinfo>
         </xs:annotation>
       </xs:attribute>
-      @XSD_PLUGIN_DEFINITION1@
+      @XSD_PLUGIN_DEFINITION@
       <xs:attribute name="pluginsPath" type="relativePath" use="optional" default="${PLUGINS_PATH}">
         <xs:annotation>
           <xs:appinfo>

initfiles/componentfiles/configxml/thor.xsd.in

@@ -367,7 +367,7 @@
           </xs:appinfo>
         </xs:annotation>
       </xs:attribute>
-      @XSD_PLUGIN_DEFINITION1@
+      @XSD_PLUGIN_DEFINITION@
       <xs:attribute name="daliServers" type="daliServersType" use="required">
         <xs:annotation>
           <xs:appinfo>

initfiles/componentfiles/configxml/thor.xsl

@@ -191,7 +191,7 @@
       <xsl:apply-templates select="@*[string(.) != '']"/>
       
       <xsl:copy-of select="/Environment/Software/Directories"/> 
-      @XSL_PLUGIN_DEFINITION1@
+      @XSL_PLUGIN_DEFINITION@
       <Debug>
         <xsl:for-each select="Debug/@*">
           <xsl:if test="string(.) != ''">