HPCC-15982 Add ServiceBuildSet to WsTopology TpBinding

And default ws_ecl service name to 'ws_ecl'.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>

esp/scm/ws_topology.ecm

@@ -136,6 +136,7 @@ ESPStruct [nil_remove] TpBinding
     string Service;
     string ServiceType;
     [min_ver("1.23")] string BindingType;
+    [min_ver("1.24")] string ServiceBuildSet;
     string Port;
     string Protocol;
 
@@ -585,7 +586,7 @@ ESPresponse [exceptions_inline,encode(0)] TpGetServicePluginsResponse
     ESParray<ESPstruct TpEspServicePlugin, Plugin> Plugins;
 };
 
-ESPservice [noforms, version("1.23"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsTopology
+ESPservice [noforms, version("1.24"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsTopology
 {
     ESPuses ESPStruct TpBinding;
     ESPuses ESPstruct TpCluster;

esp/smc/SMCLib/TpWrapper.cpp

@@ -450,15 +450,17 @@ void CTpWrapper::getTpEspServers(IArrayOf<IConstTpEspServer>& list)
                 StringBuffer xpath;
                 xpath.appendf("EspService[@name='%s']", service);
                 IPropertyTree* pServiceNode = root->queryPropTree(xpath.str());
-                const char* serviceType = pServiceNode ? pServiceNode->queryProp("Properties/@type") : NULL;
-                if (serviceType && *serviceType)
-                    pTpBinding->setServiceType(serviceType);
-
                 if (pServiceNode)
                 {
+                    const char* serviceType = pServiceNode->queryProp("Properties/@type");
+                    if (serviceType && *serviceType)
+                        pTpBinding->setServiceType(serviceType);
                     const char* bindingType = pServiceNode->queryProp("Properties/@bindingType");
                     if (bindingType && *bindingType)
                         pTpBinding->setBindingType(bindingType);
+                    const char* buildSet = pServiceNode->queryProp("@buildSet");
+                    if (buildSet && *buildSet)
+                        pTpBinding->setServiceBuildSet(buildSet);
                 }
                 tpBindings.append(*pTpBinding.getLink());
             }

initfiles/etc/DIR_NAME/environment.xml.in

@@ -419,7 +419,7 @@
                port="8002"
                protocol="http"
                resourcesBasedn="ou=WsEcl,ou=EspServices,ou=ecl"
-               service="myws_ecl"
+               service="ws_ecl"
                type=""
                workunitsBasedn="ou=workunits,ou=ecl"
                wsdlServiceAddress="">
@@ -686,7 +686,7 @@
   <EspService build="_"
               buildSet="ws_ecl"
               description="WS ECL Service"
-              name="myws_ecl"
+              name="ws_ecl"
               roxieTimeout="300"
               workunitTimeout="600">
    <Properties bindingType="ws_eclSoapBinding"

testing/regress/environment.xml.in

@@ -414,7 +414,7 @@
                port="8002"
                protocol="http"
                resourcesBasedn="ou=WsEcl,ou=EspServices,ou=ecl"
-               service="myws_ecl"
+               service="ws_ecl"
                type=""
                workunitsBasedn="ou=workunits,ou=ecl"
                wsdlServiceAddress="">
@@ -677,7 +677,7 @@
   <EspService build="_"
               buildSet="ws_ecl"
               description="WS ECL Service"
-              name="myws_ecl"
+              name="ws_ecl"
               roxieTimeout="300"
               workunitTimeout="600">
    <Properties bindingType="ws_eclSoapBinding"