Página inicial Explorar Ajuda
Entrar
RONCC
/
Big-Data-HPC-Platform
Observar 1
Favorito 0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Ver código fonte

Merge pull request #2299 from richardkchapman/smc_rollback

Smc rollback

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 13 anos atrás
pai
4dba80293c 031d6139ba
commit
15033af6ed
13 arquivos alterados com 37 adições e 45 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 1 1
      deployment/envgen/main.cpp
  2. 1 1
      esp/eclwatch/ws_XSLT/access_permissions.xslt
  3. 1 1
      esp/eclwatch/ws_XSLT/access_resources.xslt
  4. 1 3
      esp/scm/ws_access.ecm
  5. 1 7
      esp/services/ws_access/ws_accessService.cpp
  6. 1 1
      esp/services/ws_smc/ws_smcService.cpp
  7. 1 1
      initfiles/componentfiles/configxml/@temp/esp_service_WsSMC.xsl
  8. 6 6
      initfiles/componentfiles/configxml/buildsetCC.xml.in
  9. 1 1
      initfiles/componentfiles/configxml/cgencomplist_linux.xml
  10. 1 1
      initfiles/componentfiles/configxml/cgencomplist_win.xml
  11. 1 1
      initfiles/componentfiles/configxml/espsmcservice.xsd
  12. 2 2
      initfiles/componentfiles/configxml/espsmcservice.xsd.in
  13. 19 19
      initfiles/etc/DIR_NAME/environment.xml.in

+ 1 - 1
deployment/envgen/main.cpp
Ver arquivo 

@@ -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 eclwatch,@enableSystemUseRewrite,true\"");
 
+  puts("          -override espsmc,@enableSystemUseRewrite,true\"");
 
   puts("   -help: print out this usage.");
 
 }

+ 1 - 1
esp/eclwatch/ws_XSLT/access_permissions.xslt
Ver arquivo 

@@ -147,7 +147,7 @@
 
             </script>
 
         </head>
 
     <body class="yui-skin-sam" onload="nof5()">
 
-            <h3>Permissions of '<xsl:value-of select="description"/> (<xsl:value-of select="name"/>)'</h3>
 
+            <h3>Permissions of <xsl:value-of select="name"/></h3>
 
             <p/>
 
             <xsl:choose>
 
                 <xsl:when test="not(Permissions/Permission[1])">

+ 1 - 1
esp/eclwatch/ws_XSLT/access_resources.xslt
Ver arquivo 

@@ -271,7 +271,7 @@
 
         <xsl:value-of select="description"/>
 
         </td>
 
         <td align="center">
 
-            <a href="javascript:go('/ws_access/ResourcePermissions?basedn={../../basedn}&amp;rtype={../../rtype}&amp;rtitle={../../rtitle}&amp;name={name}&amp;description={description}&amp;prefix={../../prefix}')">Permissions</a>
 
+            <a href="javascript:go('/ws_access/ResourcePermissions?basedn={../../basedn}&amp;rtype={../../rtype}&amp;rtitle={../../rtitle}&amp;name={name}&amp;prefix={../../prefix}')">Permissions</a>
 
         </td>
 
         </tr>
 
     </xsl:template>

+ 1 - 3
esp/scm/ws_access.ecm
Ver arquivo 

@@ -440,7 +440,6 @@ ESPrequest ResourcePermissionsRequest
 
     string name;
 
     string rtitle;
 
     string prefix;
 
-    string description;
 
 };
 
 
 ESPstruct ResourcePermission
 
@@ -465,7 +464,6 @@ ESPresponse ResourcePermissionsResponse
 
     string name;
 
     string rtitle;
 
     string prefix;
 
-    [min_ver("1.07")] string description;
 
     ESParray<ESPstruct ResourcePermission, Permission> Permissions;
 
 };
 
 
@@ -649,7 +647,7 @@ ESPresponse [nil_remove] UserAccountExportResponse
 
 };
 
 
 
-ESPservice [version("1.07"), default_client_version("1.07"), exceptions_inline("./smc_xslt/exceptions.xslt")] ws_access
 
