Fix gh-#2065 Replace 'SMC' in ECLWatch/ConfigMgr UI

Existing ECLWatch Permission area shows 'SMC' as feature name.
This fix changes it to better names. Most of the changes are
in environment.xml and other deployment scripts which create
the term into esp.xml. It is decided to rename the 'ESP
Services for SMC' to be 'ESP Services for management console'
and rename the 'Root access to SMC service' to be 'Base
access to ESP services'. This fix also changes the term
'espsmc' to 'eclwatch'.

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

deployment/envgen/main.cpp

@@ -102,7 +102,7 @@ void usage()
   puts("          directory and to set eclwatch's enableSystemUseRewrite to true, the following options");
   puts("          can be provided.");
   puts("          \"-override DropZone,@directory,/mnt/disk1/mydropzone ");
-  puts("          -override espsmc,@enableSystemUseRewrite,true\"");
+  puts("          -override eclwatch,@enableSystemUseRewrite,true\"");
   puts("   -help: print out this usage.");
 }
 

esp/services/ws_access/ws_accessService.cpp

@@ -141,7 +141,9 @@ void Cws_accessEx::init(IPropertyTree *cfg, const char *process, const char *ser
             else
                 head.append(colon - bptr, bptr);
 
-            if(stricmp(head.str(), "WsAttributesAccess") == 0)
+            if(strieq(head.str(), "SMC"))
+                head.clear().append("Management Console");
+            else if(stricmp(head.str(), "WsAttributesAccess") == 0)
                 continue;
 
             Owned<IEspDnStruct> onedn = createDnStruct();

esp/services/ws_smc/ws_smcService.cpp

@@ -30,7 +30,7 @@
 #include "dfuwu.hpp"
 #include "exception_util.hpp"
 
-static const char* FEATURE_URL = "SmcAccess";
+static const char* FEATURE_URL = "BaseAccess";
 const char* THORQUEUE_FEATURE = "ThorQueueAccess";
 
 const char* PERMISSIONS_FILENAME = "espsmc_permissions.xml";

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

@@ -26,7 +26,7 @@ xmlns:seisint="http://seisint.com"  xmlns:set="http://exslt.org/sets" exclude-re
     <xsl:param name="instance" select="'rmoondhra'"/>
     <xsl:param name="outputFilePath" select="'c:\development\deployment\xmlenv\dummy.xml'"/>
     <xsl:param name="isLinuxInstance" select="0"/>    
-    <xsl:param name="espServiceName" select="'espsmc'"/>
+    <xsl:param name="espServiceName" select="'eclwatch'"/>
 
     <xsl:template match="text()"/>
 

initfiles/componentfiles/configxml/buildsetCC.xml.in

@@ -93,7 +93,7 @@
              schema="esp.xsd"/>
    <BuildSet deployable="no"
              installSet="deploy_map.xml"
-             name="espsmc"
+             name="eclwatch"
              path="componentfiles/espsmc"
              processName="EspService"
              schema="espsmcservice.xsd">
@@ -102,13 +102,13 @@
                 defaultSecurePort="18010"
                 type="WsSMC">
      <Authenticate access="Read"
-                   description="Root access to SMC service"
+                   description="Base access to ESP services"
                    path="/"
                    required="Read"
-                   resource="SmcAccess"/>
-     <AuthenticateFeature description="Access to SMC service"
-                          path="SmcAccess"
-                          resource="SmcAccess"
+                   resource="BaseAccess"/>
+     <AuthenticateFeature description="Base access to ESP services"
+                          path="BaseAccess"
+                          resource="BaseAccess"
                           service="ws_smc"/>
      <AuthenticateFeature description="Access to thor queues"
                           path="ThorQueueAccess"

initfiles/componentfiles/configxml/cgencomplist_linux.xml

@@ -84,7 +84,7 @@
   <Component name="espjavelinapiau" processName='EspService' schema='espjavelinapi.xsd' deployable='no'>
     <File name="@temp/esp_service_javelinapiau.xsl" method="esp_service_module"/>
   </Component>
-  <Component name="espsmc" processName='EspService' schema='espsmcservice.xsd' deployable='no'>
+  <Component name="eclwatch" processName='EspService' schema='espsmcservice.xsd' deployable='no'>
     <File name="plugins.xsl" method="esp_plugin" destName="plugins.xml" destPath="@temp"/>
     <File name="@temp/esp_service_WsSMC.xsl" method="esp_service_module"/>
   </Component>

initfiles/componentfiles/configxml/cgencomplist_win.xml

@@ -87,7 +87,7 @@
   <Component name="espjavelinapiau" processName='EspService' schema='espjavelinapi.xsd' deployable='no'>
     <File name="@temp\esp_service_javelinapiau.xsl" method="esp_service_module"/>
   </Component>
-  <Component name="espsmc" processName='EspService' schema='espsmcservice.xsd' deployable='no'>
+  <Component name="eclwatch" processName='EspService' schema='espsmcservice.xsd' deployable='no'>
     <File name="plugins.xsl" method="esp_plugin" destName="plugins.xml" destPath="@temp"/>
     <File name="@temp\esp_service_WsSMC.xsl" method="esp_service_module"/>
   </Component>

initfiles/componentfiles/configxml/espsmcservice.xsd

@@ -39,7 +39,7 @@
                     </xs:appinfo>
                 </xs:annotation>
             </xs:attribute>
-            <xs:attribute name="name" type="xs:string" use="optional" default="espsmc">
+            <xs:attribute name="name" type="xs:string" use="optional" default="eclwatch">
                 <xs:annotation>
                     <xs:appinfo>
                         <required>true</required>

initfiles/componentfiles/configxml/espsmcservice.xsd.in

@@ -39,7 +39,7 @@
                     </xs:appinfo>
                 </xs:annotation>
             </xs:attribute>
-            <xs:attribute name="name" type="xs:string" use="optional" default="espsmc">
+            <xs:attribute name="name" type="xs:string" use="optional" default="eclwatch">
                 <xs:annotation>
                     <xs:appinfo>
                         <required>true</required>
@@ -49,7 +49,7 @@
                     </xs:appinfo>
                 </xs:annotation>
             </xs:attribute>
-            <xs:attribute name="description" type="xs:string" use="optional" default="ESP services for SMC">
+            <xs:attribute name="description" type="xs:string" use="optional" default="ESP services for Management Console">
                 <xs:annotation>
                     <xs:appinfo>
                         <tooltip>Description for this process</tooltip>

initfiles/etc/DIR_NAME/environment.xml.in

@@ -86,7 +86,7 @@
              schema="esp.xsd"/>
    <BuildSet deployable="no"
              installSet="deploy_map.xml"
-             name="espsmc"
+             name="eclwatch"
              path="componentfiles/espsmc"
              processName="EspService"
              schema="espsmcservice.xsd">
@@ -95,13 +95,13 @@
                 defaultSecurePort="18010"
                 type="WsSMC">
      <Authenticate access="Read"
-                   description="Root access to SMC service"
+                   description="Base access to ESP services"
                    path="/"
                    required="Read"
-                   resource="SmcAccess"/>
-     <AuthenticateFeature description="Access to SMC service"
-                          path="SmcAccess"
-                          resource="SmcAccess"
+                   resource="BaseAccess"/>
+     <AuthenticateFeature description="Base access to ESP services"
+                          path="BaseAccess"
+                          resource="BaseAccess"
                           service="ws_smc"/>
      <AuthenticateFeature description="Access to thor queues"
                           path="ThorQueueAccess"
@@ -491,7 +491,7 @@
                    method="none"/>
    <EspBinding defaultForPort="true"
                defaultServiceVersion=""
-               name="smc"
+               name="eclwatch"
                port="8010"
                protocol="http"
                resourcesBasedn="ou=SMC,ou=EspServices,ou=ecl"
@@ -499,14 +499,14 @@
                workunitsBasedn="ou=workunits,ou=ecl"
                wsdlServiceAddress="">
     <Authenticate access="Read"
-                  description="Root access to SMC service"
+                  description="Base access to ESP services"
                   path="/"
                   required="Read"
-                  resource="SmcAccess"/>
+                  resource="BaseAccess"/>
     <AuthenticateFeature authenticate="Yes"
-                         description="Access to SMC service"
-                         path="SmcAccess"
-                         resource="SmcAccess"
+                         description="Base access to ESP services"
+                         path="BaseAccess"
+                         resource="BaseAccess"
                          service="ws_smc"/>
     <AuthenticateFeature authenticate="Yes"
                          description="Access to thor queues"
@@ -668,8 +668,8 @@
   <EspService allowNewRoxieOnDemandQuery="false"
               AWUsCacheTimeout="15"
               build="${projname}_${version}-${stagever}"
-              buildSet="espsmc"
-              description="ESP services for SMC"
+              buildSet="eclwatch"
+              description="ESP services for Management Console"
               disableUppercaseTranslation="false"
               enableSystemUseRewrite="false"
               excludePartitions="/,/dev*,/sys,/usr,/proc/*"
@@ -687,13 +687,13 @@
                defaultSecurePort="18010"
                type="WsSMC">
     <Authenticate access="Read"
-                  description="Root access to SMC service"
+                  description="Base access to ESP services"
                   path="/"
                   required="Read"
-                  resource="SmcAccess"/>
-    <AuthenticateFeature description="Access to SMC service"
-                         path="SmcAccess"
-                         resource="SmcAccess"
+                  resource="BaseAccess"/>
+    <AuthenticateFeature description="Base access to ESP services"
+                         path="BaseAccess"
+                         resource="BaseAccess"
                          service="ws_smc"/>
     <AuthenticateFeature description="Access to thor queues"
                          path="ThorQueueAccess"