Scarab commit: svn commit: r11255 - branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab: actions/admin tools

Author: mcoss
Date: 2012-05-04 08:28:19-0700
New Revision: 11255

Modified:
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java
   branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/SecurityAdminTool.java

Log:
CHG - TurbineSecurity.getPermission() -> TurbineSecurity.getPermissionByName()

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java?view=diff&pathrev=11255&r1=11254&r2=11255
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java	2012-05-04 08:28:19-0700
@@ -145,7 +145,7 @@
         throws Exception
     {
         String name = data.getParameters().getString("name");
-        Permission permission = TurbineSecurity.getPermission(name);    
+        Permission permission = TurbineSecurity.getPermissionByName(name);    
         TurbineSecurity.removePermission(permission);
 
         ScarabUserManager.getMethodResult().remove( ScarabUserManager.SCARAB_USER_IMPL, ScarabUserManager.ACL_HAS_PERMISSION );

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java?view=diff&pathrev=11255&r1=11254&r2=11255
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java	2012-05-04 08:28:19-0700
@@ -182,7 +182,7 @@
             String rolePermission = roleName + permissionName;
             
             String formRolePermission = data.getParameters().getString(rolePermission);
-            Permission permission = TurbineSecurity.getPermission(permissionName);
+            Permission permission = TurbineSecurity.getPermissionByName(permissionName);
             
             
             if (formRolePermission != null && !rolePermissions.contains(permission))

Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/SecurityAdminTool.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/SecurityAdminTool.java?view=diff&pathrev=11255&r1=11254&r2=11255
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/SecurityAdminTool.java	(original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/SecurityAdminTool.java	2012-05-04 08:28:19-0700
@@ -121,7 +121,7 @@
     public Permission getPermissionByName(String name) throws Exception
     {
         Permission permission = null;
-        permission = TurbineSecurity.getPermission(name);
+        permission = TurbineSecurity.getPermissionByName(name);
         
         return permission;
     }

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2957680