continuum-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Emmanuel Venisse" <emmanuel.veni...@gmail.com>
Subject Re: svn commit: r698533 - in /continuum/branches/continuum-1.2.x/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ webapp/WEB-INF/jsp/
Date Wed, 24 Sep 2008 12:28:06 GMT
I think it would be better to merge each commit so we won't miss some commit
in a global merge.
Emmanuel

On Wed, Sep 24, 2008 at 2:16 PM, Olivier Lamy <olamy@apache.org> wrote:

> Hi,
> Just to be sure : do we merge at the end the full branch (1.2.1
> release) or do we merge each commit ?
>
> Thanks,
> --
> Olivier
>
> 2008/9/24  <ctan@apache.org>:
> > Author: ctan
> > Date: Wed Sep 24 05:08:58 2008
> > New Revision: 698533
> >
> > URL: http://svn.apache.org/viewvc?rev=698533&view=rev
> > Log:
> > [CONTINUUM-1879] only allow system administrator to change local
> repository of project group
> >
> > Modified:
> >
>  continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
> >
>  continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
> >
>  continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
> >
> > Modified:
> continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
> > URL:
> http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java?rev=698533&r1=698532&r2=698533&view=diff
> >
> ==============================================================================
> > ---
> continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
> (original)
> > +++
> continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
> Wed Sep 24 05:08:58 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/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
> > URL:
> http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=698533&r1=698532&r2=698533&view=diff
> >
> ==============================================================================
> > ---
> continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
> (original)
> > +++
> continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
> Wed Sep 24 05:08:58 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/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
> > URL:
> http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp?rev=698533&r1=698532&r2=698533&view=diff
> >
> ==============================================================================
> > ---
> continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
> (original)
> > +++
> continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
> Wed Sep 24 05:08:58 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
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message