From: Richard Millet <richard.millet@berkeley.edu>
Date: Tue, 9 Nov 2010 05:18:18 +0000 (+0000)
Subject: CSPACE-3158: Backing out change that qualified role names with tentant ID until App... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f8d511a96581a45f4d09b40395f9fc43e1aa2d7f;p=tmp%2Fjakarta-migration.git

CSPACE-3158: Backing out change that qualified role names with tentant ID until App layer gets a chance to update their tests.
---

diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java
index 837fbf513..8c3eec3a6 100644
--- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java
+++ b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/RoleDocumentHandler.java
@@ -189,7 +189,7 @@ public class RoleDocumentHandler
 
     private String fixRoleName(String role, String tenantId) {
         String roleName = role.toUpperCase();
-        String rolePrefix = "ROLE_" + tenantId + "_";
+        String rolePrefix = "ROLE_";//FIXME: Need to qualify role names with tenant ID. // + tenantId + "_";
         if (!roleName.startsWith(rolePrefix)) {
             roleName = rolePrefix + roleName;
         }