Merge pull request #15682 from jakesmith/HPCC-27013-WsDfs-ws_dfsservice

HPCC-27013 Fix containerized WsDfs vs ws_dfsservice naming issues

Reviewed-By: Anthony Fishbeck anthony.fishbeck@lexisnexisrisk.com
Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>

esp/applications/eclservices/application.yaml

@@ -5,7 +5,7 @@ application:
    - WsWorkunits
    - WsTopology
    - WsDfu
-   - WsDfs
+   - ws_dfsservice
    - WsDfuXRef
    - WsFileIO
    - WsPackageProcess

esp/applications/eclservices/eclservices.yaml

@@ -36,7 +36,7 @@ eclservices:
         xslt:
         - name: def_file
           ^: "./smc_xslt/def_file.xslt"
-   WsDfs:
+   ws_dfsservice:
    WsDfuXRef:
       ViewTimeout: 1000
       LayoutProgram: dot/dot -Tsvg -Gordering=out

esp/applications/eclservices/ldap_authorization_map.yaml

@@ -105,7 +105,7 @@ ldap:
          -  path: DfuAccess
             resource: DfuAccess
             description: Access to DFU
-      WsDfs:
+      ws_dfsservice:
          Feature:
          -  path: DfsAccess
             resource: DfsAccess

esp/applications/eclservices/plugins.yaml

@@ -7,7 +7,7 @@ service_plugins:
   ws_access: ws_access
   ws_account: ws_account
   WsDfu: ws_dfu
-  WsDfs: ws_dfsservice
+  ws_dfsservice: ws_dfsservice
   WsDfuXRef: ws_dfu
   ws_elk: ws_elk
   ws_esdlconfig: ws_esdlconfig
@@ -25,7 +25,7 @@ binding_plugins:
   ws_access: ws_access
   ws_account: ws_account
   WsDfu: ws_dfu
-  WsDfs: ws_dfsservice
+  ws_dfsservice: ws_dfsservice
   WsDfuXRef: ws_dfu
   ws_elk: ws_elk
   ws_esdlconfig: ws_esdlconfig

esp/applications/eclwatch/application.yaml

@@ -5,7 +5,7 @@ application:
    - WsWorkunits
    - WsTopology
    - WsDfu
-   - WsDfs
+   - ws_dfsservice
    - WsDfuXRef
    - WsFileIO
    - WsPackageProcess

esp/applications/eclwatch/eclwatch.yaml

@@ -34,7 +34,7 @@ eclwatch:
         xslt:
         - name: def_file
           ^: "./smc_xslt/def_file.xslt"
-   WsDfs:
+   ws_dfsservice:
    WsDfuXRef:
       ViewTimeout: 1000
       LayoutProgram: dot/dot -Tsvg -Gordering=out

esp/applications/eclwatch/ldap_authorization_map.yaml

@@ -106,7 +106,7 @@ ldap:
          -  path: DfuAccess
             resource: DfuAccess
             description: Access to DFU
-      WsDfs:
+      ws_dfsservice:
          Feature:
          -  path: DfsAccess
             resource: DfsAccess

esp/applications/eclwatch/plugins.yaml

@@ -7,7 +7,7 @@ service_plugins:
   ws_access: ws_access
   ws_account: ws_account
   WsDfu: ws_dfu
-  WsDfs: ws_dfsservice
+  ws_dfsservice: ws_dfsservice
   WsDfuXRef: ws_dfu
   ws_ecl: ws_ecl
   ws_elk: ws_elk
@@ -28,7 +28,7 @@ binding_plugins:
   ws_access: ws_access
   ws_account: ws_account
   WsDfu: ws_dfu
-  WsDfs: ws_dfsservice
+  ws_dfsservice: ws_dfsservice
   WsDfuXRef: ws_dfu
   ws_ecl: ws_ecl
   ws_elk: ws_elk

esp/services/ws_dfsservice/ws_dfsplugin.cpp

@@ -48,7 +48,7 @@ ESP_FACTORY IEspRpcBinding* esp_binding_factory(const char* name, const char* ty
     //binding names of the form <servicetype>_http are being added so the names can be made more consistent and can therefore be automatically generated
     //  the name also better reflects that these bindings are for all HTTP based protocols, not just SOAP
     //  both "SoapBinding" and "_http" names instantiate the same objects.
-    if (strieq(type, "ws_dfsserviceSoapBinding") || strieq(type, "WsDfs_http"))
+    if (strieq(type, "ws_dfsservice_binding") || strieq(type, "ws_dfsservice_http"))
     {
         return new CWsDfsSoapBinding(cfg, name, process);
     }

initfiles/componentfiles/configxml/@temp/esp_service_WsSMC.xsl

@@ -780,7 +780,7 @@ This is required by its binding with ESP service '<xsl:value-of select="$espServ
         <xsl:variable name="serviceType" select="'ws_dfsservice'"/>
         <xsl:variable name="serviceName" select="concat($serviceType, '_', @name, '_', $process)"/>
         <xsl:variable name="bindName" select="concat($serviceType, '_', $bindingNode/@name, '_', $process)"/>
-        <xsl:variable name="bindType" select="'ws_dfsserviceSoapBinding'"/>
+        <xsl:variable name="bindType" select="'ws_dfsservice_binding'"/>
         <xsl:variable name="servicePlugin">
             <xsl:call-template name="defineServicePlugin">
                 <xsl:with-param name="plugin" select="'ws_dfsservice'"/>