Return-Path: 
 <archiva-commits-return-489-apmail-maven-archiva-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-archiva-commits-archive@locus.apache.org
Received: (qmail 7632 invoked from network); 21 Dec 2006 08:52:32 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 21 Dec 2006 08:52:32 -0000
Received: (qmail 9360 invoked by uid 500); 21 Dec 2006 08:52:40 -0000
Delivered-To: apmail-maven-archiva-commits-archive@maven.apache.org
Received: (qmail 9314 invoked by uid 500); 21 Dec 2006 08:52:39 -0000
Mailing-List: contact archiva-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:archiva-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:archiva-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:archiva-commits@maven.apache.org>
List-Id: <archiva-commits.maven.apache.org>
Reply-To: archiva-dev@maven.apache.org
Delivered-To: mailing list archiva-commits@maven.apache.org
Received: (qmail 9303 invoked by uid 99); 21 Dec 2006 08:52:39 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Dec 2006 00:52:39 -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, 21 Dec 2006 00:52:30 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9FEC21A981A; Thu, 21 Dec 2006 00:51:40 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r489289 - in /maven/archiva/trunk:
 archiva-security/src/main/java/org/apache/maven/archiva/security/
 archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/
Date: Thu, 21 Dec 2006 08:51:40 -0000
To: archiva-commits@maven.apache.org
From: oching@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061221085140.9FEC21A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: oching
Date: Thu Dec 21 00:51:39 2006
New Revision: 489289

URL: http://svn.apache.org/viewvc?view=rev&rev=489289
Log:
PR: MRM-260

Updated managedRepositories.jsp.
Added "archiva-edit-configuration" operation specific for archiva system admin only to disallow updating of the indexer for all users with repository manager roles.

Modified:
    maven/archiva/trunk/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java
    maven/archiva/trunk/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaSystemAdministratorRoleProfile.java
    maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
    maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/managedRepositories.jsp

Modified: maven/archiva/trunk/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java?view=diff&rev=489289&r1=489288&r2=489289
==============================================================================
--- maven/archiva/trunk/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java (original)
+++ maven/archiva/trunk/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java Thu Dec 21 00:51:39 2006
@@ -58,4 +58,6 @@
     public static final String OPERATION_EDIT_REPOSITORY = "archiva-edit-repository";
 
     public static final String OPERATION_REPOSITORY_UPLOAD = "archiva-upload-repository";
+
+    public static final String OPERATION_EDIT_CONFIGURATION = "archiva-edit-configuration";
 }

Modified: maven/archiva/trunk/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaSystemAdministratorRoleProfile.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaSystemAdministratorRoleProfile.java?view=diff&rev=489289&r1=489288&r2=489289
==============================================================================
--- maven/archiva/trunk/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaSystemAdministratorRoleProfile.java (original)
+++ maven/archiva/trunk/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaSystemAdministratorRoleProfile.java Thu Dec 21 00:51:39 2006
@@ -38,6 +38,7 @@
     {
         List operations = new ArrayList();
         operations.add( ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION );
+        operations.add( ArchivaRoleConstants.OPERATION_EDIT_CONFIGURATION );
         operations.add( ArchivaRoleConstants.OPERATION_MANAGE_USERS );
         operations.add( ArchivaRoleConstants.OPERATION_RUN_INDEXER );
         operations.add( ArchivaRoleConstants.OPERATION_REGENERATE_INDEX );

Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp?view=diff&rev=489289&r1=489288&r2=489289
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp Thu Dec 21 00:51:39 2006
@@ -32,7 +32,9 @@
 <div>
   <div style="float: right">
     <%-- TODO replace with icons --%>
+    <pss:ifAuthorized permission="archiva-edit-configuration" resource="*">
     <a href="<ww:url action="configure" />">Edit Configuration</a>
+    </pss:ifAuthorized>
   </div>
   <h2>Configuration</h2>
 </div>

Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/managedRepositories.jsp
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/managedRepositories.jsp?view=diff&rev=489289&r1=489288&r2=489289
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/managedRepositories.jsp (original)
+++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/managedRepositories.jsp Thu Dec 21 00:51:39 2006
@@ -48,6 +48,7 @@
   <strong>There are no managed repositories configured yet.</strong>
 </c:if>
 <c:forEach items="${repositories}" var="repository" varStatus="i">
+  <pss:ifAnyAuthorized permissions="archiva-edit-repository, archiva-delete-repository" resource="${repository.id}">
   <div>
     <div style="float: right">
       <ww:url id="editRepositoryUrl" action="editRepository" method="input">
@@ -57,8 +58,8 @@
         <ww:param name="repoId" value="%{'${repository.id}'}" />
       </ww:url>
       <%-- TODO replace with icons --%>
-      <pss:ifAuthorized permission="archiva-edit-repository" resource="${repository.id}"><ww:a href="%{editRepositoryUrl}">Edit Repository</ww:a></pss:ifAuthorized>
-      <pss:ifAuthorized permission="archiva-delete-repository" resource="${repository.id}"><ww:a href="%{deleteRepositoryUrl}">Delete Repository</ww:a></pss:ifAuthorized>
+      <ww:a href="%{editRepositoryUrl}">Edit Repository</ww:a>
+      <ww:a href="%{deleteRepositoryUrl}">Delete Repository</ww:a>
     </div>
     <h3>${repository.name}</h3>
     <table class="infoTable">
@@ -132,6 +133,7 @@
       </tr>
     </table>
   </div>
+  </pss:ifAnyAuthorized>
 </c:forEach>
 </div>