Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 90205 invoked from network); 15 Feb 2007 21:30:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Feb 2007 21:30:43 -0000 Received: (qmail 9143 invoked by uid 500); 15 Feb 2007 21:30:49 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 9102 invoked by uid 500); 15 Feb 2007 21:30:49 -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 9059 invoked by uid 99); 15 Feb 2007 21:30:48 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Feb 2007 13:30:48 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Feb 2007 13:30:39 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 2702E1A981C; Thu, 15 Feb 2007 13:30:19 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r508164 - in /maven/continuum/trunk: continuum-core/src/main/java/org/apache/maven/continuum/core/action/ continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/ Date: Thu, 15 Feb 2007 21:30:18 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070215213019.2702E1A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Thu Feb 15 13:30:18 2007 New Revision: 508164 URL: http://svn.apache.org/viewvc?view=rev&rev=508164 Log: o [CONTINUUM-1161] Add missing Default Project Group Administrator o Remove project group administrator when the project group is removed Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java?view=diff&rev=508164&r1=508163&r2=508164 ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java Thu Feb 15 13:30:18 2007 @@ -54,7 +54,7 @@ { int projectGroupId = getProjectGroupId( context ); - ProjectGroup projectGroup = store.getProjectGroupWithBuildDetails( projectGroupId ); + ProjectGroup projectGroup = store.getProjectGroup( projectGroupId ); // TODO: make the resource the name of the project group and hide the id from the user Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java?view=diff&rev=508164&r1=508163&r2=508164 ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java Thu Feb 15 13:30:18 2007 @@ -57,6 +57,8 @@ try { + roleManager.deleteDynamicRole( "continuum-group-project-administrator", projectGroup.getName() ); + roleManager.deleteDynamicRole( "continuum-group-developer", projectGroup.getName() ); roleManager.deleteDynamicRole( "continuum-group-user", projectGroup.getName() ); Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java?view=diff&rev=508164&r1=508163&r2=508164 ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java Thu Feb 15 13:30:18 2007 @@ -70,6 +70,8 @@ ProjectGroup group = (ProjectGroup) i.next(); // gets the role, making it if it doesn't exist + //TODO: use continuum.executeAction( "add-assignable-roles", context ); or something like that to avoid code duplication + continuumRoleManager.getDynamicRole( "continuum-group-project-administrator", group.getName() ); continuumRoleManager.getDynamicRole( "continuum-group-user", group.getName() ); continuumRoleManager.getDynamicRole( "continuum-group-developer", group.getName() );