HPCC-14732 Address Cleaner Plugin options with Configmgr

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

deployment/deployutils/deployutils.cpp

@@ -827,6 +827,12 @@ public:
               LoadComboBox("Software/DaliServerProcess", bAddBlank, m_pEnv, m_pEnv, strBuf);
               extraInfo = strBuf.str();
             }
+            else if (strcmp(type, "addrCleanerPluginType")==0)
+            {
+              nCtrlType = 4;//LVC_COMBO;
+              LoadComboBox("Software/AddrCleanerPluginProcess", bAddBlank, m_pEnv, m_pEnv, strBuf);
+              extraInfo = strBuf.str();
+            }
             else if (strcmp(type, "securityManagerType")==0)
             {
               nCtrlType = 4;//LVC_COMBO;

initfiles/componentfiles/configxml/CMakeLists.txt

@@ -20,7 +20,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/esp.xsd.in ${CMAKE_CURRENT_BINARY_DIR
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/espsmcservice.xsd.in ${CMAKE_CURRENT_BINARY_DIR}/espsmcservice.xsd)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ftslave_linux.xsd.in ${CMAKE_CURRENT_BINARY_DIR}/ftslave_linux.xsd)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/roxie.xsd.in ${CMAKE_CURRENT_BINARY_DIR}/roxie.xsd)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/RoxieTopology.xsl ${CMAKE_CURRENT_BINARY_DIR}/RoxieTopology.xsl)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/thor.xsd.in ${CMAKE_CURRENT_BINARY_DIR}/thor.xsd)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/thor.xsl ${CMAKE_CURRENT_BINARY_DIR}/thor.xsl)
 
 if("${HPCC_PROJECT_ABBR}" STREQUAL "CC")
     configure_file("buildset${HPCC_PROJECT_ABBR}.xml.in" "buildset.xml")
@@ -34,8 +36,9 @@ FOREACH( iFILES
     ${CMAKE_CURRENT_BINARY_DIR}/espsmcservice.xsd
     ${CMAKE_CURRENT_BINARY_DIR}/ftslave_linux.xsd
     ${CMAKE_CURRENT_BINARY_DIR}/roxie.xsd
+    ${CMAKE_CURRENT_BINARY_DIR}/RoxieTopology.xsl
     ${CMAKE_CURRENT_BINARY_DIR}/thor.xsd
-    ${CMAKE_CURRENT_SOURCE_DIR}/thor.xsl
+    ${CMAKE_CURRENT_BINARY_DIR}/thor.xsl
     ${CMAKE_CURRENT_SOURCE_DIR}/setvars_linux.xsl
     ${CMAKE_CURRENT_SOURCE_DIR}/custom_plugin.xsd
     ${CMAKE_CURRENT_SOURCE_DIR}/dafilesrv.xsd
@@ -76,7 +79,6 @@ FOREACH( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/eclscheduler.xsl
     ${CMAKE_CURRENT_SOURCE_DIR}/eclccserver.xsl
     ${CMAKE_CURRENT_SOURCE_DIR}/eclplus.xsl
-    ${CMAKE_CURRENT_SOURCE_DIR}/RoxieTopology.xsl
     ${CMAKE_CURRENT_SOURCE_DIR}/slaves.xsl
     ${CMAKE_CURRENT_SOURCE_DIR}/roxievars_linux.xsl
     ${CMAKE_CURRENT_SOURCE_DIR}/sasha.xsl

initfiles/componentfiles/configxml/RoxieTopology.xsl

@@ -157,6 +157,7 @@
                     <xsl:copy-of select="@priority"/>
                 </xsl:copy>
             </xsl:for-each>
+            @XSL_PLUGIN_DEFINITION1@
             <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,6 +402,7 @@
           </xs:appinfo>
         </xs:annotation>
       </xs:attribute>
+      @XSD_PLUGIN_DEFINITION1@
       <xs:attribute name="pluginsPath" type="relativePath" use="optional" default="${PLUGINS_PATH}">
         <xs:annotation>
           <xs:appinfo>

initfiles/componentfiles/configxml/thor.xsd.in

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

initfiles/componentfiles/configxml/thor.xsl

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