From commits-return-5442-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org Mon Jun 01 16:31:42 2009 Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 97305 invoked from network); 1 Jun 2009 16:31:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Jun 2009 16:31:42 -0000 Received: (qmail 56367 invoked by uid 500); 1 Jun 2009 16:31:54 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 56322 invoked by uid 500); 1 Jun 2009 16:31:54 -0000 Mailing-List: contact commits-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 commits@continuum.apache.org Received: (qmail 56313 invoked by uid 99); 1 Jun 2009 16:31:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 16:31:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 16:31:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 064BD2388868; Mon, 1 Jun 2009 16:31:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780709 - in /continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache: continuum/web/action/admin/PurgeConfigurationAction.java maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java Date: Mon, 01 Jun 2009 16:31:31 -0000 To: commits@continuum.apache.org From: jmorales@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090601163132.064BD2388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jmorales Date: Mon Jun 1 16:31:31 2009 New Revision: 780709 URL: http://svn.apache.org/viewvc?rev=780709&view=rev Log: [CONTINUUM-2195] [CONTINUUM-2236] .Scheduler is updated when update or add a purgeConfiguration or buildDefinition with schedule. Also delete schedules that are not associated with a buildDefinition or purgeConfiguration when execute job process. I have created two groups for jobs whe add a job to scheduler: - PurgeConfiguration group. - BuildDefinitionGroup. Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java?rev=780709&r1=780708&r2=780709&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java (original) +++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java Mon Jun 1 16:31:31 2009 @@ -35,15 +35,19 @@ import org.apache.continuum.purge.PurgeConfigurationService; import org.apache.continuum.repository.RepositoryService; import org.apache.continuum.taskqueue.manager.TaskQueueManager; +import org.apache.maven.continuum.build.settings.SchedulesActivationException; import org.apache.maven.continuum.configuration.ConfigurationService; import org.apache.maven.continuum.model.project.Schedule; import org.apache.maven.continuum.security.ContinuumRoleConstants; import org.apache.maven.continuum.web.action.ContinuumConfirmAction; +import org.apache.maven.continuum.web.action.ScheduleAction; import org.apache.struts2.ServletActionContext; import org.codehaus.plexus.redback.rbac.Resource; import org.codehaus.redback.integration.interceptor.SecureAction; import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Maria Catherine Tan @@ -55,6 +59,8 @@ extends ContinuumConfirmAction implements Preparable, SecureAction { + private static final Logger logger = LoggerFactory.getLogger( PurgeConfigurationAction.class ); + private static final String PURGE_TYPE_REPOSITORY = "repository"; private static final String PURGE_TYPE_DIRECTORY = "directory"; @@ -117,6 +123,7 @@ */ private RepositoryService repositoryService; + @Override public void prepare() throws Exception { @@ -153,6 +160,7 @@ directoryTypes.add( PURGE_DIRECTORY_BUILDOUTPUT ); } + @Override public String input() throws Exception { @@ -258,6 +266,11 @@ updateDefaultPurgeConfiguration(); } + if ( purgeConfig.isEnabled() && purgeConfig.getSchedule() != null ) + { + getContinuum().activePurgeSchedule( purgeConfig.getSchedule() ); + } + return SUCCESS; } @@ -379,11 +392,13 @@ this.enabled = enabled; } + @Override public boolean isConfirmed() { return this.confirmed; } + @Override public void setConfirmed( boolean confirmed ) { this.confirmed = confirmed; Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java?rev=780709&r1=780708&r2=780709&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java (original) +++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java Mon Jun 1 16:31:31 2009 @@ -76,6 +76,7 @@ // Webwork Methods // ------------------------------------------------------- + @Override public void prepare() throws Exception { @@ -90,6 +91,7 @@ this.setBuildDefinitions( getContinuum().getBuildDefinitionService().getAllTemplates() ); } + @Override public String input() throws Exception { @@ -217,6 +219,7 @@ public String saveBuildDefinition() throws Exception { + Schedule schedule = null; if ( buildDefinition.getProfile() != null ) { Profile profile = getContinuum().getProfileService().getProfile( buildDefinition.getProfile().getId() ); @@ -233,7 +236,8 @@ { if ( buildDefinition.getSchedule().getId() > 0 ) { - buildDefinition.setSchedule( getContinuum().getSchedule( buildDefinition.getSchedule().getId() ) ); + schedule = getContinuum().getSchedule( buildDefinition.getSchedule().getId() ); + buildDefinition.setSchedule( schedule ); } } @@ -246,6 +250,11 @@ this.buildDefinition = this.getContinuum().getBuildDefinitionService().addBuildDefinition( buildDefinition ); } + + if ( schedule != null ) + { + getContinuum().activeBuildDefinitionSchedule( schedule ); + } return SUCCESS; }