continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r698727 - in /continuum/trunk: ./ continuum-docs/src/site/xdoc/ continuum-security/src/main/resources/META-INF/redback/ continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ continuum-webapp/src/main/webapp/WEB-INF/jsp/
Date Wed, 24 Sep 2008 20:49:17 GMT
Author: olamy
Date: Wed Sep 24 13:49:17 2008
New Revision: 698727

URL: http://svn.apache.org/viewvc?rev=698727&view=rev
Log:
merge -r698448:698533 from 1.2.x branch
fixes : [CONTINUUM-1865] [CONTINUUM-1879] 


Modified:
    continuum/trunk/   (props changed)
    continuum/trunk/continuum-docs/src/site/xdoc/   (props changed)
    continuum/trunk/continuum-security/src/main/resources/META-INF/redback/redback.xml
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp

Propchange: continuum/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 24 13:49:17 2008
@@ -1 +1 @@
-/continuum/branches/continuum-1.2.x:690684,690689-690799
+/continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533

Propchange: continuum/trunk/continuum-docs/src/site/xdoc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 24 13:49:17 2008
@@ -1 +1,2 @@
+/continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533
 /continuum/trunk/continuum-docs/src/site/xdoc:690494-690520

Modified: continuum/trunk/continuum-security/src/main/resources/META-INF/redback/redback.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-security/src/main/resources/META-INF/redback/redback.xml?rev=698727&r1=698726&r2=698727&view=diff
==============================================================================
--- continuum/trunk/continuum-security/src/main/resources/META-INF/redback/redback.xml (original)
+++ continuum/trunk/continuum-security/src/main/resources/META-INF/redback/redback.xml Wed
Sep 24 13:49:17 2008
@@ -408,18 +408,6 @@
   		          <operation>user-management-role-grant</operation>
   		          <resource>${resource}</resource>
   		        </permission>
-  		        <permission>
-  		          <id>continuum-manage-repositories</id>
-  		          <name>Manage Continuum Local Repositories</name>
-  		          <operation>continuum-manage-repositories</operation>
-  		          <resource>global</resource>
-  		        </permission>
-  		        <permission>
-  		          <id>continuum-manage-purging</id>
-  		          <name>Manage Continuum Purging</name>
-  		          <operation>continuum-manage-purging</operation>
-  		          <resource>global</resource>
-  		        </permission>
   		  	  </permissions>
   		  	  <childTemplates>
   		  	  	<childTemplate>project-developer</childTemplate>

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java?rev=698727&r1=698726&r2=698727&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
Wed Sep 24 13:49:17 2008
@@ -478,6 +478,12 @@
         checkAuthorization( ContinuumRoleConstants.CONTINUUM_MANAGE_QUEUES );
     }
     
+    protected void checkManageLocalRepositoriesAuthorization()
+        throws AuthorizationRequiredException
+    {   
+        checkAuthorization( ContinuumRoleConstants.CONTINUUM_MANAGE_REPOSITORIES );
+    }
+    
     /**
      * Get the security session
      *

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=698727&r1=698726&r2=698727&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
Wed Sep 24 13:49:17 2008
@@ -28,6 +28,7 @@
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.web.bean.ProjectGroupUserBean;
+import org.apache.maven.continuum.web.exception.AuthenticationRequiredException;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.codehaus.plexus.redback.rbac.RBACManager;
 import org.codehaus.plexus.redback.rbac.RbacManagerException;
@@ -122,6 +123,8 @@
 
     private List<LocalRepository> repositories;
 
+    private boolean disabledRepositories = true;
+
     public String summary()
         throws ContinuumException
     {
@@ -306,6 +309,16 @@
             return REQUIRES_AUTHORIZATION;
         }
 
+        try
+        {
+            checkManageLocalRepositoriesAuthorization();
+            disabledRepositories = false;
+        }
+        catch ( AuthorizationRequiredException authzE )
+        {
+            // do nothing
+        }
+
         projectGroup = getContinuum().getProjectGroupWithProjects( projectGroupId );
 
         name = projectGroup.getName();
@@ -950,4 +963,14 @@
     {
         this.repositories = repositories;
     }
+
+    public boolean isDisabledRepositories()
+    {
+        return disabledRepositories;
+    }
+
+    public void setDisabledRepositories( boolean disabledRepositories )
+    {
+        this.disabledRepositories = disabledRepositories;
+    }
 }

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp?rev=698727&r1=698726&r2=698727&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp Wed
Sep 24 13:49:17 2008
@@ -51,7 +51,7 @@
                 <c1:data label="%{getText('projectGroup.groupId.label')}" name="projectGroup.groupId"/>
                 <ww:textfield label="%{getText('projectGroup.description.label')}" name="description"
disabled="%{projectInCOQueue}"/>
                 <ww:select label="%{getText('projectGroup.repository.label')}" name="repositoryId"
list="repositories" 
-                           listKey="id" listValue="name"/> 
+                           listKey="id" listValue="name" disabled="%{disabledRepositories}"/>

               </tbody>
             </table>
             



Mime
View raw message