Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 4047 invoked from network); 27 Sep 2006 06:55:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Sep 2006 06:55:37 -0000 Received: (qmail 9748 invoked by uid 500); 27 Sep 2006 06:55:37 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 9731 invoked by uid 500); 27 Sep 2006 06:55:36 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 9718 invoked by uid 99); 27 Sep 2006 06:55:36 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Sep 2006 23:55:36 -0700 Authentication-Results: idunn.apache.osuosl.org smtp.mail=jmcconnell@apache.org; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 140.211.166.113 cause and error) Received: from [140.211.166.113] ([140.211.166.113:54118] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 24/21-22892-6602A154 for ; Tue, 26 Sep 2006 23:55:35 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B99141A981F; Tue, 26 Sep 2006 23:55:32 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r450353 - in /maven/continuum/branches/rbac-integration: continuum-core/src/main/java/org/apache/maven/continuum/core/action/ continuum-core/src/main/resources/META-INF/plexus/ continuum-webapp/src/main/webapp/ continuum-webapp/src/main/web... Date: Wed, 27 Sep 2006 06:55:32 -0000 To: continuum-commits@maven.apache.org From: jmcconnell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060927065532.B99141A981F@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jmcconnell Date: Tue Sep 26 23:55:31 2006 New Revision: 450353 URL: http://svn.apache.org/viewvc?view=rev&rev=450353 Log: switched the resource that project group permissions are bound with from the project group id to the project group name and have sample usage working on the project group summary page Modified: maven/continuum/branches/rbac-integration/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java maven/continuum/branches/rbac-integration/continuum-core/src/main/resources/META-INF/plexus/components.xml maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/projectGroupSummary.jsp Modified: maven/continuum/branches/rbac-integration/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java?view=diff&rev=450353&r1=450352&r2=450353 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java (original) +++ maven/continuum/branches/rbac-integration/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java Tue Sep 26 23:55:31 2006 @@ -1,7 +1,9 @@ package org.apache.maven.continuum.core.action; import org.apache.maven.continuum.ContinuumException; +import org.apache.maven.continuum.model.project.ProjectGroup; import org.apache.maven.continuum.store.ContinuumStoreException; +import org.apache.maven.continuum.store.ContinuumStore; import org.codehaus.plexus.rbac.profile.RoleProfileException; import org.codehaus.plexus.rbac.profile.RoleProfileManager; import org.codehaus.plexus.security.rbac.Role; @@ -36,7 +38,7 @@ public class AddAssignableRolesAction extends AbstractContinuumAction { -// private ContinuumStore store; + private ContinuumStore store; private RoleProfileManager roleManager; @@ -45,19 +47,19 @@ { int projectGroupId = getProjectGroupId( context ); - // ProjectGroup projectGroup = store.getProjectGroupWithBuildDetails( projectGroupId ); + ProjectGroup projectGroup = store.getProjectGroupWithBuildDetails( projectGroupId ); //todo make the resource the name of the project group and hide the id from the user try { - Role developer = roleManager.getDynamicRole( "continuum-group-developer", "" + projectGroupId ); + Role developer = roleManager.getDynamicRole( "continuum-group-developer", projectGroup.getName() ); - Role user = roleManager.getDynamicRole( "continuum-group-user", "" + projectGroupId ); + Role user = roleManager.getDynamicRole( "continuum-group-user", projectGroup.getName() ); } catch ( RoleProfileException rpe ) { - throw new ContinuumException( "error generating dynamic role for project " + projectGroupId ); + throw new ContinuumException( "error generating dynamic role for project " + projectGroup.getName() ); } } } Modified: maven/continuum/branches/rbac-integration/continuum-core/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-core/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=450353&r1=450352&r2=450353 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-core/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/continuum/branches/rbac-integration/continuum-core/src/main/resources/META-INF/plexus/components.xml Tue Sep 26 23:55:31 2006 @@ -567,11 +567,9 @@ add-assignable-roles org.apache.maven.continuum.core.action.AddAssignableRolesAction - org.codehaus.plexus.rbac.profile.RoleProfileManager continuum Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp?view=diff&rev=450353&r1=450352&r2=450353 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp (original) +++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/components/buildDefinitionGroupSummaryComponent.jsp Tue Sep 26 23:55:31 2006 @@ -2,6 +2,8 @@ <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %> <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> <%@ taglib uri="continuum" prefix="c1" %> +<%@ taglib uri="/plexusSecuritySystem" prefix="pss" %> +

Group Build Definitions

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/projectGroupSummary.jsp URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/projectGroupSummary.jsp?view=diff&rev=450353&r1=450352&r2=450353 ============================================================================== --- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/projectGroupSummary.jsp (original) +++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/projectGroupSummary.jsp Tue Sep 26 23:55:31 2006 @@ -27,17 +27,17 @@ - +

Project Group Actions

- + Build - +