Return-Path: X-Original-To: apmail-continuum-commits-archive@www.apache.org Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 18E1FD8EF for ; Mon, 13 Aug 2012 04:30:53 +0000 (UTC) Received: (qmail 1950 invoked by uid 500); 13 Aug 2012 04:30:52 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 1804 invoked by uid 500); 13 Aug 2012 04:30:52 -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 1750 invoked by uid 99); 13 Aug 2012 04:30:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Aug 2012 04:30:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 13 Aug 2012 04:30:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1F80E23889D5 for ; Mon, 13 Aug 2012 04:30:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1372260 [2/30] - in /continuum/trunk: ./ continuum-api/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/executor/ continuum-api/src/main/java/org/ap... Date: Mon, 13 Aug 2012 04:29:28 -0000 To: commits@continuum.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120813043004.1F80E23889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildmanager/BuildsManager.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildmanager/BuildsManager.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildmanager/BuildsManager.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildmanager/BuildsManager.java Mon Aug 13 04:29:09 2012 @@ -19,10 +19,6 @@ package org.apache.continuum.buildmanage * under the License. */ -import java.io.File; -import java.util.List; -import java.util.Map; - import org.apache.continuum.taskqueue.BuildProjectTask; import org.apache.continuum.taskqueue.CheckOutTask; import org.apache.continuum.taskqueue.PrepareBuildProjectsTask; @@ -32,6 +28,10 @@ import org.apache.maven.continuum.model. import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.model.scm.ScmResult; +import java.io.File; +import java.util.List; +import java.util.Map; + /** * BuildsManager. All builds whether forced or triggered will go through (or have to be added through) a builds manager. * @@ -50,8 +50,8 @@ public interface BuildsManager * @param projectGroupId * @throws BuildManagerException */ - void buildProjects( List projects, Map projectsBuildDefinitionsMap, - BuildTrigger buildTrigger, Map scmResultMap, int projectGroupId ) + void buildProjects( List projects, Map projectsBuildDefinitionsMap, + BuildTrigger buildTrigger, Map scmResultMap, int projectGroupId ) throws BuildManagerException; /** @@ -67,7 +67,7 @@ public interface BuildsManager * @param projectGroupId * @throws BuildManagerException */ - void buildProject( int projectId, BuildDefinition buildDefinition, String projectName, BuildTrigger buildTrigger, + void buildProject( int projectId, BuildDefinition buildDefinition, String projectName, BuildTrigger buildTrigger, ScmResult scmResult, int projectGroupId ) throws BuildManagerException; @@ -81,8 +81,8 @@ public interface BuildsManager * @param scmRootId * @throws BuildManagerException */ - void prepareBuildProjects( Map projectsBuildDefinitionsMap, BuildTrigger buildTrigger, - int projectGroupId, String projectGroupName, String scmRootAddress, int scmRootId ) + void prepareBuildProjects( Map projectsBuildDefinitionsMap, BuildTrigger buildTrigger, + int projectGroupId, String projectGroupName, String scmRootAddress, int scmRootId ) throws BuildManagerException; /** @@ -92,15 +92,16 @@ public interface BuildsManager * @param projectId * @param projectName * @param workingDirectory - * @param scmRootUrl TODO + * @param scmRootUrl TODO * @param scmUsername * @param scmPassword * @param defaultBuildDefinition - * @param subProjects TODO + * @param subProjects TODO * @throws BuildManagerException */ - void checkoutProject( int projectId, String projectName, File workingDirectory, String scmRootUrl, - String scmUsername, String scmPassword, BuildDefinition defaultBuildDefinition, List subProjects ) + void checkoutProject( int projectId, String projectName, File workingDirectory, String scmRootUrl, + String scmUsername, String scmPassword, BuildDefinition defaultBuildDefinition, + List subProjects ) throws BuildManagerException; /** @@ -157,7 +158,7 @@ public interface BuildsManager /** * Cancels the specified project group prepare build - * + * * @param projectGroupId * @param scmRootId * @return @@ -168,7 +169,7 @@ public interface BuildsManager /** * Cancels the specified project prepare build - * + * * @param projectId * @return * @throws BuildManagerException @@ -196,10 +197,11 @@ public interface BuildsManager * @throws BuildManagerException */ void removeProjectFromBuildQueue( int projectId, int buildDefinitionId, BuildTrigger buildTrigger, - String projectName, int projectGroupId ) + String projectName, int projectGroupId ) throws BuildManagerException; // TODO: should we throw an exception when one of the projects cannot be removed? + /** * Removes the specified projects from their build queues. * @@ -319,7 +321,7 @@ void removeProjectsFromPrepareBuildQueue /** * Checks where the project group is already in the prepare-build queue - * + * * @param projectGroupId * @param scmRootId * @return @@ -340,6 +342,7 @@ void removeProjectsFromPrepareBuildQueue /** * Checks if at least one of the projects is currently preparing build + * * @param projectIds * @return * @throws BuildManagerException @@ -394,6 +397,7 @@ void removeProjectsFromPrepareBuildQueue /** * Checks if at least one of the projects is currently building. + * * @param projectIds * @return * @throws BuildManagerException @@ -403,7 +407,7 @@ void removeProjectsFromPrepareBuildQueue /** * Checks whether project is currently being checked out. - * + * * @param projectId * @return * @throws BuildManagerException @@ -413,7 +417,7 @@ void removeProjectsFromPrepareBuildQueue /** * Checks whether project is currently preparing build - * + * * @param projectId * @return * @throws BuildManagerException @@ -423,6 +427,7 @@ void removeProjectsFromPrepareBuildQueue /** * Checks whether project group is currently preparing build + * * @param projectGroupId * @param scmRootId * @return @@ -433,6 +438,7 @@ void removeProjectsFromPrepareBuildQueue /** * Return currently preparing build project. + * * @return * @throws BuildManagerException */ @@ -441,6 +447,7 @@ void removeProjectsFromPrepareBuildQueue /** * Return all projects in prepare build queue. + * * @return * @throws BuildManagerException */ @@ -449,6 +456,7 @@ void removeProjectsFromPrepareBuildQueue /** * Remove a project from a prepare build queue. + * * @param projectGroupId * @param scmRootId * @return Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildqueue/BuildQueueService.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildqueue/BuildQueueService.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildqueue/BuildQueueService.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildqueue/BuildQueueService.java Mon Aug 13 04:29:09 2012 @@ -19,10 +19,10 @@ package org.apache.continuum.buildqueue; * under the License. */ -import java.util.List; - import org.apache.maven.continuum.model.project.BuildQueue; +import java.util.List; + /** * @author Maria Odea Ching */ Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildqueue/BuildQueueServiceException.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildqueue/BuildQueueServiceException.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildqueue/BuildQueueServiceException.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/buildqueue/BuildQueueServiceException.java Mon Aug 13 04:29:09 2012 @@ -20,9 +20,7 @@ package org.apache.continuum.buildqueue; */ /** - * * @author Maria Odea Ching - * */ public class BuildQueueServiceException extends Exception @@ -31,12 +29,12 @@ public class BuildQueueServiceException { super( message ); } - + public BuildQueueServiceException( Throwable cause ) { super( cause ); } - + public BuildQueueServiceException( String message, Throwable cause ) { super( message, cause ); Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/BuildAgentGroupConfiguration.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/BuildAgentGroupConfiguration.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/BuildAgentGroupConfiguration.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/BuildAgentGroupConfiguration.java Mon Aug 13 04:29:09 2012 @@ -21,7 +21,7 @@ public class BuildAgentGroupConfiguratio this.buildAgents = buildAgents; } - public void addBuildAgent(BuildAgentConfiguration buildAgent) + public void addBuildAgent( BuildAgentConfiguration buildAgent ) { buildAgents.add( buildAgent ); } @@ -31,13 +31,13 @@ public class BuildAgentGroupConfiguratio Iterator iterator = buildAgents.iterator(); while ( iterator.hasNext() ) { - BuildAgentConfiguration agent = iterator.next(); - if( agent.getUrl().equals( buildAgent.getUrl() ) ) + BuildAgentConfiguration agent = iterator.next(); + if ( agent.getUrl().equals( buildAgent.getUrl() ) ) { iterator.remove(); } } - } + } public String getName() { Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/ContinuumConfiguration.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/ContinuumConfiguration.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/ContinuumConfiguration.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/ContinuumConfiguration.java Mon Aug 13 04:29:09 2012 @@ -31,6 +31,7 @@ public interface ContinuumConfiguration /** * @return an empty or a filled on but never null ! * @throws ContinuumConfigurationException + * */ GeneralConfiguration getGeneralConfiguration() throws ContinuumConfigurationException; @@ -44,9 +45,9 @@ public interface ContinuumConfiguration void save( File file ) throws ContinuumConfigurationException; - void reload( ) - throws ContinuumConfigurationException; - + void reload() + throws ContinuumConfigurationException; + void reload( File file ) throws ContinuumConfigurationException; } Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/GeneralConfiguration.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/GeneralConfiguration.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/GeneralConfiguration.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/GeneralConfiguration.java Mon Aug 13 04:29:09 2012 @@ -40,15 +40,15 @@ public class GeneralConfiguration private String baseUrl; private ProxyConfiguration proxyConfiguration; - + private File releaseOutputDirectory; - + private int numberOfBuildsInParallel = 1; private List buildAgents; - + private List buildAgentGroups; - + private boolean distributedBuildEnabled; private String sharedSecretPassword; @@ -118,7 +118,7 @@ public class GeneralConfiguration { return releaseOutputDirectory; } - + public void setReleaseOutputDirectory( File releaseOutputDirectory ) { this.releaseOutputDirectory = releaseOutputDirectory; Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/ProxyConfiguration.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/ProxyConfiguration.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/ProxyConfiguration.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/configuration/ProxyConfiguration.java Mon Aug 13 04:29:09 2012 @@ -20,7 +20,6 @@ package org.apache.continuum.configurati */ - import org.apache.commons.lang.builder.ReflectionToStringBuilder; /** @@ -37,12 +36,12 @@ public class ProxyConfiguration private String proxyUser; private String proxyPassword; - + public ProxyConfiguration() { // nothing here } - + public ProxyConfiguration( String proxyHost, String proxyPassword, int proxyPort, String proxyUser ) { super(); Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/BuildQueueDao.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/BuildQueueDao.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/BuildQueueDao.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/BuildQueueDao.java Mon Aug 13 04:29:09 2012 @@ -19,11 +19,11 @@ package org.apache.continuum.dao; * under the License. */ -import java.util.List; - import org.apache.maven.continuum.model.project.BuildQueue; import org.apache.maven.continuum.store.ContinuumStoreException; +import java.util.List; + /** * @author Maria Odea Ching */ Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/BuildResultDao.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/BuildResultDao.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/BuildResultDao.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/BuildResultDao.java Mon Aug 13 04:29:09 2012 @@ -19,14 +19,14 @@ package org.apache.continuum.dao; * under the License. */ -import java.util.Date; -import java.util.List; -import java.util.Map; - import org.apache.maven.continuum.model.project.BuildResult; import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.store.ContinuumStoreException; +import java.util.Date; +import java.util.List; +import java.util.Map; + /** * @author Emmanuel Venisse * @version $Id$ @@ -102,5 +102,6 @@ public interface BuildResultDao List getAllBuildsForAProjectByDate( int projectId ); - List getBuildResultsInRange( Date fromDate, Date toDate, int state, String triggeredBy, int projectGroupId ); + List getBuildResultsInRange( Date fromDate, Date toDate, int state, String triggeredBy, + int projectGroupId ); } Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDao.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDao.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDao.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ContinuumReleaseResultDao.java Mon Aug 13 04:29:09 2012 @@ -19,12 +19,12 @@ package org.apache.continuum.dao; * under the License. */ -import java.util.List; - import org.apache.continuum.model.release.ContinuumReleaseResult; import org.apache.maven.continuum.store.ContinuumObjectNotFoundException; import org.apache.maven.continuum.store.ContinuumStoreException; +import java.util.List; + /** * @author Maria Catherine Tan */ @@ -37,12 +37,12 @@ public interface ContinuumReleaseResultD throws ContinuumStoreException; List getContinuumReleaseResultsByProjectGroup( int projectGroupId ); - + List getAllContinuumReleaseResults(); ContinuumReleaseResult getContinuumReleaseResult( int releaseResultId ) throws ContinuumObjectNotFoundException, ContinuumStoreException; - + ContinuumReleaseResult getContinuumReleaseResult( int projectId, String releaseGoal, long startTime, long endTime ) throws ContinuumStoreException; Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DaoUtils.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DaoUtils.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DaoUtils.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DaoUtils.java Mon Aug 13 04:29:09 2012 @@ -19,10 +19,10 @@ package org.apache.continuum.dao; * under the License. */ -import java.util.Map; - import org.apache.maven.continuum.store.ContinuumStoreException; +import java.util.Map; + /** * @author Emmanuel Venisse * @version $Id$ Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DirectoryPurgeConfigurationDao.java Mon Aug 13 04:29:09 2012 @@ -35,7 +35,7 @@ public interface DirectoryPurgeConfigura List getDirectoryPurgeConfigurationsBySchedule( int scheduleId ); List getEnableDirectoryPurgeConfigurationsBySchedule( int scheduleId ); - + List getDirectoryPurgeConfigurationsByLocation( String location ); List getDirectoryPurgeConfigurationsByType( String type ); Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDao.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDao.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDao.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/DistributedDirectoryPurgeConfigurationDao.java Mon Aug 13 04:29:09 2012 @@ -19,11 +19,11 @@ package org.apache.continuum.dao; * under the License. */ -import java.util.List; - import org.apache.continuum.model.repository.DistributedDirectoryPurgeConfiguration; import org.apache.maven.continuum.store.ContinuumStoreException; +import java.util.List; + /** * @author * @version $Id$ @@ -32,45 +32,41 @@ public interface DistributedDirectoryPur { /** * Retrieve all DistributedDirectoryPurgeConfiguration instances. - * + * * @return list of all DistributedDirectoryPurgeConfiguration instances */ List getAllDistributedDirectoryPurgeConfigurations(); /** * Retrieve all DistributedDirectoryPurgeConfiguration instances associated with the input scheduleId. - * + * * @param scheduleId schedule id - * * @return list of all DistributedDirectoryPurgeConfiguration instances associated with the input scheduleId */ List getDistributedDirectoryPurgeConfigurationsBySchedule( int scheduleId ); /** * Retrieve all enabled DistributedDirectoryPurgeConfiguration instances associated with the input scheduleId. - * + * * @param scheduleId schedule id - * * @return list of all enabled DistributedDirectoryPurgeConfiguration instances associated with the input scheduleId */ - List getEnableDistributedDirectoryPurgeConfigurationsBySchedule( int scheduleId ); + List getEnableDistributedDirectoryPurgeConfigurationsBySchedule( + int scheduleId ); /** * Retrieve all DistributedDirectoryPurgeConfiguration instances having the specified directory type. - * + * * @param type directory type - * * @return list of all DistributedDirectoryPurgeConfiguration instances having the specified directory type */ List getDistributedDirectoryPurgeConfigurationsByType( String type ); /** * Retrieve the DistributedDirectoryPurgeConfiguration instance associated with the input id. - * + * * @param configurationId DistributedDirectoryPurgeConfiguration instance id - * * @return DistributedDirectoryPurgeConfiguration instance - * * @throws ContinuumStoreException if unable to retrieve an instance associated with the input id */ DistributedDirectoryPurgeConfiguration getDistributedDirectoryPurgeConfiguration( int configurationId ) @@ -78,21 +74,19 @@ public interface DistributedDirectoryPur /** * Adds a new DistributedDirectoryPurgeConfiguration instance. - * + * * @param purgeConfiguration DistributedDirectoryPurgeConfiguration instance to be added - * * @return DistributedDirectoryPurgeConfiguration instance that was added - * * @throws ContinuumStoreException if unable to add the new instance */ - DistributedDirectoryPurgeConfiguration addDistributedDirectoryPurgeConfiguration( DistributedDirectoryPurgeConfiguration purgeConfiguration ) + DistributedDirectoryPurgeConfiguration addDistributedDirectoryPurgeConfiguration( + DistributedDirectoryPurgeConfiguration purgeConfiguration ) throws ContinuumStoreException; /** * Updates the DistributedDirectoryPurgeConfiguration instance. - * + * * @param purgeConfiguration DistributedDirectoryPurgeConfiguration instance to be updated - * * @throws ContinuumStoreException if unable to update the instance */ void updateDistributedDirectoryPurgeConfiguration( DistributedDirectoryPurgeConfiguration purgeConfiguration ) @@ -100,9 +94,8 @@ public interface DistributedDirectoryPur /** * Removes the DistributedDirectoryPurgeConfiguration instance. - * + * * @param purgeConfiguration DistributedDirectoryPurgeConfiguration instance to be removed - * * @throws ContinuumStoreException if unable to remove the instance */ void removeDistributedDirectoryPurgeConfiguration( DistributedDirectoryPurgeConfiguration purgeConfiguration ) Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/InstallationDao.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/InstallationDao.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/InstallationDao.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/InstallationDao.java Mon Aug 13 04:29:09 2012 @@ -46,5 +46,5 @@ public interface InstallationDao throws ContinuumStoreException; Installation getInstallation( String installationName ) - throws ContinuumStoreException; + throws ContinuumStoreException; } Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ProjectGroupDao.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ProjectGroupDao.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ProjectGroupDao.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ProjectGroupDao.java Mon Aug 13 04:29:09 2012 @@ -19,10 +19,10 @@ package org.apache.continuum.dao; * under the License. */ -import org.apache.maven.continuum.model.project.ProjectGroup; import org.apache.maven.continuum.model.project.Project; -import org.apache.maven.continuum.store.ContinuumStoreException; +import org.apache.maven.continuum.model.project.ProjectGroup; import org.apache.maven.continuum.store.ContinuumObjectNotFoundException; +import org.apache.maven.continuum.store.ContinuumStoreException; import java.util.Collection; import java.util.List; @@ -53,7 +53,8 @@ public interface ProjectGroupDao * * @param projectGroupId The project group id * @return The project group - * @throws org.apache.maven.continuum.store.ContinuumStoreException if the project group can't be obtain + * @throws org.apache.maven.continuum.store.ContinuumStoreException + * if the project group can't be obtain */ ProjectGroup getProjectGroup( int projectGroupId ) throws ContinuumStoreException, ContinuumObjectNotFoundException; Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ProjectScmRootDao.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ProjectScmRootDao.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ProjectScmRootDao.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/ProjectScmRootDao.java Mon Aug 13 04:29:09 2012 @@ -19,12 +19,12 @@ package org.apache.continuum.dao; * under the License. */ -import java.util.List; - import org.apache.continuum.model.project.ProjectScmRoot; import org.apache.maven.continuum.store.ContinuumObjectNotFoundException; import org.apache.maven.continuum.store.ContinuumStoreException; +import java.util.List; + /** * @author Maria Catherine Tan */ @@ -45,7 +45,7 @@ public interface ProjectScmRootDao ProjectScmRoot getProjectScmRoot( int projectScmRootId ) throws ContinuumObjectNotFoundException, ContinuumStoreException; - + ProjectScmRoot getProjectScmRootByProjectGroupAndScmRootAddress( int projectGroupId, String scmRootAddress ) throws ContinuumStoreException; } Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/dao/RepositoryPurgeConfigurationDao.java Mon Aug 13 04:29:09 2012 @@ -33,7 +33,7 @@ public interface RepositoryPurgeConfigur List getAllRepositoryPurgeConfigurations(); List getRepositoryPurgeConfigurationsBySchedule( int scheduleId ); - + List getEnableRepositoryPurgeConfigurationsBySchedule( int scheduleId ); List getRepositoryPurgeConfigurationsByLocalRepository( int repositoryId ); Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/ContinuumPurgeManager.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/ContinuumPurgeManager.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/ContinuumPurgeManager.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/ContinuumPurgeManager.java Mon Aug 13 04:29:09 2012 @@ -30,38 +30,40 @@ import org.apache.maven.continuum.model. * @since 25 jul 07 */ public interface ContinuumPurgeManager -{ +{ String ROLE = ContinuumPurgeManager.class.getName(); - + /** - * Purge repositories and directories + * Purge repositories and directories + * * @param schedule * @throws ContinuumPurgeManagerException */ void purge( Schedule schedule ) throws ContinuumPurgeManagerException; - + /** * Purge repository + * * @param repoPurgeConfig * @throws ContinuumPurgeManagerException */ void purgeRepository( RepositoryPurgeConfiguration repoPurgeConfig ) throws ContinuumPurgeManagerException; - + /** - * Purge directory + * Purge directory + * * @param dirPurgeConfig * @throws ContinuumPurgeManagerException */ void purgeDirectory( DirectoryPurgeConfiguration dirPurgeConfig ) throws ContinuumPurgeManagerException; - + /** * Purge directory in distributed build mode - * + * * @param dirPurgeConfig distributed purge configuration - * * @throws ContinuumPurgeManagerException */ void purgeDistributedDirectory( DistributedDirectoryPurgeConfiguration dirPurgeConfig ) Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/ContinuumPurgeManagerException.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/ContinuumPurgeManagerException.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/ContinuumPurgeManagerException.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/ContinuumPurgeManagerException.java Mon Aug 13 04:29:09 2012 @@ -31,12 +31,12 @@ public class ContinuumPurgeManagerExcept { super( message ); } - + public ContinuumPurgeManagerException( Throwable cause ) { super( cause ); } - + public ContinuumPurgeManagerException( String message, Throwable cause ) { super( message, cause ); Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationService.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationService.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationService.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationService.java Mon Aug 13 04:29:09 2012 @@ -19,14 +19,14 @@ package org.apache.continuum.purge; * under the License. */ -import java.util.List; - import org.apache.continuum.model.repository.AbstractPurgeConfiguration; import org.apache.continuum.model.repository.DirectoryPurgeConfiguration; import org.apache.continuum.model.repository.DistributedDirectoryPurgeConfiguration; import org.apache.continuum.model.repository.RepositoryPurgeConfiguration; import org.apache.continuum.purge.repository.content.RepositoryManagedContent; +import java.util.List; + /** * @author Maria Catherine Tan * @version $Id$ @@ -35,85 +35,88 @@ import org.apache.continuum.purge.reposi public interface PurgeConfigurationService { String ROLE = PurgeConfigurationService.class.getName(); - + AbstractPurgeConfiguration addPurgeConfiguration( AbstractPurgeConfiguration purgeConfig ) throws PurgeConfigurationServiceException; - + void updatePurgeConfiguration( AbstractPurgeConfiguration purgeConfig ) throws PurgeConfigurationServiceException; void removePurgeConfiguration( int purgeConfigId ) throws PurgeConfigurationServiceException; - + RepositoryPurgeConfiguration addRepositoryPurgeConfiguration( RepositoryPurgeConfiguration repoPurge ) throws PurgeConfigurationServiceException; - + void updateRepositoryPurgeConfiguration( RepositoryPurgeConfiguration repoPurge ) throws PurgeConfigurationServiceException; - + void removeRepositoryPurgeConfiguration( RepositoryPurgeConfiguration repoPurge ) throws PurgeConfigurationServiceException; - + RepositoryPurgeConfiguration getRepositoryPurgeConfiguration( int repoPurgeId ) throws PurgeConfigurationServiceException; - + RepositoryPurgeConfiguration getDefaultPurgeConfigurationForRepository( int repositoryId ); - + List getRepositoryPurgeConfigurationsBySchedule( int scheduleId ); - + List getEnableRepositoryPurgeConfigurationsBySchedule( int scheduleId ); - + List getRepositoryPurgeConfigurationsByRepository( int repositoryId ); - + List getAllRepositoryPurgeConfigurations(); - + DirectoryPurgeConfiguration addDirectoryPurgeConfiguration( DirectoryPurgeConfiguration dirPurge ) throws PurgeConfigurationServiceException; - + void updateDirectoryPurgeConfiguration( DirectoryPurgeConfiguration dirPurge ) throws PurgeConfigurationServiceException; - + void removeDirectoryPurgeConfiguration( DirectoryPurgeConfiguration dirPurge ) throws PurgeConfigurationServiceException; - + DirectoryPurgeConfiguration getDirectoryPurgeConfiguration( int dirPurgeId ) throws PurgeConfigurationServiceException; - + DirectoryPurgeConfiguration getDefaultPurgeConfigurationForDirectoryType( String directoryType ); - + List getDirectoryPurgeConfigurationsBySchedule( int scheduleId ); - + List getEnableDirectoryPurgeConfigurationsBySchedule( int scheduleId ); - + List getDirectoryPurgeConfigurationsByLocation( String location ); - + List getAllDirectoryPurgeConfigurations(); - + List getAllPurgeConfigurations(); - + List getAllDistributedDirectoryPurgeConfigurations(); - + DistributedDirectoryPurgeConfiguration getDistributedDirectoryPurgeConfiguration( int dirPurgeId ) throws PurgeConfigurationServiceException; - - DistributedDirectoryPurgeConfiguration addDistributedDirectoryPurgeConfiguration( DistributedDirectoryPurgeConfiguration dirPurge ) + + DistributedDirectoryPurgeConfiguration addDistributedDirectoryPurgeConfiguration( + DistributedDirectoryPurgeConfiguration dirPurge ) throws PurgeConfigurationServiceException; - + void updateDistributedDirectoryPurgeConfiguration( DistributedDirectoryPurgeConfiguration dirPurge ) throws PurgeConfigurationServiceException; - + void removeDistributedDirectoryPurgeConfiguration( DistributedDirectoryPurgeConfiguration dirPurge ) throws PurgeConfigurationServiceException; - + AbstractPurgeConfiguration getPurgeConfiguration( int purgeConfigId ); - - List getEnableDistributedDirectoryPurgeConfigurationsBySchedule( int scheduleId ); - + + List getEnableDistributedDirectoryPurgeConfigurationsBySchedule( + int scheduleId ); + /** * @param repositoryId * @return * @throws PurgeConfigurationServiceException + * */ - RepositoryManagedContent getManagedRepositoryContent( int repositoryId) + RepositoryManagedContent getManagedRepositoryContent( int repositoryId ) throws PurgeConfigurationServiceException; } Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationServiceException.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationServiceException.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationServiceException.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/PurgeConfigurationServiceException.java Mon Aug 13 04:29:09 2012 @@ -31,12 +31,12 @@ public class PurgeConfigurationServiceEx { super( message ); } - + public PurgeConfigurationServiceException( Throwable cause ) { super( cause ); } - + public PurgeConfigurationServiceException( String message, Throwable cause ) { super( message, cause ); Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/controller/PurgeController.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/controller/PurgeController.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/controller/PurgeController.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/controller/PurgeController.java Mon Aug 13 04:29:09 2012 @@ -30,11 +30,11 @@ import org.apache.continuum.purge.execut public interface PurgeController { String ROLE = PurgeController.class.getName(); - + void initializeExecutors( AbstractPurgeConfiguration purgeConfig ) throws ContinuumPurgeExecutorException; - + void doPurge( AbstractPurgeConfiguration purgeConfig ); - + void doPurge( String path ); } Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/executor/ContinuumPurgeExecutor.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/executor/ContinuumPurgeExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/executor/ContinuumPurgeExecutor.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/executor/ContinuumPurgeExecutor.java Mon Aug 13 04:29:09 2012 @@ -1,24 +1,23 @@ package org.apache.continuum.purge.executor; - /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ /** * @author Maria Catherine Tan @@ -28,7 +27,7 @@ package org.apache.continuum.purge.execu public interface ContinuumPurgeExecutor { String ROLE = ContinuumPurgeExecutor.class.getName(); - + void purge( String path ) throws ContinuumPurgeExecutorException; } \ No newline at end of file Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/executor/ContinuumPurgeExecutorException.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/executor/ContinuumPurgeExecutorException.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/executor/ContinuumPurgeExecutorException.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/executor/ContinuumPurgeExecutorException.java Mon Aug 13 04:29:09 2012 @@ -31,12 +31,12 @@ public class ContinuumPurgeExecutorExcep { super( message ); } - + public ContinuumPurgeExecutorException( Throwable cause ) { super( cause ); } - + public ContinuumPurgeExecutorException( String message, Throwable cause ) { super( message, cause ); Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/repository/content/RepositoryManagedContent.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/repository/content/RepositoryManagedContent.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/repository/content/RepositoryManagedContent.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/repository/content/RepositoryManagedContent.java Mon Aug 13 04:29:09 2012 @@ -19,9 +19,6 @@ package org.apache.continuum.purge.repos * under the License. */ -import java.io.File; -import java.util.Set; - import org.apache.continuum.model.repository.LocalRepository; import org.apache.maven.archiva.model.ArtifactReference; import org.apache.maven.archiva.model.ProjectReference; @@ -29,8 +26,12 @@ import org.apache.maven.archiva.model.Ve import org.apache.maven.archiva.repository.ContentNotFoundException; import org.apache.maven.archiva.repository.layout.LayoutException; +import java.io.File; +import java.util.Set; + /** * Taken from Archiva's ManagedRepositoryContent interface and made some few changes. + * * @author Maria Catherine Tan * @version $Id$ * @since 25 jul 07 @@ -40,41 +41,41 @@ public interface RepositoryManagedConten /** * Delete from the local repository all files / directories associated with the * provided version reference. - * + * * @param reference the version reference to delete. - * @throws ContentNotFoundException + * @throws ContentNotFoundException */ public void deleteVersion( VersionedReference reference ) throws ContentNotFoundException; - + /** *

