Startsida Utforska Hjälp
Logga in
RONCC
/
Big-Data-HPC-Platform
Bevaka 1
Stjärnmärk 0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Bläddra i källkod

Keep 'SmcAccess' and better display of permissions page

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>
Kevin Wang 13 år sedan
förälder
1d9141c466
incheckning
c8047ef967
7 ändrade filer med 23 tillägg och 17 borttagningar
Unifierad Vy Visa Diff Statistik
  1. 1 1
      esp/eclwatch/ws_XSLT/access_permissions.xslt
  2. 1 1
      esp/eclwatch/ws_XSLT/access_resources.xslt
  3. 3 1
      esp/scm/ws_access.ecm
  4. 5 1
      esp/services/ws_access/ws_accessService.cpp
  5. 1 1
      esp/services/ws_smc/ws_smcService.cpp
  6. 3 3
      initfiles/componentfiles/configxml/buildsetCC.xml.in
  7. 9 9
      initfiles/etc/DIR_NAME/environment.xml.in

+ 1 - 1
esp/eclwatch/ws_XSLT/access_permissions.xslt
Visa fil 

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

+ 1 - 1
esp/eclwatch/ws_XSLT/access_resources.xslt
Visa fil 

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

+ 3 - 1
esp/scm/ws_access.ecm
Visa fil 

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

+ 5 - 1
esp/services/ws_access/ws_accessService.cpp
Visa fil 

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

+ 1 - 1
esp/services/ws_smc/ws_smcService.cpp
Visa fil 

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

+ 3 - 3
initfiles/componentfiles/configxml/buildsetCC.xml.in
Visa fil 

@@ -105,10 +105,10 @@
 
                    description="Base access to ESP services"
 
                    description="Base access to ESP services"
 
                    path="/"
 
                    path="/"
 
                    required="Read"
 
                    required="Read"
 
-                   resource="BaseAccess"/>
 
+                   resource="SMCAccess"/>
 
      <AuthenticateFeature description="Base access to ESP services"
 
      <AuthenticateFeature description="Base access to ESP services"
 
-                          path="BaseAccess"
 
-                          resource="BaseAccess"
 
+                          path="SMCAccess"
 
+                          resource="SMCAccess"
 
                           service="ws_smc"/>
 
                           service="ws_smc"/>
 
      <AuthenticateFeature description="Access to thor queues"
 
      <AuthenticateFeature description="Access to thor queues"
 
                           path="ThorQueueAccess"
 
                           path="ThorQueueAccess"

+ 9 - 9
initfiles/etc/DIR_NAME/environment.xml.in
Visa fil 

@@ -98,10 +98,10 @@
 
                    description="Base access to ESP services"
 
                    description="Base access to ESP services"
 
                    path="/"
 
                    path="/"
 
                    required="Read"
 
                    required="Read"
 
-                   resource="BaseAccess"/>
 
+                   resource="SMCAccess"/>
 
      <AuthenticateFeature description="Base access to ESP services"
 
      <AuthenticateFeature description="Base access to ESP services"
 
-                          path="BaseAccess"
 
-                          resource="BaseAccess"
 
+                          path="SMCAccess"
 
+                          resource="SMCAccess"
 
                           service="ws_smc"/>
 
                           service="ws_smc"/>
 
      <AuthenticateFeature description="Access to thor queues"
 
      <AuthenticateFeature description="Access to thor queues"
 
                           path="ThorQueueAccess"
 
                           path="ThorQueueAccess"
 
@@ -502,11 +502,11 @@
 
                   description="Base access to ESP services"
 
                   description="Base access to ESP services"
 
                   path="/"
 
                   path="/"
 
                   required="Read"
 
                   required="Read"
 
-                  resource="BaseAccess"/>
 
+                  resource="SMCAccess"/>
 
     <AuthenticateFeature authenticate="Yes"
 
     <AuthenticateFeature authenticate="Yes"
 
                          description="Base access to ESP services"
 
                          description="Base access to ESP services"
 
-                         path="BaseAccess"
 
-                         resource="BaseAccess"
 
+                         path="SMCAccess"
 
+                         resource="SMCAccess"
 
                          service="ws_smc"/>
 
                          service="ws_smc"/>
 
     <AuthenticateFeature authenticate="Yes"
 
     <AuthenticateFeature authenticate="Yes"
 
                          description="Access to thor queues"
 
                          description="Access to thor queues"
 
@@ -690,10 +690,10 @@
 
                   description="Base access to ESP services"
 
                   description="Base access to ESP services"
 
                   path="/"
 
                   path="/"
 
                   required="Read"
 
                   required="Read"
 
-                  resource="BaseAccess"/>
 
+                  resource="SMCAccess"/>
 
     <AuthenticateFeature description="Base access to ESP services"
 
     <AuthenticateFeature description="Base access to ESP services"
 
-                         path="BaseAccess"
 
-                         resource="BaseAccess"
 
+                         path="SMCAccess"
 
+                         resource="SMCAccess"
 
                          service="ws_smc"/>
 
                          service="ws_smc"/>
 
     <AuthenticateFeature description="Access to thor queues"
 
     <AuthenticateFeature description="Access to thor queues"
 
                          path="ThorQueueAccess"
 
                          path="ThorQueueAccess"