Author: julien(a)jboss.com Date: 2007-02-13 10:51:43 -0500 (Tue, 13 Feb 2007) New Revision: 6252 Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java trunk/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java trunk/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java trunk/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/security.xhtml Log: JBPORTAL-1207 : Management portlet shows the role name instead of the role displayname Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java 2007-02-13 15:16:40 UTC (rev 6251) +++ trunk/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java 2007-02-13 15:51:43 UTC (rev 6252) @@ -25,8 +25,12 @@ import org.jboss.portal.common.util.Tools; import org.jboss.portal.faces.el.PropertyAccessor; import org.jboss.portal.security.RoleSecurityBinding; +import org.jboss.portal.security.SecurityConstants; import org.jboss.portal.security.spi.provider.DomainConfigurator; import org.jboss.portal.security.spi.provider.SecurityConfigurationException; +import org.jboss.portal.identity.RoleModule; +import org.jboss.portal.identity.Role; +import org.jboss.portal.identity.IdentityException; import javax.faces.model.SelectItem; import java.util.HashMap; @@ -34,6 +38,9 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.Collections; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -42,11 +49,6 @@ public abstract class AbstractAuthorizationBean { - public DomainConfigurator getDomainConfigurator() - { - throw new UnsupportedOperationException("Implement me"); - } - public PropertyAccessor getForRole() { return new PropertyAccessor() @@ -126,13 +128,14 @@ } } - /** Return the roles. */ public String[] getRoles() { + SortedSet roleNames = new TreeSet(); + + // Get role names from URI String uri = getURI(); if (uri != null) { - Set roleNames = new HashSet(); Set constraints = getDomainConfigurator().getSecurityBindings(uri); if (constraints != null) { @@ -142,14 +145,54 @@ roleNames.add(binding.getRoleName()); } } - return (String[])roleNames.toArray(new String[roleNames.size()]); } - else + + // Get other roles from role module + try { - return null; + roleNames.add(SecurityConstants.UNCHECKED_ROLE_NAME); + for (Iterator i = getRoleModule().findRoles().iterator(); i.hasNext();) + { + Role role = (Role)i.next(); + roleNames.add(role.getName()); + } } + catch (IdentityException e) + { + e.printStackTrace(); + } + + // + return (String[])roleNames.toArray(new String[roleNames.size()]); } + public Map getRoleDisplayNameMap() + { + try + { + Map map = new HashMap(); + for (Iterator i = getRoleModule().findRoles().iterator();i.hasNext();) + { + Role role = (Role)i.next(); + String displayName = role.getDisplayName(); + if (displayName != null) + { + String name = role.getName(); + map.put(name, displayName); + } + } + return map; + } + catch (IdentityException e) + { + return Collections.EMPTY_MAP; + } + } + + public abstract RoleModule getRoleModule(); + + public abstract DomainConfigurator getDomainConfigurator(); + public abstract SelectItem[] getAvailableActions(); protected abstract String getURI(); Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java 2007-02-13 15:16:40 UTC (rev 6251) +++ trunk/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java 2007-02-13 15:51:43 UTC (rev 6252) @@ -440,29 +440,9 @@ } } - - public String[] getRoles() + public RoleModule getRoleModule() { - String[] roles = super.getRoles(); - if (roles != null) - { - try - { - Set tmp = Tools.toSet(roles); - tmp.add(SecurityConstants.UNCHECKED_ROLE_NAME); - for (Iterator i = getRoleModule().findRoles().iterator(); i.hasNext();) - { - Role role = (Role)i.next(); - tmp.add(role.getName()); - } - roles = (String[])tmp.toArray(new String[tmp.size()]); - } - catch (IdentityException e) - { - e.printStackTrace(); - } - } - return roles; + return roleModule; } public SelectItem[] getAvailableActions() Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-13 15:16:40 UTC (rev 6251) +++ trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-13 15:51:43 UTC (rev 6252) @@ -846,31 +846,6 @@ } } - - public String[] getRoles() - { - String[] roles = super.getRoles(); - if (roles != null) - { - try - { - Set tmp = Tools.toSet(roles); - tmp.add(SecurityConstants.UNCHECKED_ROLE_NAME); - for (Iterator i = getRoleModule().findRoles().iterator(); i.hasNext();) - { - Role role = (Role)i.next(); - tmp.add(role.getName()); - } - roles = (String[])tmp.toArray(new String[tmp.size()]); - } - catch (IdentityException e) - { - e.printStackTrace(); - } - } - return roles; - } - public SelectItem[] getAvailableActions() { return new SelectItem[]{ @@ -881,6 +856,11 @@ new SelectItem("dashboard"), }; } + + public RoleModule getRoleModule() + { + return roleModule; + } } public final class ThemeBean Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java 2007-02-13 15:16:40 UTC (rev 6251) +++ trunk/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java 2007-02-13 15:51:43 UTC (rev 6252) @@ -431,30 +431,16 @@ } } - public String[] getRoles() + public RoleModule getRoleModule() { - String[] roles = super.getRoles(); - if (roles != null) - { - try - { - Set tmp = Tools.toSet(roles); - tmp.add(SecurityConstants.UNCHECKED_ROLE_NAME); - for (Iterator i = getRoleModule().findRoles().iterator(); i.hasNext();) - { - Role role = (Role)i.next(); - tmp.add(role.getName()); - } - roles = (String[])tmp.toArray(new String[tmp.size()]); - } - catch (IdentityException e) - { - e.printStackTrace(); - } - } - return roles; + return roleModule; } + public DomainConfigurator getDomainConfigurator() + { + return PortletManagerBean.this.getDomainConfigurator(); + } + public SelectItem[] getAvailableActions() { return new SelectItem[]{ Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/security.xhtml =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/security.xhtml 2007-02-13 15:16:40 UTC (rev 6251) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/management/plugins/security.xhtml 2007-02-13 15:51:43 UTC (rev 6252) @@ -18,7 +18,7 @@ <f:facet name="header"> <h:outputText value="Role"/> </f:facet> - <h:outputText value="#{role == '__unchecked__' ? 'Unchecked' : role}"/> + <h:outputText value="#{role == '__unchecked__' ? 'Unchecked' : (auth.roleDisplayNameMap[role] != null ? auth.roleDisplayNameMap[role] : role)}"/> </h:column> <h:column id="actions_column">