[jboss-svn-commits] JBL Code SVN: r6163 - labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security

[jboss-svn-commits at lists.jboss.org]

Author: unibrew
Date: 2006-09-11 18:35:17 -0400 (Mon, 11 Sep 2006)
New Revision: 6163

Modified:
   labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/AuthorizationProvider.java
   labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/JBossPortalUtil.java
Log:
[JBFORUMS-105] Solving migration issues inside JAAE plugin caused by JBPortal 2.4 changes.

Modified: labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/AuthorizationProvider.java
===================================================================
--- labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/AuthorizationProvider.java	2006-09-11 22:34:01 UTC (rev 6162)
+++ labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/AuthorizationProvider.java	2006-09-11 22:35:17 UTC (rev 6163)
@@ -60,7 +60,7 @@
 	        //setup the engine identity based on identity provided in the security context
             if(context.getIdentity()!=null)
             {
-                User user = User.getUser(((org.jboss.portal.core.model.User)context.getIdentity()).getUserName());
+                User user = User.getUser(((org.jboss.portal.identity.User)context.getIdentity()).getUserName());
                 JBossPortalUtil.populateRoles(user);
                 UserThreadLocal.setUser(user);
             }

Modified: labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/JBossPortalUtil.java
===================================================================
--- labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/JBossPortalUtil.java	2006-09-11 22:34:01 UTC (rev 6162)
+++ labs/jbossforums/trunk/authz-jaae-plugin/src/main/org/jboss/forums/security/JBossPortalUtil.java	2006-09-11 22:35:17 UTC (rev 6163)
@@ -18,8 +18,8 @@
  * TODO: (migration marker)
  *       (jbportal2.0 - jbportal2.2.1rc1) - done
  */
-import org.jboss.portal.core.modules.RoleModule;
-import org.jboss.portal.core.modules.UserModule;
+import org.jboss.portal.identity.RoleModule;
+import org.jboss.portal.identity.UserModule;
 
 
 /**
@@ -83,13 +83,13 @@
             
             //grab the roles for this user
             String username = user.getIdentity().getUserName();            
-            org.jboss.portal.core.model.User portalUser = userModule.findUserByUserName(username);
-            Set roles = portalUser.getRoleNames();
+            org.jboss.portal.identity.User portalUser = userModule.findUserByUserName(username);
+            Set roles = getRoleModule().getRoles(portalUser);
             if(!Util.isEmpty(roles))
             {
                 for(Iterator itr=roles.iterator();itr.hasNext();)
                 {
-                    String roleName = (String)itr.next();
+                    String roleName = ((org.jboss.portal.identity.Role)itr.next()).getName();
                     Role role = new Role(roleName,roleName);
                     user.getRoles().add(role);
                 }