Author: sohil.shah(a)jboss.com Date: 2007-09-04 21:51:33 -0400 (Tue, 04 Sep 2007) New Revision: 8159 Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java Log: JBPORTAL-1499 - CMSAdminPortlet should use Users/Roles Module and not direct HQL query Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java 2007-09-04 22:24:54 UTC (rev 8158) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java 2007-09-05 01:51:33 UTC (rev 8159) @@ -37,7 +37,7 @@ import org.jboss.portal.identity.Role; import org.jboss.portal.identity.User; import org.jboss.portal.identity.AnonymousRole; -import org.jboss.portal.identity.ldap.LDAPUserModule; +import org.jboss.portal.identity.db.HibernateUserModuleImpl; import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.security.spi.provider.DomainConfigurator; @@ -342,7 +342,7 @@ userQuery.setCacheable(true); permissions.addAll(userQuery.list()); - if(!(this.userModule instanceof LDAPUserModule)) + if(this.userModule instanceof HibernateUserModuleImpl) { //in case of a database version, use the cache optmized way to lookup the permissions String lookupByRole = "SELECT p.* from jbp_cms_perm p,jbp_cms_perm_role r,jbp_role_membership m,jbp_roles roles,jbp_users users WHERE " +