From dev-return-7431-apmail-continuum-dev-archive=continuum.apache.org@continuum.apache.org Wed Sep 24 12:28:37 2008 Return-Path: Delivered-To: apmail-continuum-dev-archive@www.apache.org Received: (qmail 46214 invoked from network); 24 Sep 2008 12:28:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Sep 2008 12:28:36 -0000 Received: (qmail 34154 invoked by uid 500); 24 Sep 2008 12:28:34 -0000 Delivered-To: apmail-continuum-dev-archive@continuum.apache.org Received: (qmail 34115 invoked by uid 500); 24 Sep 2008 12:28:33 -0000 Mailing-List: contact dev-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list dev@continuum.apache.org Received: (qmail 34103 invoked by uid 99); 24 Sep 2008 12:28:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Sep 2008 05:28:33 -0700 X-ASF-Spam-Status: No, hits=2.0 required=10.0 tests=HTML_MESSAGE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of emmanuel.venisse@gmail.com designates 72.14.220.155 as permitted sender) Received: from [72.14.220.155] (HELO fg-out-1718.google.com) (72.14.220.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Sep 2008 12:27:35 +0000 Received: by fg-out-1718.google.com with SMTP id l26so2153767fgb.26 for ; Wed, 24 Sep 2008 05:28:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:in-reply-to:mime-version:content-type:references; bh=5u72ewPcvoXWmDl6GyAxE+5yKrlFwSZJ5B736BI40PQ=; b=qyp/IYIeAPdg4HiYF1zSZkVwjs6YmSRKt7K1YCtpJli+DX9FZ8Tpnp6+1Apko41hA7 mtIb/14jEk/NoSO+p9HXrjbbyhDiRys5hvFOXR9Y0UTBTTOO4Mfo+WuUgtx2lAlGia2K T+GLjLv+68Z7atuPUHvgCYAqtamlAtVUbHN3M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:in-reply-to:mime-version :content-type:references; b=qCDjx/L1ftQ5KfpbafUjtU/mIPNe0ZmZkt/jmQwyr8Iu6iM9b+j5/NgIwwIvUAsYT2 gEHaGFoxEN1WgEalFubK31cj+ECCuNYiPmAgpKapFHO99Ra08Liu5jG4f5j04qpsuab1 J/n4K5Yzc8Zsx5VPQG5NN+hLT74EtvOUmPgW4= Received: by 10.187.230.4 with SMTP id h4mr1236153far.12.1222259286631; Wed, 24 Sep 2008 05:28:06 -0700 (PDT) Received: by 10.187.247.20 with HTTP; Wed, 24 Sep 2008 05:28:06 -0700 (PDT) Message-ID: Date: Wed, 24 Sep 2008 14:28:06 +0200 From: "Emmanuel Venisse" To: dev@continuum.apache.org 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/ In-Reply-To: <9948cb690809240516q7462c19asddf2dc4074d11c33@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_38728_9748652.1222259286628" References: <20080924120858.D84FE238896D@eris.apache.org> <9948cb690809240516q7462c19asddf2dc4074d11c33@mail.gmail.com> X-Virus-Checked: Checked by ClamAV on apache.org ------=_Part_38728_9748652.1222259286628 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline 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 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 : > > 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 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 @@ > > name="projectGroup.groupId"/> > > label="%{getText('projectGroup.description.label')}" name="description" > disabled="%{projectInCOQueue}"/> > > label="%{getText('projectGroup.repository.label')}" name="repositoryId" > list="repositories" > > - listKey="id" listValue="name"/> > > + listKey="id" listValue="name" > disabled="%{disabledRepositories}"/> > > > > > > > > > > > > > ------=_Part_38728_9748652.1222259286628--