From continuum-commits-return-1777-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Tue Jul 11 22:00:53 2006 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 88744 invoked from network); 11 Jul 2006 22:00:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Jul 2006 22:00:53 -0000 Received: (qmail 10835 invoked by uid 500); 11 Jul 2006 22:00:53 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 10809 invoked by uid 500); 11 Jul 2006 22:00:52 -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 10798 invoked by uid 99); 11 Jul 2006 22:00:52 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jul 2006 15:00:52 -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; Tue, 11 Jul 2006 15:00:52 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E2BA71A981A; Tue, 11 Jul 2006 15:00:31 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r421005 - in /maven/continuum/branches/continuum-acegi: continuum-core/src/main/java/org/apache/maven/continuum/initialization/ continuum-security/continuum-security-acegi/src/main/java/org/apache/maven/continuum/security/acegi/ continuum-w... Date: Tue, 11 Jul 2006 22:00:30 -0000 To: continuum-commits@maven.apache.org From: carlos@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060711220031.E2BA71A981A@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: carlos Date: Tue Jul 11 15:00:29 2006 New Revision: 421005 URL: http://svn.apache.org/viewvc?rev=421005&view=rev Log: Use previous continuum permission names as roles Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java maven/continuum/branches/continuum-acegi/continuum-security/continuum-security-acegi/src/main/java/org/apache/maven/continuum/security/acegi/ContinuumUserDetailsService.java maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-application.xml maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/Menu.jsp Modified: maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java?rev=421005&r1=421004&r2=421005&view=diff ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java (original) +++ maven/continuum/branches/continuum-acegi/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java Tue Jul 11 15:00:29 2006 @@ -163,9 +163,7 @@ createPermission( "manageUsers", "Manage Users/Groups" ); - createPermission( "ROLE_USER", "Authenticated User" ); - - createPermission( "ROLE_ADMIN", "Administrator" ); + createPermission( "user", "Authenticated User" ); } private Permission createPermission( String name, String description ) Modified: maven/continuum/branches/continuum-acegi/continuum-security/continuum-security-acegi/src/main/java/org/apache/maven/continuum/security/acegi/ContinuumUserDetailsService.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-security/continuum-security-acegi/src/main/java/org/apache/maven/continuum/security/acegi/ContinuumUserDetailsService.java?rev=421005&r1=421004&r2=421005&view=diff ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-security/continuum-security-acegi/src/main/java/org/apache/maven/continuum/security/acegi/ContinuumUserDetailsService.java (original) +++ maven/continuum/branches/continuum-acegi/continuum-security/continuum-security-acegi/src/main/java/org/apache/maven/continuum/security/acegi/ContinuumUserDetailsService.java Tue Jul 11 15:00:29 2006 @@ -102,7 +102,7 @@ while ( it.hasNext() ) { Permission permission = (Permission) it.next(); - grantedAuthorities[i] = new GrantedAuthorityImpl( permission.getName() ); + grantedAuthorities[i] = new GrantedAuthorityImpl( "ROLE_" + permission.getName() ); i++; } String username = user.getUsername(); Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-application.xml URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-application.xml?rev=421005&r1=421004&r2=421005&view=diff ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-application.xml (original) +++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/plexus-application.xml Tue Jul 11 15:00:29 2006 @@ -447,25 +447,25 @@ /secure/** - ROLE_ADMIN + ROLE_user /add*project* - ROLE_ADMIN + ROLE_addProject /schedules* - ROLE_ADMIN + ROLE_manageSchedule /configuration* - ROLE_ADMIN + ROLE_manageConfiguration Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/Menu.jsp URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/Menu.jsp?rev=421005&r1=421004&r2=421005&view=diff ============================================================================== --- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/Menu.jsp (original) +++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/navigations/Menu.jsp Tue Jul 11 15:00:29 2006 @@ -15,7 +15,7 @@ - +
@@ -35,16 +35,20 @@
- +
-
- "> -
-
- "> -
+ +
+ "> +
+ + +
+ "> +
+