HPCC-17336 Add WuWsBilling agent support

Base repo changes needed by LN repo
Add logging agent type attribute to all logging agents to make all agents
available for addition in logging manager
Update config XML files to point WuBilling component to correct XSL

Signed-off-by: Ken Rowland <kenneth.rowland@lexisnexisrisk.com>

deployment/deployutils/deployutils.cpp

@@ -899,8 +899,9 @@ public:
             else if (strcmp(type, "esploggingagentType")==0)
             {
               nCtrlType = 4;//LVC_COMBO;
-              bAddBlank = true;
-              LoadComboBox("Software/ESPLoggingAgent", bAddBlank, m_pEnv, m_pEnv, strBuf);
+              bAddBlank = true;  
+              //LoadComboBox("Software/ESPLoggingAgent", bAddBlank, m_pEnv, m_pEnv, strBuf);
+              LoadComboBox("Software/*/[@type=\"DefaultLoggingAgent\"]", bAddBlank, m_pEnv, m_pEnv, strBuf);
               extraInfo = strBuf.str();
             }
             else if (strcmp(type, "loggingmanagerType")==0)

initfiles/componentfiles/configxml/cassandraloggingagent.xsd

@@ -27,6 +27,14 @@
             <title>Cassandra Logging Agent</title>
         </xs:appinfo>
       </xs:annotation>
+      <!-- All SecurityManager Plugins must define the type="SecurityManager" attribute -->
+      <xs:attribute name="type" type="DefaultLoggingAgent" use="required" default="DefaultLoggingAgent">
+        <xs:annotation>
+          <xs:appinfo>
+            <viewType>hidden</viewType>
+          </xs:appinfo>
+        </xs:annotation>
+      </xs:attribute>
       <xs:attribute name="build" type="buildType" use="required">
         <xs:annotation>
           <xs:appinfo>

initfiles/componentfiles/configxml/cgencomplist_linux.xml

@@ -74,8 +74,8 @@
   <Component name="ecldirect" processName='EspService' schema='esp_service_ecldirect.xsd' deployable='no'>
     <File name="@temp/esp_service_ecldirect.xsl" method="esp_service_module"/>
   </Component>
-  <Component name="esp_wubilling" processName='EspService' schema='esp_service_wubilling.xsd' deployable='no'>
-    <File name="@temp/esp_service_wubilling.xsl" method="esp_service_module"/>
+  <Component name="esp_wubilling" processName='EspService' schema='wswubilling.xsd' deployable='no'>
+    <File name="@temp/esp_service_wswubilling.xsl" method="esp_service_module"/>
   </Component>
   <Component name="espadl" processName='EspService' schema='esp_service_wsadl.xsd' deployable='no'>
     <File name="@temp/esp_service_wsadl.xsl" method="esp_service_module"/>

initfiles/componentfiles/configxml/cgencomplist_win.xml

@@ -77,8 +77,8 @@
   <Component name="ecldirect" processName='EspService' schema='esp_service_ecldirect.xsd' deployable='no'>
     <File name="@temp\esp_service_ecldirect.xsl" method="esp_service_module"/>
   </Component>
-  <Component name="esp_wubilling" processName='EspService' schema='esp_service_wubilling.xsd' deployable='no'>
-    <File name="@temp\esp_service_wubilling.xsl" method="esp_service_module"/>
+  <Component name="esp_wubilling" processName='EspService' schema='wswubilling.xsd' deployable='no'>
+    <File name="@temp\esp_service_wswubilling.xsl" method="esp_service_module"/>
   </Component>
   <Component name="espadl" processName='EspService' schema='esp_service_wsadl.xsd' deployable='no'>
     <File name="@temp\esp_service_wsadl.xsl" method="esp_service_module"/>

initfiles/componentfiles/configxml/esploggingagent.xsd

@@ -15,6 +15,14 @@
             <title>ESP Logging Agent</title>
         </xs:appinfo>
       </xs:annotation>
+      <!-- All logging agent Plugins must define the type="DefaultLoggingAgent" attribute -->
+      <xs:attribute name="type" type="DefaultLoggingAgent" use="required" default="DefaultLoggingAgent">
+        <xs:annotation>
+          <xs:appinfo>
+            <viewType>hidden</viewType>
+          </xs:appinfo>
+        </xs:annotation>
+      </xs:attribute>
       <xs:attribute name="build" type="buildType" use="required">
         <xs:annotation>
           <xs:appinfo>