[Hyperic-hq-discuss] hq r14294 - in trunk: installer/data sql

[<dcr...@hy...>]

Author: dcrutchf
Date: 2010-02-16 10:00:47 -0800 (Tue, 16 Feb 2010)
New Revision: 14294
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14294

Modified:
   trunk/installer/data/db-upgrade.xml
   trunk/sql/authz-data.xml
Log:
Updated to include view permission for escalation and create permission for groups (however, they are still not being enforced, will tackle that in another sprint task)

Modified: trunk/installer/data/db-upgrade.xml
===================================================================
--- trunk/installer/data/db-upgrade.xml	2010-02-16 09:28:23 UTC (rev 14293)
+++ trunk/installer/data/db-upgrade.xml	2010-02-16 18:00:47 UTC (rev 14294)
@@ -10885,6 +10885,22 @@
                         precision="500" columnType="VARCHAR2" />
   </schemaSpec>
 
+  <schemaSpec version="3.194"> 
+  	<schema-directSQL>  
+        <statement desc="Adding create group permission...">
+           INSERT INTO EAM_OPERATION(ID,VERSION_COL,NAME,RESOURCE_TYPE_ID) VALUES (29,0,'createResourceGroup',3);
+        </statement>   
+        <statement desc="Adding view escalation permission...">
+           INSERT INTO EAM_OPERATION(ID,VERSION_COL,NAME,RESOURCE_TYPE_ID) VALUES (415,0,'viewEscalation',0);
+        </statement>   
+  		<statement desc="Adding create group permission to all existing roles (for backwards-compatibility)...">
+  			INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) SELECT ID,29 FROM EAM_ROLE;
+  		</statement>
+  		<statement desc="Adding view escalation permission to all existing roles (for backwards-compatibility)...">
+  			INSERT INTO EAM_ROLE_OPERATION_MAP(ROLE_ID, OPERATION_ID) SELECT ID,415 FROM EAM_ROLE;
+  		</statement>
+    </schema-directSQL>
+  </schemaSpec>
 </dbupgrade>
 </target>
 </project>

Modified: trunk/sql/authz-data.xml
===================================================================
--- trunk/sql/authz-data.xml	2010-02-16 09:28:23 UTC (rev 14293)
+++ trunk/sql/authz-data.xml	2010-02-16 18:00:47 UTC (rev 14294)
@@ -193,7 +193,9 @@
             NAME="addRole"/>
       <data ID="28" RESOURCE_TYPE_ID="%EAM_RESOURCE_TYPE.ID:3"
             NAME="viewResourceGroup"/>
-
+	  <data ID="29" RESOURCE_TYPE_ID="%EAM_RESOURCE_TYPE.ID:3"
+            NAME="createResourceGroup"/>
+      
        <!-- new operations that are added here because it sucks to have
             to move every single id stated before this line -->
       <!-- remove role -->
@@ -337,6 +339,8 @@
             NAME="modifyEscalation"/>
         <data ID="414" RESOURCE_TYPE_ID="%EAM_RESOURCE_TYPE.ID:0"
             NAME="removeEscalation"/>
+        <data ID="415" RESOURCE_TYPE_ID="%EAM_RESOURCE_TYPE.ID:0"
+            NAME="viewEscalation"/>
 
     </table>
 
@@ -449,6 +453,7 @@
         <data OPERATION_ID="%EAM_OPERATION.ID:24" ROLE_ID="%EAM_ROLE.ID:0"/>
         <data OPERATION_ID="%EAM_OPERATION.ID:25" ROLE_ID="%EAM_ROLE.ID:0"/>
         <data OPERATION_ID="%EAM_OPERATION.ID:28" ROLE_ID="%EAM_ROLE.ID:0"/>
+        <data OPERATION_ID="%EAM_OPERATION.ID:29" ROLE_ID="%EAM_ROLE.ID:0"/>
         <data OPERATION_ID="%EAM_OPERATION.ID:301" ROLE_ID="%EAM_ROLE.ID:0"/>
         <data OPERATION_ID="%EAM_OPERATION.ID:302" ROLE_ID="%EAM_ROLE.ID:0"/>
         <data OPERATION_ID="%EAM_OPERATION.ID:303" ROLE_ID="%EAM_ROLE.ID:0"/>
@@ -486,6 +491,7 @@
         <data OPERATION_ID="%EAM_OPERATION.ID:412" ROLE_ID="%EAM_ROLE.ID:0"/>
         <data OPERATION_ID="%EAM_OPERATION.ID:413" ROLE_ID="%EAM_ROLE.ID:0"/>
         <data OPERATION_ID="%EAM_OPERATION.ID:414" ROLE_ID="%EAM_ROLE.ID:0"/>
+        <data OPERATION_ID="%EAM_OPERATION.ID:415" ROLE_ID="%EAM_ROLE.ID:0"/>
     </table>
 
     <!-- RESOURCE CREATOR ROLE DEFINITION STUFF. The entries here