* Convenience method to get the repository id. *

- * + * *

* Equivalent to calling .getRepository().getId() *

- * + * * @return the repository id. */ public int getId(); - + /** *

* Gather up the list of related artifacts to the ArtifactReference provided. - * This typically inclues the pom files, and those things with + * This typically inclues the pom files, and those things with * classifiers (such as doc, source code, test libs, etc...) *

- * + * *

* NOTE: Some layouts (such as maven 1 "legacy") are not compatible with this query. - *

- * + *

+ * * @param reference the reference to work off of. * @return the set of ArtifactReferences for related artifacts. * @throws ContentNotFoundException if the initial artifact reference does not exist within the repository. - * @throws LayoutException + * @throws LayoutException */ public Set getRelatedArtifacts( ArtifactReference reference ) throws ContentNotFoundException, LayoutException; @@ -83,11 +84,11 @@ public interface RepositoryManagedConten *

* Convenience method to get the repository (on disk) root directory. *

- * + * *

* Equivalent to calling .getLocalRepository().getDirectory() *

- * + * * @return the repository (on disk) root directory. */ public String getRepoRoot(); @@ -95,7 +96,7 @@ public interface RepositoryManagedConten /** * Get the local repository associated with this * repository content. - * + * * @return the local repository that is associated with this repository content. */ public LocalRepository getRepository(); @@ -103,11 +104,11 @@ public interface RepositoryManagedConten /** * Given a specific {@link ProjectReference}, return the list of available versions for * that project reference. - * + * * @param reference the project reference to work off of. * @return the list of versions found for that project reference. * @throws ContentNotFoundException if the project reference does not exist within the repository. - * @throws LayoutException + * @throws LayoutException */ public Set getVersions( ProjectReference reference ) throws ContentNotFoundException, LayoutException; @@ -117,23 +118,23 @@ public interface RepositoryManagedConten * Given a specific {@link VersionedReference}, return the list of available versions for that * versioned reference. *

