From continuum-commits-return-2683-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Tue Dec 12 08:58:07 2006 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 95247 invoked from network); 12 Dec 2006 08:58:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Dec 2006 08:58:07 -0000 Received: (qmail 81525 invoked by uid 500); 12 Dec 2006 08:58:15 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 81503 invoked by uid 500); 12 Dec 2006 08:58:15 -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 81485 invoked by uid 99); 12 Dec 2006 08:58:15 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Dec 2006 00:58:15 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Dec 2006 00:57:33 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id E6F271A981A; Tue, 12 Dec 2006 00:56:31 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r486063 - in /maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier: AbstractProjectNotifierEditAction.java AddProjectNotifierAction.java DeleteProjectNotifierAction.java Date: Tue, 12 Dec 2006 08:56:31 -0000 To: continuum-commits@maven.apache.org From: rinku@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061212085631.E6F271A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rinku Date: Tue Dec 12 00:56:31 2006 New Revision: 486063 URL: http://svn.apache.org/viewvc?view=rev&rev=486063 Log: o added projectGroupIds to project notifier actions. (Need to re-check this with Jesse, we might not need separate notifier hierarchies if PG id exists across all notifier actions) Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractProjectNotifierEditAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractProjectNotifierEditAction.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractProjectNotifierEditAction.java?view=diff&rev=486063&r1=486062&r2=486063 ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractProjectNotifierEditAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractProjectNotifierEditAction.java Tue Dec 12 00:56:31 2006 @@ -18,6 +18,7 @@ import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.model.project.ProjectGroup; import org.apache.maven.continuum.model.project.ProjectNotifier; /** @@ -32,6 +33,11 @@ * Identifier for the {@link Project} who's {@link ProjectNotifier} is being edited. */ private int projectId; + + /** + * Identifier for the {@link ProjectGroup} instance that the current {@link Project} is a member of. + */ + private int projectGroupId; /** * Save the notifier for the {@link Project} here.

@@ -81,6 +87,26 @@ public void setProjectId( int projectId ) { this.projectId = projectId; + } + + /** + * Returns the identifier for the {@link ProjectGroup} that the + * {@link Project} is a member of. + * @return the projectGroupId + */ + public int getProjectGroupId() + { + return projectGroupId; + } + + /** + * Sets the identifier for the {@link ProjectGroup} that the + * {@link Project} is a member of. + * @param projectGroupId the identifier to set + */ + public void setProjectGroupId( int projectGroupId ) + { + this.projectGroupId = projectGroupId; } } Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java?view=diff&rev=486063&r1=486062&r2=486063 ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java Tue Dec 12 00:56:31 2006 @@ -1,6 +1,7 @@ package org.apache.maven.continuum.web.action.notifier; import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.model.project.ProjectGroup; import org.apache.maven.continuum.model.project.ProjectNotifier; import org.apache.maven.continuum.web.action.ContinuumActionSupport; @@ -38,6 +39,11 @@ * Identifier for the {@link Project} instance. */ private int projectId; + + /** + * Identifier for the {@link ProjectGroup} instance that the current {@link Project} is a member of. + */ + private int projectGroupId; /** * Type for a {@link ProjectNotifier}. @@ -102,4 +108,24 @@ this.projectId = projectId; } + /** + * Returns the identifier for the {@link ProjectGroup} that the + * {@link Project} is a member of. + * @return the projectGroupId + */ + public int getProjectGroupId() + { + return projectGroupId; + } + + /** + * Sets the identifier for the {@link ProjectGroup} that the + * {@link Project} is a member of. + * @param projectGroupId the identifier to set + */ + public void setProjectGroupId( int projectGroupId ) + { + this.projectGroupId = projectGroupId; + } + } Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java?view=diff&rev=486063&r1=486062&r2=486063 ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java Tue Dec 12 00:56:31 2006 @@ -17,33 +17,34 @@ */ import org.apache.maven.continuum.ContinuumException; +import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.model.project.ProjectGroup; import org.apache.maven.continuum.model.project.ProjectNotifier; import org.apache.maven.continuum.web.action.ContinuumActionSupport; /** - * Action that deletes a {@link ProjectNotifier} of type 'IRC' from the - * specified {@link ProjectGroup}. + * Action that deletes a {@link ProjectNotifier} of type 'IRC' from the specified {@link ProjectGroup}. * * @author Emmanuel Venisse * @version $Id: DeleteNotifierAction.java 467122 2006-10-23 20:50:19Z jmcconnell $ - * - * @plexus.component - * role="com.opensymphony.xwork.Action" - * role-hint="deleteProjectNotifier" + * + * @plexus.component role="com.opensymphony.xwork.Action" role-hint="deleteProjectNotifier" */ -public class DeleteProjectNotifierAction - extends ContinuumActionSupport +public class DeleteProjectNotifierAction extends ContinuumActionSupport { private int projectId; + /** + * Identifier for the {@link ProjectGroup} that the current {@link Project} is a member of. + */ + private int projectGroupId; + private int notifierId; private String notifierType; - public String execute() - throws ContinuumException + public String execute() throws ContinuumException { getContinuum().removeNotifier( projectId, notifierId ); return SUCCESS; @@ -82,6 +83,16 @@ public String getNotifierType() { return notifierType; + } + + public int getProjectGroupId() + { + return projectGroupId; + } + + public void setProjectGroupId( int projectGroupId ) + { + this.projectGroupId = projectGroupId; } }