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/

[oching]

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>