Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 87681 invoked from network); 8 Jun 2006 17:18:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Jun 2006 17:18:39 -0000 Received: (qmail 38929 invoked by uid 500); 8 Jun 2006 17:18:32 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 38857 invoked by uid 500); 8 Jun 2006 17:18:31 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 38818 invoked by uid 99); 8 Jun 2006 17:18:31 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2006 10:18:31 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2006 10:18:31 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id CA8181A9842; Thu, 8 Jun 2006 10:18:10 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r412805 - in /portals/jetspeed-2/trunk/applications/j2-admin/src: java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java webapp/WEB-INF/security/permissions/view.vm Date: Thu, 08 Jun 2006 17:18:10 -0000 To: jetspeed-dev@portals.apache.org From: taylor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060608171810.CA8181A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: taylor Date: Thu Jun 8 10:18:09 2006 New Revision: 412805 URL: http://svn.apache.org/viewvc?rev=412805&view=rev Log: provide roles Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java?rev=412805&r1=412804&r2=412805&view=diff ============================================================================== --- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java (original) +++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java Thu Jun 8 10:18:09 2006 @@ -34,6 +34,7 @@ import org.apache.jetspeed.CommonPortletServices; import org.apache.jetspeed.security.PermissionManager; import org.apache.jetspeed.security.om.InternalPermission; +import org.apache.jetspeed.security.om.InternalPrincipal; import org.apache.portals.gems.dojo.AbstractDojoVelocityPortlet; import org.apache.velocity.context.Context; @@ -108,24 +109,24 @@ Iterator all = pm.getPermissions(); while (all.hasNext()) { - InternalPermission permission = (InternalPermission)all.next(); + InternalPermission permission = (InternalPermission)all.next(); if (permission.getClassname().equals(CLASSNAMES[0])) { - folders.add(permission); + folders.add(new PermissionData(permission)); } else if (permission.getClassname().equals(CLASSNAMES[1])) { - pages.add(permission); + pages.add(new PermissionData(permission)); } else if (permission.getClassname().equals(CLASSNAMES[2])) { - portlets.add(permission); - } - folderPermissions = folders.iterator(); - pagePermissions = pages.iterator(); - portletPermissions = portlets.iterator(); - } - } + portlets.add(new PermissionData(permission)); + } + } + folderPermissions = folders.iterator(); + pagePermissions = pages.iterator(); + portletPermissions = portlets.iterator(); + } context.put("folderPermissions", folderPermissions); context.put("pagePermissions", pagePermissions); context.put("portletPermissions", portletPermissions); @@ -138,4 +139,55 @@ //session.setAttribute(SESSION_RESULTS, stats); } + public class PermissionData + { + public PermissionData(InternalPermission permission) + { + this.permission = permission; + this.roles = ""; + int size = permission.getPrincipals().size(); + if (size == 0) + { + return; + } + Iterator principals = permission.getPrincipals().iterator(); + int count = 0; + StringBuffer result = new StringBuffer(); + while (principals.hasNext()) + { + InternalPrincipal principal = (InternalPrincipal)principals.next(); + int last = principal.getFullPath().lastIndexOf("/") + 1; + result.append(principal.getFullPath().substring(last)); + count++; + if (count < size) + { + result.append(","); + } + } + this.roles = result.toString(); + } + + InternalPermission permission; + String roles; + + public InternalPermission getPermission() + { + return permission; + } + + public void setPermission(InternalPermission permission) + { + this.permission = permission; + } + + public String getRoles() + { + return roles; + } + + public void setRoles(String roles) + { + this.roles = roles; + } + } } Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm?rev=412805&r1=412804&r2=412805&view=diff ============================================================================== --- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm (original) +++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm Thu Jun 8 10:18:09 2006 @@ -80,11 +80,12 @@ Resource Actions + Roles -#foreach($permission in $portletPermissions) -$permission.Name$permission.Actions +#foreach($p in $portletPermissions) +$p.Permission.Name$p.Permission.Actions$p.Roles #end @@ -95,11 +96,12 @@ Resource Actions + Roles -#foreach($permission in $folderPermissions) -$permission.Name$permission.Actions +#foreach($p in $folderPermissions) +$p.Permission.Name$p.Permission.Actions$p.Roles #end @@ -110,11 +112,12 @@ Resource Actions + Roles -#foreach($permission in $pagePermissions) -$permission.Name$permission.Actions +#foreach($p in $pagePermissions) +$p.Permission.Name$p.Permission.Actions$p.Roles #end @@ -147,6 +150,8 @@ function processTableRowEvent(e, tableName) { alert( tableName + ", " + e.currentTarget.cells.item(0).innerHTML ); + alert( tableName + ", " + e.currentTarget.cells.item(1).innerHTML ); + alert( tableName + ", " + e.currentTarget.cells.item(2).innerHTML ); } function addTableRowSelectListener() { --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org