Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 13578 invoked from network); 30 Aug 2006 20:51:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 Aug 2006 20:51:25 -0000 Received: (qmail 77738 invoked by uid 500); 30 Aug 2006 20:51:25 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 77708 invoked by uid 500); 30 Aug 2006 20:51:25 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 77688 invoked by uid 99); 30 Aug 2006 20:51:25 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Aug 2006 13:51:25 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Aug 2006 13:51:21 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B06841A981A; Wed, 30 Aug 2006 13:51:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r438619 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ resources/ webapp/ Date: Wed, 30 Aug 2006 20:51:00 -0000 To: continuum-commits@maven.apache.org From: jmcconnell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060830205101.B06841A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jmcconnell Date: Wed Aug 30 13:50:59 2006 New Revision: 438619 URL: http://svn.apache.org/viewvc?rev=438619&view=rev Log: added confirm step to project group removal Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/confirmGroupRemoval.jsp (with props) Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java?rev=438619&r1=438618&r2=438619&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java Wed Aug 30 13:50:59 2006 @@ -31,6 +31,8 @@ extends PlexusActionSupport implements Preparable { + public static final String CONFIRM = "confirm"; + /** * @plexus.requirement */ Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=438619&r1=438618&r2=438619&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Wed Aug 30 13:50:59 2006 @@ -39,63 +39,57 @@ private boolean confirmed; public String summary() + throws ContinuumException { - try - { - projectGroup = getContinuum().getProjectGroup( projectGroupId ); - } - catch ( ContinuumException e) - { - addActionError( "unable to retrieve project group" ); - return ERROR; - } + projectGroup = getContinuum().getProjectGroup( projectGroupId ); return SUCCESS; } public String members() + throws ContinuumException { return summary(); } public String buildDefinitions() + throws ContinuumException { return summary(); } public String notifiers() + throws ContinuumException + { + return summary(); + } + + public String confirm() + throws ContinuumException { return summary(); } public String remove() + throws ContinuumException { //todo add confirm page like removing build definition - try + if ( confirmed ) { getContinuum().removeProjectGroup( projectGroupId ); } - catch ( ContinuumException e ) + else { - addActionError( "unable to remove project group" ); - return ERROR; + return CONFIRM; } return SUCCESS; } public String build() + throws ContinuumException { - try - { - getContinuum().buildProjectGroup( projectGroupId ); - } - catch ( ContinuumException e ) - { - addActionError( "unable to initiate build of project group" ); - getLogger().warn( "unable to initiate build of project group " + projectGroupId ); - return ERROR; - } + getContinuum().buildProjectGroup( projectGroupId ); return SUCCESS; } Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=438619&r1=438618&r2=438619&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original) +++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Wed Aug 30 13:50:59 2006 @@ -202,7 +202,12 @@ + confirmGroupRemoval groupSummary + + + + confirmGroupRemoval.jsp