+ESPservice [version("1.06"), default_client_version("1.06"), exceptions_inline("./smc_xslt/exceptions.xslt")] ws_access
 
 {
 
     ESPmethod [client_xslt("/esp/xslt/access_users.xslt")] Users(UserRequest, UserResponse);
 
     ESPmethod [client_xslt("/esp/xslt/access_useredit.xslt")] UserEdit(UserEditRequest, UserEditResponse);

+ 1 - 7
esp/services/ws_access/ws_accessService.cpp
Ver arquivo 

@@ -141,9 +141,7 @@ void Cws_accessEx::init(IPropertyTree *cfg, const char *process, const char *ser
 
             else
 
                 head.append(colon - bptr, bptr);
 
 
-            if(strieq(head.str(), "SMC"))
 
-                head.clear().append("Management Console");
 
-            else if(strieq(head.str(), "WsAttributesAccess"))
 
+            if(stricmp(head.str(), "WsAttributesAccess") == 0)
 
                 continue;
 
 
             Owned<IEspDnStruct> onedn = createDnStruct();
 
@@ -1738,10 +1736,6 @@ bool Cws_accessEx::onResourcePermissions(IEspContext &context, IEspResourcePermi
 
         resp.setName(req.getName());
 
         resp.setPrefix(req.getPrefix());
 
         resp.setPermissions(parray);
 
-
 
-        double version = context.getClientVersion();
 
-        if (version > 1.06)
 
-            resp.setDescription(req.getDescription());
 
     }
 
     catch(IException* e)
 
     {

+ 1 - 1
esp/services/ws_smc/ws_smcService.cpp
Ver arquivo 

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

+ 1 - 1
initfiles/componentfiles/configxml/@temp/esp_service_WsSMC.xsl
Ver arquivo 

@@ -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="'eclwatch'"/>
 
+    <xsl:param name="espServiceName" select="'espsmc'"/>
 
 
     <xsl:template match="text()"/>

+ 6 - 6
initfiles/componentfiles/configxml/buildsetCC.xml.in
Ver arquivo 

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

+ 1 - 1
initfiles/componentfiles/configxml/cgencomplist_linux.xml
Ver arquivo 

@@ -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="eclwatch" processName='EspService' schema='espsmcservice.xsd' deployable='no'>
 
+  <Component name="espsmc" 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>

+ 1 - 1
initfiles/componentfiles/configxml/cgencomplist_win.xml
Ver arquivo 

@@ -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="eclwatch" processName='EspService' schema='espsmcservice.xsd' deployable='no'>
 
+  <Component name="espsmc" 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>

+ 1 - 1
initfiles/componentfiles/configxml/espsmcservice.xsd
Ver arquivo 

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

+ 2 - 2
initfiles/componentfiles/configxml/espsmcservice.xsd.in
Ver arquivo 

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

+ 19 - 19
initfiles/etc/DIR_NAME/environment.xml.in
Ver arquivo 

@@ -86,7 +86,7 @@
 
              schema="esp.xsd"/>
 
    <BuildSet deployable="no"
 
              installSet="deploy_map.xml"
 
-             name="eclwatch"
 
+             name="espsmc"
 
              path="componentfiles/espsmc"
 
              processName="EspService"
 
              schema="espsmcservice.xsd">
 
@@ -95,13 +95,13 @@
 
                 defaultSecurePort="18010"
 
                 type="WsSMC">
 
      <Authenticate access="Read"
 
-                   description="Base access to ESP services"
 
+                   description="Root access to SMC service"
 
                    path="/"
 
                    required="Read"
 
-                   resource="SMCAccess"/>
 
-     <AuthenticateFeature description="Base access to ESP services"
 
-                          path="SMCAccess"
 
-                          resource="SMCAccess"
 
+                   resource="SmcAccess"/>
 
+     <AuthenticateFeature description="Access to SMC service"
 
+                          path="SmcAccess"
 
+                          resource="SmcAccess"
 
                           service="ws_smc"/>
 
      <AuthenticateFeature description="Access to thor queues"
 
                           path="ThorQueueAccess"
 
@@ -491,7 +491,7 @@
 
                    method="none"/>
 
    <EspBinding defaultForPort="true"
 
                defaultServiceVersion=""
 
-               name="eclwatch"
 
+               name="smc"
 
                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="Base access to ESP services"
 
+                  description="Root access to SMC service"
 
                   path="/"
 
                   required="Read"
 
-                  resource="SMCAccess"/>
 
+                  resource="SmcAccess"/>
 
     <AuthenticateFeature authenticate="Yes"
 
-                         description="Base access to ESP services"
 
-                         path="SMCAccess"
 
-                         resource="SMCAccess"
 
+                         description="Access to SMC service"
 
+                         path="SmcAccess"
 
+                         resource="SmcAccess"
 
                          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="eclwatch"
 
-              description="ESP services for Management Console"
 
+              buildSet="espsmc"
 
+              description="ESP services for SMC"
 
               disableUppercaseTranslation="false"
 
               enableSystemUseRewrite="false"
 
               excludePartitions="/,/dev*,/sys,/usr,/proc/*"
 
@@ -687,13 +687,13 @@
 
                defaultSecurePort="18010"
 
                type="WsSMC">
 
     <Authenticate access="Read"
 
-                  description="Base access to ESP services"
 
+                  description="Root access to SMC service"
 
                   path="/"
 
                   required="Read"
 
-                  resource="SMCAccess"/>
 
-    <AuthenticateFeature description="Base access to ESP services"
 
-                         path="SMCAccess"
 
-                         resource="SMCAccess"
 
+                  resource="SmcAccess"/>
 
+    <AuthenticateFeature description="Access to SMC service"
 
+                         path="SmcAccess"
 
+                         resource="SmcAccess"
 
                          service="ws_smc"/>
 
     <AuthenticateFeature description="Access to thor queues"
 
                          path="ThorQueueAccess"