Scarab commit: svn commit: r11256 - branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab: actions actions/admin om tools
[email protected] Fri, 4 May 2012 08:30:31 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mcoss
Date: 2012-05-04 08:30:30-0700
New Revision: 11256
Modified:
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.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/om/ScarabModule.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/tools/SecurityAdminTool.java
Log:
CHG - TurbineSecurity.getRole() -> TurbineSecurity.getRoleByName()
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java?view=diff&pathrev=11256&r1=11255&r2=11256
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java 2012-05-04 08:30:30-0700
@@ -118,7 +118,7 @@
boolean autoApprove = Arrays.asList(autoRoles).contains(roleName);
if (autoApprove)
{
- Role role = TurbineSecurity.getRole(roleName);
+ Role role = TurbineSecurity.getRoleByName(roleName);
TurbineSecurity.grant(user, module, role);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java?view=diff&pathrev=11256&r1=11255&r2=11256
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java 2012-05-04 08:30:30-0700
@@ -305,7 +305,7 @@
}
else
{
- Role role = TurbineSecurity.getRole(roleName);
+ Role role = TurbineSecurity.getRoleByName(roleName);
try
{
TurbineSecurity.grant(user, (Group)module, role);
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=11256&r1=11255&r2=11256
==============================================================================
--- 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:30:30-0700
@@ -160,7 +160,7 @@
*/
String name = data.getParameters().getString("name");
checkParamValidity(data, context, null);
- Role role = TurbineSecurity.getRole(name);
+ Role role = TurbineSecurity.getRoleByName(name);
/*
* Grab the permissions for the role we are
@@ -220,7 +220,7 @@
* Grab the role we are trying to delete.
*/
String name = data.getParameters().getString("name");
- Role role = TurbineSecurity.getRole(name);
+ Role role = TurbineSecurity.getRoleByName(name);
TurbineSecurity.removeRole(role);
ScarabLocalizationTool l10n = getLocalizationTool(context);
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java?view=diff&pathrev=11256&r1=11255&r2=11256
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabModule.java 2012-05-04 08:30:30-0700
@@ -857,7 +857,7 @@
{
final User user = ScarabUserManager.getInstance(getOwnerId());
- final Role role = TurbineSecurity.getRole(PROJECT_OWNER_ROLE);
+ final Role role = TurbineSecurity.getRoleByName(PROJECT_OWNER_ROLE);
grant (user, role);
setInitialAttributesAndIssueTypes();
}
@@ -1190,7 +1190,7 @@
String roleName = GlobalParameterManager
.getString(GlobalParameter.REQUIRED_ROLE_FOR_REQUESTING_ACCESS, this);
if (roleName != null && roleName.length() > 0)
- role = TurbineSecurity.getRole(roleName);
+ role = TurbineSecurity.getRoleByName(roleName);
}
catch (Exception e)
{
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java?view=diff&pathrev=11256&r1=11255&r2=11256
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/om/ScarabUserImpl.java 2012-05-04 08:30:30-0700
@@ -434,7 +434,7 @@
String defaultRoleName = getDefaultRoleForModule(moduleName);
if(defaultRoleName != null)
{
- Role role = TurbineSecurity.getRole(defaultRoleName);
+ Role role = TurbineSecurity.getRoleByName(defaultRoleName);
if(role != null)
{
ScarabUser su = (ScarabUser)this;
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=11256&r1=11255&r2=11256
==============================================================================
--- 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:30:30-0700
@@ -134,7 +134,7 @@
public Role getRoleByName(String name) throws Exception
{
Role role = null;
- role = TurbineSecurity.getRole(name);
+ role = TurbineSecurity.getRoleByName(name);
return role;
}
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2957681