- * + * *

* NOTE: This is really only useful when working with SNAPSHOTs. *

- * + * * @param reference the versioned reference to work off of. * @return the set of versions found. * @throws ContentNotFoundException if the versioned reference does not exist within the repository. - * @throws LayoutException + * @throws LayoutException */ public Set getVersions( VersionedReference reference ) throws ContentNotFoundException, LayoutException; - + /** * Set the local repository to associate with this * repository content. - * + * * @param repo the repository to associate with this repository content. */ public void setRepository( LocalRepository repo ); @@ -159,8 +160,8 @@ public interface RepositoryManagedConten /** * Given a {@link ProjectReference}, return the path to the metadata for - * the project. - * + * the project. + * * @param reference the reference to use. * @return the path to the metadata file, or null if no metadata is appropriate. */ @@ -168,8 +169,8 @@ public interface RepositoryManagedConten /** * Given a {@link VersionedReference}, return the path to the metadata for - * the specific version of the project. - * + * the specific version of the project. + * * @param reference the reference to use. * @return the path to the metadata file, or null if no metadata is appropriate. */ Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/repository/scanner/RepositoryScanner.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/repository/scanner/RepositoryScanner.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/repository/scanner/RepositoryScanner.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/purge/repository/scanner/RepositoryScanner.java Mon Aug 13 04:29:09 2012 @@ -19,14 +19,15 @@ package org.apache.continuum.purge.repos * under the License. */ -import java.util.List; - import org.apache.continuum.model.repository.LocalRepository; import org.apache.continuum.purge.controller.PurgeController; import org.apache.continuum.purge.executor.ContinuumPurgeExecutorException; +import java.util.List; + /** * Codes were taken from Archiva and made some changes. + * * @author Maria Catherine Tan * @version $Id$ * @since 25 jul 07 @@ -38,28 +39,14 @@ public interface RepositoryScanner * Typical Ignorable Content patterns. *

*/ - public static final String[] IGNORABLE_CONTENT = { - "bin/**", - "reports/**", - ".index", - ".reports/**", - ".maven/**", - "**/.svn/**", - "**/*snapshot-version", - "*/website/**", - "*/licences/**", - "**/.htaccess", - "**/*.html", - "**/*.txt", - "**/README*", - "**/CHANGELOG*", - "**/KEYS*" + - "**/*.xml*" }; - + public static final String[] IGNORABLE_CONTENT = + {"bin/**", "reports/**", ".index", ".reports/**", ".maven/**", "**/.svn/**", "**/*snapshot-version", + "*/website/**", "*/licences/**", "**/.htaccess", "**/*.html", "**/*.txt", "**/README*", "**/CHANGELOG*", + "**/KEYS*" + "**/*.xml*"}; + public void scan( LocalRepository repository, PurgeController purgeController ) throws ContinuumPurgeExecutorException; - - public void scan( LocalRepository repository, PurgeController purgeController, - List ignoredContentPatterns ) + + public void scan( LocalRepository repository, PurgeController purgeController, List ignoredContentPatterns ) throws ContinuumPurgeExecutorException; } \ No newline at end of file Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/release/distributed/manager/DistributedReleaseManager.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/release/distributed/manager/DistributedReleaseManager.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/release/distributed/manager/DistributedReleaseManager.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/release/distributed/manager/DistributedReleaseManager.java Mon Aug 13 04:29:09 2012 @@ -19,10 +19,6 @@ package org.apache.continuum.release.dis * under the License. */ -import java.util.List; -import java.util.Map; -import java.util.Properties; - import org.apache.continuum.configuration.BuildAgentConfigurationException; import org.apache.continuum.model.repository.LocalRepository; import org.apache.continuum.release.model.PreparedRelease; @@ -30,6 +26,10 @@ import org.apache.maven.continuum.model. import org.apache.maven.continuum.release.ContinuumReleaseException; import org.apache.maven.shared.release.ReleaseResult; +import java.util.List; +import java.util.Map; +import java.util.Properties; + public interface DistributedReleaseManager { @@ -39,7 +39,7 @@ public interface DistributedReleaseManag List> processProject( int projectId, String pomFilename, boolean autoVersionSubmodules ) throws ContinuumReleaseException, BuildAgentConfigurationException; - String releasePrepare( Project project, Properties releaseProperties, Map releaseVersion, + String releasePrepare( Project project, Properties releaseProperties, Map releaseVersion, Map developmentVersion, Map environments, String username ) throws ContinuumReleaseException, BuildAgentConfigurationException; @@ -55,11 +55,13 @@ public interface DistributedReleaseManag String getPreparedReleaseName( String releaseId ) throws ContinuumReleaseException; - void releasePerform( int projectId, String releaseId, String goals, String arguments, boolean useReleaseProfile, LocalRepository repository, String username ) + void releasePerform( int projectId, String releaseId, String goals, String arguments, boolean useReleaseProfile, + LocalRepository repository, String username ) throws ContinuumReleaseException, BuildAgentConfigurationException; - String releasePerformFromScm( int projectId, String goals, String arguments, boolean useReleaseProfile, LocalRepository repository, - String scmUrl, String scmUsername, String scmPassword, String scmTag, String scmTagBase, Map environments, String username ) + String releasePerformFromScm( int projectId, String goals, String arguments, boolean useReleaseProfile, + LocalRepository repository, String scmUrl, String scmUsername, String scmPassword, + String scmTag, String scmTagBase, Map environments, String username ) throws ContinuumReleaseException, BuildAgentConfigurationException; void releaseRollback( String releaseId, int projectId ) @@ -70,7 +72,7 @@ public interface DistributedReleaseManag List> getAllReleasesInProgress() throws ContinuumReleaseException, BuildAgentConfigurationException; - + String getDefaultBuildagent( int projectId ); PreparedRelease getPreparedRelease( String releaseId, String releaseType ) Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/repository/RepositoryService.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/repository/RepositoryService.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/repository/RepositoryService.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/repository/RepositoryService.java Mon Aug 13 04:29:09 2012 @@ -19,10 +19,10 @@ package org.apache.continuum.repository; * under the License. */ -import java.util.List; - import org.apache.continuum.model.repository.LocalRepository; +import java.util.List; + /** * @author Maria Catherine Tan * @version $Id$ @@ -31,14 +31,14 @@ import org.apache.continuum.model.reposi public interface RepositoryService { String ROLE = RepositoryService.class.getName(); - + // ------------------------------------------------------ // LocalRepository // ------------------------------------------------------ - + /** * Add the local repository - * + * * @param repository the local repository to add * @return LocalRepository the local repository * @throws RepositoryServiceException @@ -48,7 +48,7 @@ public interface RepositoryService /** * Update the local repository - * + * * @param repository the local repository to update * @throws RepositoryServiceException */ @@ -57,7 +57,7 @@ public interface RepositoryService /** * Remove the local repository - * + * * @param repositoryId the id of the local repository to remove * @throws RepositoryServiceException */ @@ -66,32 +66,33 @@ public interface RepositoryService /** * Retrieve all local repositories - * + * * @return list of all local repositories */ List getAllLocalRepositories(); - + /** * Retrieve local repository - * + * * @param location the system file path of the repository * @return LocalRepository the local repository * @throws RepositoryServiceException */ LocalRepository getLocalRepositoryByLocation( String location ) throws RepositoryServiceException; - + /** * Retrieve list of local repositories with the specified layout + * * @param layout the layout of the repository. "default" or "legacy" * @return List of local repositories * @throws RepositoryServiceException */ List getLocalRepositoriesByLayout( String layout ); - + /** * Retrieve local repository - * + * * @param repositoryId the id of the local repository * @return LocalRepository the local repository * @throws RepositoryServiceException @@ -101,7 +102,7 @@ public interface RepositoryService /** * Retrieve local repository - * + * * @param repositoryName * @return * @throws RepositoryServiceException Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/repository/RepositoryServiceException.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/repository/RepositoryServiceException.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/repository/RepositoryServiceException.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/repository/RepositoryServiceException.java Mon Aug 13 04:29:09 2012 @@ -31,12 +31,12 @@ public class RepositoryServiceException { super( message ); } - + public RepositoryServiceException( Throwable cause ) { super( cause ); } - + public RepositoryServiceException( String message, Throwable cause ) { super( message, cause ); Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java Mon Aug 13 04:29:09 2012 @@ -19,12 +19,12 @@ package org.apache.continuum.taskqueue; * under the License. */ -import java.io.Serializable; - import org.apache.continuum.utils.build.BuildTrigger; import org.apache.maven.continuum.model.scm.ScmResult; import org.codehaus.plexus.taskqueue.Task; +import java.io.Serializable; + /** * @author Trygve Laugstøl * @version $Id$ @@ -89,9 +89,9 @@ public class BuildProjectTask public BuildTrigger getBuildTrigger() { - return buildTrigger; + return buildTrigger; } - + public void setBuildTrigger( BuildTrigger buildTrigger ) { this.buildTrigger = buildTrigger; @@ -149,7 +149,7 @@ public class BuildProjectTask public int hashCode() { - return this.getBuildDefinitionId() + this.getProjectId() + this.buildTrigger.getTrigger(); + return this.getBuildDefinitionId() + this.getProjectId() + this.buildTrigger.getTrigger(); } public int getHashCode() Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java Mon Aug 13 04:29:09 2012 @@ -19,12 +19,12 @@ package org.apache.continuum.taskqueue; * under the License. */ -import java.io.File; -import java.util.List; - import org.apache.maven.continuum.model.project.Project; import org.codehaus.plexus.taskqueue.Task; +import java.io.File; +import java.util.List; + /** * @author Trygve Laugstøl * @version $Id$ @@ -41,13 +41,13 @@ public class CheckOutTask private final String scmUserName; private final String scmPassword; - + private final String scmRootUrl; - + private final List projectsWithCommonScmRoot; - + public CheckOutTask( int projectId, File workingDirectory, String projectName, String scmUserName, - String scmPassword, String scmRootUrl, List projectsWithCommonScmRoot ) + String scmPassword, String scmRootUrl, List projectsWithCommonScmRoot ) { this.projectId = projectId; @@ -60,7 +60,7 @@ public class CheckOutTask this.scmPassword = scmPassword; this.scmRootUrl = scmRootUrl; - + this.projectsWithCommonScmRoot = projectsWithCommonScmRoot; } @@ -99,7 +99,7 @@ public class CheckOutTask { return this.hashCode(); } - + public String getScmRootUrl() { return scmRootUrl; @@ -108,5 +108,5 @@ public class CheckOutTask public List getProjectsWithCommonScmRoot() { return projectsWithCommonScmRoot; - } + } } Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/OverallBuildQueue.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/OverallBuildQueue.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/OverallBuildQueue.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/OverallBuildQueue.java Mon Aug 13 04:29:09 2012 @@ -19,13 +19,13 @@ package org.apache.continuum.taskqueue; * under the License. */ -import java.util.List; - import org.apache.continuum.utils.build.BuildTrigger; import org.codehaus.plexus.taskqueue.TaskQueue; import org.codehaus.plexus.taskqueue.TaskQueueException; import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor; +import java.util.List; + /** * @author Maria Odea Ching */ @@ -186,6 +186,7 @@ public interface OverallBuildQueue /** * Checks if the specified project group and scm root is in the prepare build queue. + * * @param projectGroupId * @param scmRootId * @return @@ -196,6 +197,7 @@ public interface OverallBuildQueue /** * Checks if the specified project group and scm root is in the prepare build queue. + * * @param projectGroupId * @param scmRootAddress * @return @@ -214,7 +216,7 @@ public interface OverallBuildQueue /** * Cancel the prepare build task of the corresponding project - * + * * @param projectId */ void cancelPrepareBuildTask( int projectId ); @@ -388,7 +390,7 @@ public interface OverallBuildQueue /** * Returns the prepare build task queue executor used. - * + * * @return */ TaskQueueExecutor getPrepareBuildTaskQueueExecutor(); Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/OverallDistributedBuildQueue.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/OverallDistributedBuildQueue.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/OverallDistributedBuildQueue.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/OverallDistributedBuildQueue.java Mon Aug 13 04:29:09 2012 @@ -1,12 +1,12 @@ package org.apache.continuum.taskqueue; -import java.util.List; - import org.apache.continuum.builder.distributed.executor.DistributedBuildTaskQueueExecutor; import org.codehaus.plexus.taskqueue.Task; import org.codehaus.plexus.taskqueue.TaskQueue; import org.codehaus.plexus.taskqueue.TaskQueueException; +import java.util.List; + public interface OverallDistributedBuildQueue { String getBuildAgentUrl(); Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/PrepareBuildProjectsTask.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/PrepareBuildProjectsTask.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/PrepareBuildProjectsTask.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/PrepareBuildProjectsTask.java Mon Aug 13 04:29:09 2012 @@ -19,11 +19,11 @@ package org.apache.continuum.taskqueue; * under the License. */ -import java.util.Map; - import org.apache.continuum.utils.build.BuildTrigger; import org.codehaus.plexus.taskqueue.Task; +import java.util.Map; + public class PrepareBuildProjectsTask implements Task { @@ -39,8 +39,9 @@ public class PrepareBuildProjectsTask private final int projectScmRootId; - public PrepareBuildProjectsTask( Map projectsBuildDefinitionsMap, BuildTrigger buildTrigger, int projectGroupId, - String projectGroupName, String scmRootAddress, int projectScmRootId ) + public PrepareBuildProjectsTask( Map projectsBuildDefinitionsMap, BuildTrigger buildTrigger, + int projectGroupId, String projectGroupName, String scmRootAddress, + int projectScmRootId ) { this.projectsBuildDefinitionsMap = projectsBuildDefinitionsMap; this.buildTrigger = buildTrigger; @@ -63,7 +64,7 @@ public class PrepareBuildProjectsTask public BuildTrigger getBuildTrigger() { - return buildTrigger; + return buildTrigger; } public int getHashCode() @@ -93,6 +94,6 @@ public class PrepareBuildProjectsTask public int hashCode() { - return this.projectGroupId + this.projectScmRootId + this.buildTrigger.getTrigger(); + return this.projectGroupId + this.projectScmRootId + this.buildTrigger.getTrigger(); } } Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/manager/TaskQueueManager.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/manager/TaskQueueManager.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/manager/TaskQueueManager.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/manager/TaskQueueManager.java Mon Aug 13 04:29:09 2012 @@ -19,7 +19,7 @@ package org.apache.continuum.taskqueue.m * under the License. */ -import org.codehaus.plexus.taskqueue.TaskQueue;; +import org.codehaus.plexus.taskqueue.TaskQueue; /** * @author Maria Catherine Tan @@ -35,7 +35,7 @@ public interface TaskQueueManager /** * Check if the repository is already in the purging queue - * + * * @param repositoryId the id of the repository purge configuration * @return true if the repository is in the purging queue, otherwise false * @throws TaskQueueManagerException @@ -45,7 +45,7 @@ public interface TaskQueueManager /** * Check if the repository is being used by a project that is currently building - * + * * @param repositoryId the id of the local repository * @return true if the repository is in use, otherwise false * @throws TaskQueueManagerException @@ -55,20 +55,20 @@ public interface TaskQueueManager /** * Check whether a project is in the release stage based on the given releaseId. - * + * * @param releaseId * @return * @throws TaskQueueManagerException */ boolean isProjectInReleaseStage( String releaseId ) - throws TaskQueueManagerException; - + throws TaskQueueManagerException; + boolean releaseInProgress() throws TaskQueueManagerException; /** * Remove local repository from the purge queue - * + * * @param purgeConfigId the id of the purge configuration * @return true if the purge configuration was successfully removed from the purge queue, otherwise false * @throws TaskQueueManagerException @@ -78,7 +78,7 @@ public interface TaskQueueManager /** * Remove local repositories from the purge queue - * + * * @param purgeConfigIds the ids of the purge configuration * @return true if the purge configurations were successfully removed from the purge queue, otherwise false * @throws TaskQueueManagerException @@ -88,7 +88,7 @@ public interface TaskQueueManager /** * Remove local repository from the purge queue - * + * * @param repositoryId the id of the local repository * @throws TaskQueueManagerException */ Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/ProjectSorter.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/ProjectSorter.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/ProjectSorter.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/ProjectSorter.java Mon Aug 13 04:29:09 2012 @@ -19,12 +19,6 @@ package org.apache.continuum.utils; * under the License. */ -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.model.project.ProjectDependency; import org.codehaus.plexus.util.dag.CycleDetectedException; @@ -32,6 +26,12 @@ import org.codehaus.plexus.util.dag.DAG; import org.codehaus.plexus.util.dag.TopologicalSorter; import org.slf4j.Logger; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * Sort projects by dependencies. * @@ -79,7 +79,7 @@ public class ProjectSorter for ( Project project : projects ) { String id = getProjectId( project ); - + String projectGroupId = "[" + project.getProjectGroup().getId() + "]"; // Dependencies @@ -163,7 +163,7 @@ public class ProjectSorter { artifactId = project.getArtifactId(); } - + String projectGroupId = "[" + project.getProjectGroup().getId() + "]"; return projectGroupId + ":" + groupId + ":" + artifactId + ":" + project.getVersion(); Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/build/BuildTrigger.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/build/BuildTrigger.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/build/BuildTrigger.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/build/BuildTrigger.java Mon Aug 13 04:29:09 2012 @@ -27,40 +27,40 @@ package org.apache.continuum.utils.build public class BuildTrigger { private int trigger; - + private String triggeredBy; - + public BuildTrigger( int trigger ) { this.trigger = trigger; } - + public BuildTrigger( String triggeredBy ) { this.triggeredBy = triggeredBy; } - + public BuildTrigger( int trigger, String triggeredBy ) { this.trigger = trigger; this.triggeredBy = triggeredBy; } - + public void setTrigger( int trigger ) { this.trigger = trigger; } - + public int getTrigger() { return this.trigger; } - + public void setTriggeredBy( String triggeredBy ) { this.triggeredBy = triggeredBy; } - + public String getTriggeredBy() { return this.triggeredBy; Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/release/ReleaseUtil.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/release/ReleaseUtil.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/release/ReleaseUtil.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/release/ReleaseUtil.java Mon Aug 13 04:29:09 2012 @@ -1,11 +1,5 @@ package org.apache.continuum.utils.release; -import java.io.File; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import org.apache.maven.model.Model; import org.apache.maven.model.Plugin; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; @@ -15,6 +9,12 @@ import org.codehaus.plexus.util.ReaderFa import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.Xpp3Dom; +import java.io.File; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + public class ReleaseUtil { @SuppressWarnings( "unchecked" ) @@ -133,8 +133,7 @@ public class ReleaseUtil { String module = StringUtils.replace( modules.next().toString(), '\\', '/' ); - processProject( workingDirectory + "/" + module, "pom.xml", autoVersionSubmodules, - projects ); + processProject( workingDirectory + "/" + module, "pom.xml", autoVersionSubmodules, projects ); } } @@ -142,15 +141,15 @@ public class ReleaseUtil throws Exception { Map params = new HashMap(); - + params.put( "key", model.getGroupId() + ":" + model.getArtifactId() ); - + if ( model.getName() == null ) { model.setName( model.getArtifactId() ); } params.put( "name", model.getName() ); - + if ( !autoVersionSubmodules || projects.size() == 0 ) { VersionInfo version = new DefaultVersionInfo( model.getVersion() ); Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java Mon Aug 13 04:29:09 2012 @@ -19,12 +19,6 @@ package org.apache.continuum.utils.shell * under the License. */ -import java.io.File; -import java.io.FileWriter; -import java.io.Writer; -import java.util.Arrays; -import java.util.Map; - import org.apache.maven.shared.release.ReleaseResult; import org.apache.maven.shared.release.exec.MavenExecutorException; import org.apache.maven.shared.release.exec.TeeConsumer; @@ -38,11 +32,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.io.File; +import java.io.FileWriter; +import java.io.Writer; +import java.util.Arrays; +import java.util.Map; + /** * @author Trygve Laugstøl * @version $Id$ */ -@Service("shellCommandHelper") +@Service( "shellCommandHelper" ) public class DefaultShellCommandHelper implements ShellCommandHelper { Modified: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/shell/ShellCommandHelper.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/shell/ShellCommandHelper.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/shell/ShellCommandHelper.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/shell/ShellCommandHelper.java Mon Aug 13 04:29:09 2012 @@ -19,12 +19,11 @@ package org.apache.continuum.utils.shell * under the License. */ +import org.apache.maven.shared.release.ReleaseResult; + import java.io.File; import java.util.Map; -import org.apache.continuum.utils.shell.ExecutionResult; -import org.apache.maven.shared.release.ReleaseResult; - /** * @author Trygve Laugstøl * @version $Id$ Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java Mon Aug 13 04:29:09 2012 @@ -19,12 +19,6 @@ package org.apache.maven.continuum; * under the License. */ -import java.io.File; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; - import org.apache.continuum.buildagent.NoBuildAgentException; import org.apache.continuum.buildagent.NoBuildAgentInGroupException; import org.apache.continuum.builder.distributed.manager.DistributedBuildManager; @@ -53,6 +47,12 @@ import org.apache.maven.continuum.profil import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult; import org.apache.maven.continuum.release.ContinuumReleaseManager; +import java.io.File; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; + /** * @author Jason van Zyl * @author Trygve Laugstøl @@ -181,7 +181,8 @@ public interface Continuum public void buildProjectGroup( int projectGroupId, BuildTrigger buildTrigger ) throws ContinuumException, NoBuildAgentException, NoBuildAgentInGroupException; - public void buildProjectGroupWithBuildDefinition( int projectGroupId, int buildDefinitionId, BuildTrigger buildTrigger ) + public void buildProjectGroupWithBuildDefinition( int projectGroupId, int buildDefinitionId, + BuildTrigger buildTrigger ) throws ContinuumException, NoBuildAgentException, NoBuildAgentInGroupException; // ---------------------------------------------------------------------- @@ -208,7 +209,8 @@ public interface Continuum void removeBuildResult( int buildId ) throws ContinuumException; - List getBuildResultsInRange( int projectGroupId, Date fromDate, Date toDate, int state, String triggeredBy ); + List getBuildResultsInRange( int projectGroupId, Date fromDate, Date toDate, int state, + String triggeredBy ); // ---------------------------------------------------------------------- // Projects @@ -316,12 +318,12 @@ public interface Continuum /** * Add a Maven 2 project to the list of projects. * - * @param metadataUrl url of the pom.xml - * @param projectGroupId id of the project group to use - * @param checkProtocol check if the protocol is allowed, use false if the pom is uploaded - * @param useCredentialsCache whether to use cached scm account credentials or not - * @param loadRecursiveProjects if multi modules project record all projects (if false only root project added) - * @param buildDefintionTemplateId buildDefintionTemplateId + * @param metadataUrl url of the pom.xml + * @param projectGroupId id of the project group to use + * @param checkProtocol check if the protocol is allowed, use false if the pom is uploaded + * @param useCredentialsCache whether to use cached scm account credentials or not + * @param loadRecursiveProjects if multi modules project record all projects (if false only root project added) + * @param buildDefintionTemplateId buildDefintionTemplateId * @param checkoutInSingleDirectory TODO * @return a holder with the projects, project groups and errors occurred during the project adding * @throws ContinuumException @@ -329,7 +331,8 @@ public interface Continuum public ContinuumProjectBuildingResult addMavenTwoProject( String metadataUrl, int projectGroupId, boolean checkProtocol, boolean useCredentialsCache, boolean loadRecursiveProjects, - int buildDefintionTemplateId, boolean checkoutInSingleDirectory ) + int buildDefintionTemplateId, + boolean checkoutInSingleDirectory ) throws ContinuumException; /** Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/ContinuumException.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/ContinuumException.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/ContinuumException.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/ContinuumException.java Mon Aug 13 04:29:09 2012 @@ -26,9 +26,9 @@ package org.apache.maven.continuum; public class ContinuumException extends Exception { - private static final long serialVersionUID = -5566747100823603618L; + private static final long serialVersionUID = -5566747100823603618L; - public ContinuumException( String message ) + public ContinuumException( String message ) { super( message ); } Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/ContinuumRuntimeException.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/ContinuumRuntimeException.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/ContinuumRuntimeException.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/ContinuumRuntimeException.java Mon Aug 13 04:29:09 2012 @@ -21,14 +21,15 @@ package org.apache.maven.continuum; /** * Exception thrown as a result of a Continuum programming error so that the user need not deal with it. + * * @version $Id$ */ public class ContinuumRuntimeException extends RuntimeException { - private static final long serialVersionUID = 2345304356025303153L; + private static final long serialVersionUID = 2345304356025303153L; - public ContinuumRuntimeException( String message, Exception cause ) + public ContinuumRuntimeException( String message, Exception cause ) { super( message, cause ); } Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivationException.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivationException.java?rev=1372260&r1=1372259&r2=1372260&view=diff ============================================================================== --- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivationException.java (original) +++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/SchedulesActivationException.java Mon Aug 13 04:29:09 2012 @@ -27,11 +27,11 @@ public class SchedulesActivationExceptio extends Exception { /** - * - */ - private static final long serialVersionUID = -7901082128754563858L; + * + */ + private static final long serialVersionUID = -7901082128754563858L; - public SchedulesActivationException( String message ) + public SchedulesActivationException( String message ) { super( message ); }