Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 41451 invoked from network); 14 Apr 2009 16:28:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Apr 2009 16:28:48 -0000 Received: (qmail 51071 invoked by uid 500); 14 Apr 2009 16:28:48 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 51036 invoked by uid 500); 14 Apr 2009 16:28:48 -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 51027 invoked by uid 99); 14 Apr 2009 16:28:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Apr 2009 16:28:48 +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; Tue, 14 Apr 2009 16:28:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 14794238895F; Tue, 14 Apr 2009 16:28:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r764863 [1/5] - in /continuum/branches/continuum-1.3.x: continuum-api/src/main/java/org/apache/continuum/taskqueue/ continuum-api/src/main/java/org/apache/continuum/utils/shell/ continuum-api/src/main/java/org/apache/maven/continuum/build/s... Date: Tue, 14 Apr 2009 16:28:17 -0000 To: commits@continuum.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090414162822.14794238895F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Tue Apr 14 16:28:12 2009 New Revision: 764863 URL: http://svn.apache.org/viewvc?rev=764863&view=rev Log: More java5 code and clean up lot of warnings found by Idea Removed: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsConstants.java Modified: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/PrepareBuildProjectsTask.java continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutionResult.java continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CreateBuildProjectTaskAction.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateProjectFromWorkingDirectoryAction.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/DefaultBuildAgentMavenOneMetadataHelper.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentReleaseManager.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentReleaseManager.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/PrepareBuildProjectsTask.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/PrepareBuildProjectsTaskExecutor.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/WorkingCopyContentGenerator.java continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/java/org/apache/continuum/web/startup/BuildAgentStartup.java continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/ThreadedDistributedBuildTaskQueueExecutor.java continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/deferred/DistributedBuildProjectTaskExecutorDeferred.java continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/overall/DistributedBuildProjectTaskExecutorOverall.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/release/distributed/DistributedReleaseUtil.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/release/distributed/manager/DefaultDistributedReleaseManager.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueueexecutor/ParallelBuildsThreadedTaskQueueExecutor.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectGroupAction.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectGroupAction.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/manager/spring/NotifierFactoryBean.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/EasySSLSocketFactory.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/EasyX509TrustManager.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/continuum/buildmanager/ParallelBuildsManagerTest.java continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/continuum/notification/mail/MockJavaMailSender.java continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/AddMaven2ProjectTest.java continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionServiceTest.java continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m2/TestMavenBuilderHelper.java continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java continuum/branches/continuum-1.3.x/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java Modified: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java (original) +++ continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java Tue Apr 14 16:28:12 2009 @@ -30,22 +30,22 @@ */ public class BuildProjectTask implements Task, Serializable -{ - private static final long serialVersionUID = 3647734422022017812L; +{ + private static final long serialVersionUID = 3647734422022017812L; - private int projectId; + private final int projectId; - private int buildDefinitionId; + private final int buildDefinitionId; - private long timestamp; + private final long timestamp; - private int trigger; + private final int trigger; private long maxExecutionTime; - - private String projectName; - - private String buildDefinitionLabel; + + private final String projectName; + + private final String buildDefinitionLabel; private ScmResult scmResult; @@ -61,7 +61,7 @@ this.trigger = trigger; this.projectName = projectName; - + this.buildDefinitionLabel = buildDefinitionLabel; this.scmResult = scmResult; @@ -100,12 +100,12 @@ public String getProjectName() { return projectName; - } - + } + public String getBuildDefinitionLabel() { return buildDefinitionLabel; - } + } public ScmResult getScmResult() { @@ -127,18 +127,18 @@ return false; } BuildProjectTask buildProjectTask = (BuildProjectTask) obj; - return buildProjectTask.getBuildDefinitionId() == this.getBuildDefinitionId() - && buildProjectTask.getProjectId() == this.getProjectId() - && buildProjectTask.getTrigger() == this.getTrigger(); + return buildProjectTask.getBuildDefinitionId() == this.getBuildDefinitionId() && + buildProjectTask.getProjectId() == this.getProjectId() && + buildProjectTask.getTrigger() == this.getTrigger(); } public int hashCode() { return this.getBuildDefinitionId() + this.getProjectId() + this.getTrigger(); } - + public int getHashCode() { return this.hashCode(); - } + } } Modified: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java (original) +++ continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java Tue Apr 14 16:28:12 2009 @@ -19,10 +19,10 @@ * under the License. */ -import org.codehaus.plexus.taskqueue.Task; - import java.io.File; +import org.codehaus.plexus.taskqueue.Task; + /** * @author Trygve Laugstøl * @version $Id$ @@ -30,26 +30,27 @@ public class CheckOutTask implements Task { - private int projectId; + private final int projectId; - private File workingDirectory; - - private String projectName; - - private String scmUserName; + private final File workingDirectory; - private String scmPassword; + private final String projectName; - public CheckOutTask( int projectId, File workingDirectory, String projectName, String scmUserName, String scmPassword ) + private final String scmUserName; + + private final String scmPassword; + + public CheckOutTask( int projectId, File workingDirectory, String projectName, String scmUserName, + String scmPassword ) { this.projectId = projectId; this.workingDirectory = workingDirectory; - + this.projectName = projectName; - + this.scmUserName = scmUserName; - + this.scmPassword = scmPassword; } @@ -72,8 +73,8 @@ { return projectName; } - - + + public String getScmUserName() { return scmUserName; @@ -83,10 +84,10 @@ { return scmPassword; } - - + + public int getHashCode() { return this.hashCode(); - } + } } Modified: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/PrepareBuildProjectsTask.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/PrepareBuildProjectsTask.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/PrepareBuildProjectsTask.java (original) +++ continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/PrepareBuildProjectsTask.java Tue Apr 14 16:28:12 2009 @@ -26,17 +26,17 @@ public class PrepareBuildProjectsTask implements Task { - private Map projectsBuildDefinitionsMap; + private final Map projectsBuildDefinitionsMap; - private int trigger; + private final int trigger; - private int projectGroupId; + private final int projectGroupId; - private String projectGroupName; + private final String projectGroupName; - private String scmRootAddress; + private final String scmRootAddress; - private int projectScmRootId; + private final int projectScmRootId; public PrepareBuildProjectsTask( Map projectsBuildDefinitionsMap, int trigger, int projectGroupId, String projectGroupName, String scmRootAddress, int projectScmRootId ) @@ -60,21 +60,11 @@ return projectsBuildDefinitionsMap; } - public void setProjectsBuildDefinitionsMap( Map projectsBuildDefinitionsMap ) - { - this.projectsBuildDefinitionsMap = projectsBuildDefinitionsMap; - } - public int getTrigger() { return trigger; } - public void setTrigger( int trigger ) - { - this.trigger = trigger; - } - public int getHashCode() { return this.hashCode(); @@ -85,31 +75,16 @@ return projectGroupId; } - public void setProjectGroupId( int projectGroupId ) - { - this.projectGroupId = projectGroupId; - } - public String getProjectGroupName() { return projectGroupName; } - public void setProjectGroupName( String projectGroupName ) - { - this.projectGroupName = projectGroupName; - } - public String getScmRootAddress() { return scmRootAddress; } - public void setScmRootAddress( String scmRootAddress ) - { - this.scmRootAddress = scmRootAddress; - } - public int hashCode() { return this.projectGroupId + this.projectScmRootId + this.trigger; Modified: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java (original) +++ continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java Tue Apr 14 16:28:12 2009 @@ -23,7 +23,6 @@ import java.io.FileWriter; import java.io.Writer; import java.util.Arrays; -import java.util.Iterator; import java.util.Map; import org.apache.maven.shared.release.ReleaseResult; @@ -47,7 +46,7 @@ public class DefaultShellCommandHelper implements ShellCommandHelper { - private Logger log = LoggerFactory.getLogger( DefaultShellCommandHelper.class ); + private static final Logger log = LoggerFactory.getLogger( DefaultShellCommandHelper.class ); // ---------------------------------------------------------------------- // ShellCommandHelper Implementation Modified: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java (original) +++ continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java Tue Apr 14 16:28:12 2009 @@ -25,7 +25,7 @@ */ public class ExecutionResult { - private int exitCode; + private final int exitCode; public ExecutionResult( int exitCode ) { Modified: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutionResult.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutionResult.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutionResult.java (original) +++ continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutionResult.java Tue Apr 14 16:28:12 2009 @@ -27,9 +27,9 @@ */ public class ContinuumBuildExecutionResult { - private File output; + private final File output; - private int exitCode; + private final int exitCode; public ContinuumBuildExecutionResult( File output, int exitCode ) { Modified: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java (original) +++ continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java Tue Apr 14 16:28:12 2009 @@ -66,8 +66,8 @@ public static final String ERROR_MISSING_NOTIFIER_TYPE = "add.project.missing.notifier.type.error"; - public static final String ERROR_MISSING_NOTIFIER_CONFIGURATION = - "add.project.missing.notifier.configuration.error"; + public static final String ERROR_MISSING_NOTIFIER_CONFIGURATION = "add.project.missing.notifier.configuration.error" + ; public static final String ERROR_METADATA_TRANSFER = "add.project.metadata.transfer.error"; @@ -83,13 +83,13 @@ public static final String ERROR_UNKNOWN = "add.project.unknown.error"; - private List projects = new ArrayList(); + private final List projects = new ArrayList(); - private List projectGroups = new ArrayList(); + private final List projectGroups = new ArrayList(); - private Map errors = new HashMap(); - - public static final String LS = System.getProperty( "line.separator" ); + private final Map errors = new HashMap(); + + private static final String LS = System.getProperty( "line.separator" ); public void addProject( Project project ) { @@ -184,11 +184,11 @@ { return new ArrayList( errors.keySet() ); } - - public Map getErrorsWithCause() + + public Map getErrorsWithCause() { return errors; - } + } /** * Quick check to see if there are any errors. Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java Tue Apr 14 16:28:12 2009 @@ -24,18 +24,18 @@ public interface ContinuumBuildAgentService { - void buildProjects( List projectsBuildContext ) + void buildProjects( List> projectsBuildContext ) throws ContinuumBuildAgentException; - - List getAvailableInstallations() + + List> getAvailableInstallations() throws ContinuumBuildAgentException; - Map getBuildResult( int projectId ) + Map getBuildResult( int projectId ) throws ContinuumBuildAgentException; - + int getProjectCurrentlyBuilding() throws ContinuumBuildAgentException; - + void cancelBuild() throws ContinuumBuildAgentException; @@ -45,19 +45,20 @@ String getProjectFileContent( int projectId, String directory, String filename ) throws ContinuumBuildAgentException; - Map getReleasePluginParameters( int projectId, String pomFilename ) + Map getReleasePluginParameters( int projectId, String pomFilename ) throws ContinuumBuildAgentException; List> processProject( int projectId, String pomFilename, boolean autoVersionSubmodules ) throws ContinuumBuildAgentException; - String releasePrepare( Map project, Map properties, Map releaseVersion, Map developmentVersion, Map environments ) + String releasePrepare( Map project, Map properties, Map releaseVersion, Map developmentVersion, + Map environments ) throws ContinuumBuildAgentException; - Map getReleaseResult( String releaseId ) + Map getReleaseResult( String releaseId ) throws ContinuumBuildAgentException; - Map getListener( String releaseId ) + Map getListener( String releaseId ) throws ContinuumBuildAgentException; void removeListener( String releaseId ) @@ -69,8 +70,9 @@ void releasePerform( String releaseId, String goals, String arguments, boolean useReleaseProfile, Map repository ) throws ContinuumBuildAgentException; - String releasePerformFromScm( String goals, String arguments, boolean useReleaseProfile, Map repository, String scmUrl, String scmUsername, - String scmPassword, String scmTag, String scmTagBase, Map environments ) + String releasePerformFromScm( String goals, String arguments, boolean useReleaseProfile, Map repository, + String scmUrl, String scmUsername, String scmPassword, String scmTag, + String scmTagBase, Map environments ) throws ContinuumBuildAgentException; String releaseCleanup( String releaseId ) Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java Tue Apr 14 16:28:12 2009 @@ -67,7 +67,7 @@ public class ContinuumBuildAgentServiceImpl implements ContinuumBuildAgentService { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( ContinuumBuildAgentServiceImpl.class ); /** * @plexus.requirement @@ -94,7 +94,7 @@ */ private BuildAgentReleaseManager buildAgentReleaseManager; - public void buildProjects( List projectsBuildContext ) + public void buildProjects( List> projectsBuildContext ) throws ContinuumBuildAgentException { List buildContextList = initializeBuildContext( projectsBuildContext ); @@ -117,17 +117,17 @@ } - public List getAvailableInstallations() + public List> getAvailableInstallations() throws ContinuumBuildAgentException { - List installationsList = new ArrayList(); - + List> installationsList = new ArrayList>(); + List installations = buildAgentConfigurationService.getAvailableInstallations(); for ( Installation installation : installations ) { - Map map = new HashMap(); - + Map map = new HashMap(); + if ( StringUtils.isBlank( installation.getName() ) ) { map.put( ContinuumBuildAgentUtil.KEY_INSTALLATION_NAME, "" ); @@ -170,18 +170,18 @@ return installationsList; } - public Map getBuildResult( int projectId ) + public Map getBuildResult( int projectId ) throws ContinuumBuildAgentException { - Map result = new HashMap(); + Map result = new HashMap(); if ( projectId == getProjectCurrentlyBuilding() ) { BuildContext buildContext = buildContextManager.getBuildContext( projectId ); - - result.put( ContinuumBuildAgentUtil.KEY_PROJECT_ID, new Integer( buildContext.getProjectId() ) ); - result.put( ContinuumBuildAgentUtil.KEY_BUILD_DEFINITION_ID, new Integer( buildContext.getBuildDefinitionId() ) ); - result.put( ContinuumBuildAgentUtil.KEY_TRIGGER, new Integer( buildContext.getTrigger() ) ); + + result.put( ContinuumBuildAgentUtil.KEY_PROJECT_ID, buildContext.getProjectId() ); + result.put( ContinuumBuildAgentUtil.KEY_BUILD_DEFINITION_ID, buildContext.getBuildDefinitionId() ); + result.put( ContinuumBuildAgentUtil.KEY_TRIGGER, buildContext.getTrigger() ); BuildResult buildResult = buildContext.getBuildResult(); @@ -189,11 +189,12 @@ { if ( buildResult.getStartTime() <= 0 ) { - result.put( ContinuumBuildAgentUtil.KEY_START_TIME, new Long( buildContext.getBuildStartTime() ).toString() ); + result.put( ContinuumBuildAgentUtil.KEY_START_TIME, + Long.toString( buildContext.getBuildStartTime() ) ); } else { - result.put( ContinuumBuildAgentUtil.KEY_START_TIME, new Long( buildResult.getStartTime() ).toString() ); + result.put( ContinuumBuildAgentUtil.KEY_START_TIME, Long.toString( buildResult.getStartTime() ) ); } if ( buildResult.getError() == null ) @@ -205,19 +206,19 @@ result.put( ContinuumBuildAgentUtil.KEY_BUILD_ERROR, buildResult.getError() ); } - result.put( ContinuumBuildAgentUtil.KEY_BUILD_STATE, new Integer( buildResult.getState() ) ); - result.put( ContinuumBuildAgentUtil.KEY_END_TIME, new Long( buildResult.getEndTime() ).toString() ); + result.put( ContinuumBuildAgentUtil.KEY_BUILD_STATE, buildResult.getState() ); + result.put( ContinuumBuildAgentUtil.KEY_END_TIME, Long.toString( buildResult.getEndTime() ) ); result.put( ContinuumBuildAgentUtil.KEY_BUILD_EXIT_CODE, buildResult.getExitCode() ); } else { - result.put( ContinuumBuildAgentUtil.KEY_START_TIME, new Long( buildContext.getBuildStartTime() ).toString() ); - result.put( ContinuumBuildAgentUtil.KEY_END_TIME, new Long( 0 ).toString() ); - result.put( ContinuumBuildAgentUtil.KEY_BUILD_STATE, new Integer( ContinuumProjectState.BUILDING ) ); + result.put( ContinuumBuildAgentUtil.KEY_START_TIME, Long.toString( buildContext.getBuildStartTime() ) ); + result.put( ContinuumBuildAgentUtil.KEY_END_TIME, Long.toString( 0 ) ); + result.put( ContinuumBuildAgentUtil.KEY_BUILD_STATE, ContinuumProjectState.BUILDING ); result.put( ContinuumBuildAgentUtil.KEY_BUILD_ERROR, "" ); - result.put( ContinuumBuildAgentUtil.KEY_BUILD_EXIT_CODE, new Integer( 0 ) ); + result.put( ContinuumBuildAgentUtil.KEY_BUILD_EXIT_CODE, 0 ); } - + String buildOutput = getBuildOutputText( projectId ); if ( buildOutput == null ) { @@ -228,7 +229,8 @@ result.put( ContinuumBuildAgentUtil.KEY_BUILD_OUTPUT, buildOutput ); } - result.put( ContinuumBuildAgentUtil.KEY_SCM_RESULT, ContinuumBuildAgentUtil.createScmResult( buildContext ) ); + result.put( ContinuumBuildAgentUtil.KEY_SCM_RESULT, + ContinuumBuildAgentUtil.createScmResult( buildContext ) ); } return result; } @@ -259,7 +261,8 @@ } } - public String generateWorkingCopyContent( int projectId, String userDirectory, String baseUrl, String imagesBaseUrl ) + public String generateWorkingCopyContent( int projectId, String userDirectory, String baseUrl, + String imagesBaseUrl ) throws ContinuumBuildAgentException { File workingDirectory = buildAgentConfigurationService.getWorkingDirectory( projectId ); @@ -273,7 +276,7 @@ { log.error( "Failed to generate working copy content", e ); } - + return ""; } @@ -304,10 +307,10 @@ } } - public Map getReleasePluginParameters( int projectId, String pomFilename ) + public Map getReleasePluginParameters( int projectId, String pomFilename ) throws ContinuumBuildAgentException { - Map releaseParameters = new HashMap(); + Map releaseParameters = new HashMap(); String workingDirectory = buildAgentConfigurationService.getWorkingDirectory( projectId ).getPath(); @@ -315,7 +318,7 @@ try { Model model = pomReader.read( new FileReader( new File( workingDirectory, pomFilename ) ) ); - + if ( model.getBuild() != null && model.getBuild().getPlugins() != null ) { for ( Plugin plugin : (List) model.getBuild().getPlugins() ) @@ -324,7 +327,7 @@ plugin.getArtifactId() != null && plugin.getArtifactId().equals( "maven-release-plugin" ) ) { Xpp3Dom dom = (Xpp3Dom) plugin.getConfiguration(); - + if ( dom != null ) { Xpp3Dom configuration = dom.getChild( "releaseLabel" ); @@ -336,7 +339,7 @@ { releaseParameters.put( ContinuumBuildAgentUtil.KEY_SCM_TAG, "" ); } - + configuration = dom.getChild( "tag" ); if ( configuration != null ) { @@ -346,76 +349,82 @@ { releaseParameters.put( ContinuumBuildAgentUtil.KEY_SCM_TAG, "" ); } - - + configuration = dom.getChild( "tagBase" ); if ( configuration != null ) { - releaseParameters.put( ContinuumBuildAgentUtil.KEY_SCM_TAGBASE, configuration.getValue() ); + releaseParameters.put( ContinuumBuildAgentUtil.KEY_SCM_TAGBASE, + configuration.getValue() ); } else { releaseParameters.put( ContinuumBuildAgentUtil.KEY_SCM_TAGBASE, "" ); } - + configuration = dom.getChild( "preparationGoals" ); if ( configuration != null ) { - releaseParameters.put( ContinuumBuildAgentUtil.KEY_PREPARE_GOALS, configuration.getValue() ); + releaseParameters.put( ContinuumBuildAgentUtil.KEY_PREPARE_GOALS, + configuration.getValue() ); } else { releaseParameters.put( ContinuumBuildAgentUtil.KEY_PREPARE_GOALS, "" ); } - + configuration = dom.getChild( "arguments" ); if ( configuration != null ) { - releaseParameters.put( ContinuumBuildAgentUtil.KEY_ARGUMENTS, configuration.getValue() ); + releaseParameters.put( ContinuumBuildAgentUtil.KEY_ARGUMENTS, + configuration.getValue() ); } else { releaseParameters.put( ContinuumBuildAgentUtil.KEY_ARGUMENTS, "" ); } - + configuration = dom.getChild( "scmCommentPrefix" ); if ( configuration != null ) { - releaseParameters.put( ContinuumBuildAgentUtil.KEY_SCM_COMMENT_PREFIX, configuration.getValue() ); + releaseParameters.put( ContinuumBuildAgentUtil.KEY_SCM_COMMENT_PREFIX, + configuration.getValue() ); } else { releaseParameters.put( ContinuumBuildAgentUtil.KEY_SCM_COMMENT_PREFIX, "" ); } - + configuration = dom.getChild( "autoVersionSubmodules" ); if ( configuration != null ) { - releaseParameters.put( ContinuumBuildAgentUtil.KEY_AUTO_VERSION_SUBMODULES, Boolean.valueOf( configuration.getValue() ) ); + releaseParameters.put( ContinuumBuildAgentUtil.KEY_AUTO_VERSION_SUBMODULES, + Boolean.valueOf( configuration.getValue() ) ); } else { - releaseParameters.put( ContinuumBuildAgentUtil.KEY_AUTO_VERSION_SUBMODULES, new Boolean( false ) ); + releaseParameters.put( ContinuumBuildAgentUtil.KEY_AUTO_VERSION_SUBMODULES, false ); } - + configuration = dom.getChild( "addSchema" ); if ( configuration != null ) { - releaseParameters.put( ContinuumBuildAgentUtil.KEY_ADD_SCHEMA, Boolean.valueOf( configuration.getValue() ) ); + releaseParameters.put( ContinuumBuildAgentUtil.KEY_ADD_SCHEMA, + Boolean.valueOf( configuration.getValue() ) ); } else { - releaseParameters.put( ContinuumBuildAgentUtil.KEY_ADD_SCHEMA, new Boolean( false ) ); + releaseParameters.put( ContinuumBuildAgentUtil.KEY_ADD_SCHEMA, false ); } configuration = dom.getChild( "useReleaseProfile" ); if ( configuration != null ) { - releaseParameters.put( ContinuumBuildAgentUtil.KEY_USE_RELEASE_PROFILE, Boolean.valueOf( configuration.getValue() ) ); + releaseParameters.put( ContinuumBuildAgentUtil.KEY_USE_RELEASE_PROFILE, + Boolean.valueOf( configuration.getValue() ) ); } else { - releaseParameters.put( ContinuumBuildAgentUtil.KEY_USE_RELEASE_PROFILE, new Boolean( false ) ); + releaseParameters.put( ContinuumBuildAgentUtil.KEY_USE_RELEASE_PROFILE, false ); } configuration = dom.getChild( "goals" ); @@ -423,7 +432,7 @@ { String goals = configuration.getValue(); if ( model.getDistributionManagement() != null && - model.getDistributionManagement().getSite() != null ) + model.getDistributionManagement().getSite() != null ) { goals += "site-deploy"; } @@ -447,7 +456,7 @@ return releaseParameters; } - public List>processProject( int projectId, String pomFilename, boolean autoVersionSubmodules ) + public List> processProject( int projectId, String pomFilename, boolean autoVersionSubmodules ) throws ContinuumBuildAgentException { List> projects = new ArrayList>(); @@ -466,12 +475,14 @@ return projects; } - public String releasePrepare( Map project, Map properties, Map releaseVersion, Map developmentVersion, Map environments ) + public String releasePrepare( Map project, Map properties, Map releaseVersion, Map developmentVersion, + Map environments ) throws ContinuumBuildAgentException { try { - return buildAgentReleaseManager.releasePrepare( project, properties, releaseVersion, developmentVersion, environments ); + return buildAgentReleaseManager.releasePrepare( project, properties, releaseVersion, developmentVersion, + environments ); } catch ( ContinuumReleaseException e ) { @@ -479,21 +490,21 @@ } } - public Map getReleaseResult( String releaseId ) + public Map getReleaseResult( String releaseId ) throws ContinuumBuildAgentException { ReleaseResult result = buildAgentReleaseManager.getReleaseResult( releaseId ); - Map map = new HashMap(); - map.put( ContinuumBuildAgentUtil.KEY_START_TIME, new Long( result.getStartTime() ).toString() ); - map.put( ContinuumBuildAgentUtil.KEY_END_TIME, new Long( result.getEndTime() ).toString() ); - map.put( ContinuumBuildAgentUtil.KEY_RELEASE_RESULT_CODE, new Integer( result.getResultCode() ) ); + Map map = new HashMap(); + map.put( ContinuumBuildAgentUtil.KEY_START_TIME, Long.toString( result.getStartTime() ) ); + map.put( ContinuumBuildAgentUtil.KEY_END_TIME, Long.toString( result.getEndTime() ) ); + map.put( ContinuumBuildAgentUtil.KEY_RELEASE_RESULT_CODE, result.getResultCode() ); map.put( ContinuumBuildAgentUtil.KEY_RELEASE_OUTPUT, result.getOutput() ); return map; } - public Map getListener( String releaseId ) + public Map getListener( String releaseId ) throws ContinuumBuildAgentException { return buildAgentReleaseManager.getListener( releaseId ); @@ -509,7 +520,8 @@ return buildAgentReleaseManager.getPreparedReleaseName( releaseId ); } - public void releasePerform( String releaseId, String goals, String arguments, boolean useReleaseProfile, Map repository ) + public void releasePerform( String releaseId, String goals, String arguments, boolean useReleaseProfile, + Map repository ) throws ContinuumBuildAgentException { try @@ -522,15 +534,16 @@ } } - public String releasePerformFromScm( String goals, String arguments, boolean useReleaseProfile, Map repository, String scmUrl, - String scmUsername, String scmPassword, String scmTag, String scmTagBase, - Map environments ) + public String releasePerformFromScm( String goals, String arguments, boolean useReleaseProfile, Map repository, + String scmUrl, String scmUsername, String scmPassword, String scmTag, + String scmTagBase, Map environments ) throws ContinuumBuildAgentException { try { - return buildAgentReleaseManager.releasePerformFromScm( goals, arguments, useReleaseProfile, repository, scmUrl, - scmUsername, scmPassword, scmTag, scmTagBase, environments ); + return buildAgentReleaseManager.releasePerformFromScm( goals, arguments, useReleaseProfile, repository, + scmUrl, scmUsername, scmPassword, scmTag, scmTagBase, + environments ); } catch ( ContinuumReleaseException e ) { @@ -557,7 +570,8 @@ } } - private void processProject( String workingDirectory, String pomFilename, boolean autoVersionSubmodules, List> projects ) + private void processProject( String workingDirectory, String pomFilename, boolean autoVersionSubmodules, + List> projects ) throws Exception { MavenXpp3Reader pomReader = new MavenXpp3Reader(); @@ -579,7 +593,8 @@ { for ( Iterator modules = model.getModules().iterator(); modules.hasNext(); ) { - processProject( workingDirectory + "/" + modules.next().toString(), "pom.xml", autoVersionSubmodules, projects ); + processProject( workingDirectory + "/" + modules.next().toString(), "pom.xml", autoVersionSubmodules, + projects ); } } } @@ -605,11 +620,11 @@ projects.add( params ); } - private List initializeBuildContext( List projectsBuildContext ) + private List initializeBuildContext( List> projectsBuildContext ) { List buildContext = new ArrayList(); - - for ( Map map : projectsBuildContext ) + + for ( Map map : projectsBuildContext ) { BuildContext context = new BuildContext(); context.setProjectId( ContinuumBuildAgentUtil.getProjectId( map ) ); @@ -649,7 +664,7 @@ try { File buildOutputFile = buildAgentConfigurationService.getBuildOutputFile( projectId ); - + if ( buildOutputFile.exists() ) { return StringEscapeUtils.escapeHtml( FileUtils.fileRead( buildOutputFile ) ); @@ -664,15 +679,15 @@ return null; } - private ScmResult getScmResult( List scmChanges ) + private ScmResult getScmResult( List> scmChanges ) { ScmResult scmResult = null; if ( scmChanges != null && scmChanges.size() > 0 ) { scmResult = new ScmResult(); - - for ( Map map : scmChanges ) + + for ( Map map : scmChanges ) { ChangeSet changeSet = new ChangeSet(); changeSet.setAuthor( ContinuumBuildAgentUtil.getChangeSetAuthor( map ) ); @@ -686,13 +701,13 @@ return scmResult; } - private void setChangeFiles( ChangeSet changeSet, Map context ) + private void setChangeFiles( ChangeSet changeSet, Map context ) { - List files = ContinuumBuildAgentUtil.getChangeSetFiles( context ); + List> files = ContinuumBuildAgentUtil.getChangeSetFiles( context ); if ( files != null ) { - for ( Map map : files ) + for ( Map map : files ) { ChangeFile changeFile = new ChangeFile(); changeFile.setName( ContinuumBuildAgentUtil.getChangeFileName( map ) ); @@ -707,14 +722,11 @@ private PrepareBuildProjectsTask createPrepareBuildProjectsTask( List buildContexts ) throws ContinuumBuildAgentException { - if ( buildContexts != null && buildContexts.size() > 0 ) + if ( buildContexts != null && buildContexts.size() > 0 ) { - BuildContext context = (BuildContext) buildContexts.get( 0 ); - PrepareBuildProjectsTask task = new PrepareBuildProjectsTask( buildContexts, - context.getTrigger(), - context.getProjectGroupId(), - context.getScmRootAddress() ); - return task; + BuildContext context = buildContexts.get( 0 ); + return new PrepareBuildProjectsTask( buildContexts, context.getTrigger(), context.getProjectGroupId(), + context.getScmRootAddress() ); } else { Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java Tue Apr 14 16:28:12 2009 @@ -28,7 +28,6 @@ import org.apache.continuum.buildagent.utils.ContinuumBuildAgentUtil; import org.apache.continuum.scm.ContinuumScm; import org.apache.continuum.scm.ContinuumScmConfiguration; -import org.apache.maven.continuum.model.project.BuildDefinition; import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.model.scm.ScmResult; import org.apache.maven.scm.ScmException; @@ -57,7 +56,6 @@ throws Exception { Project project = ContinuumBuildAgentUtil.getProject( context ); - BuildDefinition buildDefinition = ContinuumBuildAgentUtil.getBuildDefinition( context ); File workingDirectory = buildAgentConfigurationService.getWorkingDirectory( project.getId() ); Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CreateBuildProjectTaskAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CreateBuildProjectTaskAction.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CreateBuildProjectTaskAction.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CreateBuildProjectTaskAction.java Tue Apr 14 16:28:12 2009 @@ -39,7 +39,7 @@ public class CreateBuildProjectTaskAction extends AbstractAction { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( CreateBuildProjectTaskAction.class ); /** * @plexus.requirement @@ -53,12 +53,10 @@ for ( BuildContext buildContext : buildContexts ) { - BuildProjectTask buildProjectTask = new BuildProjectTask( buildContext.getProjectId(), - buildContext.getBuildDefinitionId(), - buildContext.getTrigger(), - buildContext.getProjectName(), - "", - buildContext.getScmResult() ); + BuildProjectTask buildProjectTask = + new BuildProjectTask( buildContext.getProjectId(), buildContext.getBuildDefinitionId(), + buildContext.getTrigger(), buildContext.getProjectName(), "", + buildContext.getScmResult() ); buildProjectTask.setMaxExecutionTime( buildContext.getMaxExecutionTime() * 1000 ); try @@ -71,12 +69,14 @@ catch ( TaskQueueException e ) { log.error( "Error while enqueing build task for project " + buildContext.getProjectId(), e ); - throw new ContinuumException( "Error while enqueuing build task for project " + buildContext.getProjectId(), e ); + throw new ContinuumException( + "Error while enqueuing build task for project " + buildContext.getProjectId(), e ); } catch ( TaskQueueManagerException e ) { log.error( "Error while checking if project " + buildContext.getProjectId() + " is in build queue", e ); - throw new ContinuumException( "Error while checking if project " + buildContext.getProjectId() + " is in build queue", e ); + throw new ContinuumException( + "Error while checking if project " + buildContext.getProjectId() + " is in build queue", e ); } } @@ -85,8 +85,8 @@ boolean stop = false; while ( !stop ) { - if ( buildAgentTaskQueueManager.getCurrentProjectInBuilding() <= 0 && - !buildAgentTaskQueueManager.hasBuildTaskInQueue() ) + if ( buildAgentTaskQueueManager.getCurrentProjectInBuilding() <= 0 && + !buildAgentTaskQueueManager.hasBuildTaskInQueue() ) { stop = true; } Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateProjectFromWorkingDirectoryAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateProjectFromWorkingDirectoryAction.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateProjectFromWorkingDirectoryAction.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateProjectFromWorkingDirectoryAction.java Tue Apr 14 16:28:12 2009 @@ -14,22 +14,22 @@ import org.slf4j.LoggerFactory; /** - * @plexus.component role="org.codehaus.plexus.action.Action" + * @plexus.component role="org.codehaus.plexus.action.Action" * role-hint="update-project-from-agent-working-directory" */ public class UpdateProjectFromWorkingDirectoryAction extends AbstractAction { - private Logger logger = LoggerFactory.getLogger( getClass() ); + private static final Logger logger = LoggerFactory.getLogger( UpdateProjectFromWorkingDirectoryAction.class ); /** - * @plexus.requirement - */ + * @plexus.requirement + */ private BuildAgentBuildExecutorManager buildAgentBuildExecutorManager; /** - * @plexus.requirement - */ + * @plexus.requirement + */ private BuildAgentConfigurationService buildAgentConfigurationService; public void execute( Map context ) @@ -43,7 +43,8 @@ File workingDirectory = buildAgentConfigurationService.getWorkingDirectory( project.getId() ); - ContinuumAgentBuildExecutor buildExecutor = buildAgentBuildExecutorManager.getBuildExecutor( project.getExecutorId() ); + ContinuumAgentBuildExecutor buildExecutor = + buildAgentBuildExecutorManager.getBuildExecutor( project.getExecutorId() ); buildExecutor.updateProjectFromWorkingDirectory( workingDirectory, project, buildDefinition ); } Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java Tue Apr 14 16:28:12 2009 @@ -52,7 +52,7 @@ public abstract class AbstractBuildExecutor implements ContinuumAgentBuildExecutor, Initializable { - protected Logger log = LoggerFactory.getLogger( getClass() ); + protected static final Logger log = LoggerFactory.getLogger( AbstractBuildExecutor.class ); /** * @plexus.requirement @@ -88,7 +88,7 @@ // // ---------------------------------------------------------------------- - private String id; + private final String id; private boolean resolveExecutable; @@ -317,7 +317,7 @@ protected void updateProject( Project project ) throws ContinuumAgentBuildExecutorException { - Map projectMap = new HashMap(); + Map projectMap = new HashMap(); projectMap.put( ContinuumBuildAgentUtil.KEY_PROJECT_ID, project.getId() ); projectMap.put( ContinuumBuildAgentUtil.KEY_PROJECT_VERSION, project.getVersion() ); @@ -380,15 +380,15 @@ } } - protected List getProjectDevelopers( List developers ) + protected List> getProjectDevelopers( List developers ) { - List pDevelopers = new ArrayList(); + List> pDevelopers = new ArrayList>(); if ( developers != null ) { for ( ProjectDeveloper developer : developers ) { - Map map = new HashMap(); + Map map = new HashMap(); map.put( ContinuumBuildAgentUtil.KEY_PROJECT_DEVELOPER_NAME, developer.getName() ); map.put( ContinuumBuildAgentUtil.KEY_PROJECT_DEVELOPER_EMAIL, developer.getEmail() ); map.put( ContinuumBuildAgentUtil.KEY_PROJECT_DEVELOPER_SCMID, developer.getScmId() ); @@ -399,9 +399,9 @@ return pDevelopers; } - protected Map getProjectParent( ProjectDependency parent ) + protected Map getProjectParent( ProjectDependency parent ) { - Map map = new HashMap(); + Map map = new HashMap(); if ( parent != null ) { @@ -412,15 +412,15 @@ return map; } - protected List getProjectDependencies( List dependencies ) + protected List> getProjectDependencies( List dependencies ) { - List pDependencies = new ArrayList(); + List> pDependencies = new ArrayList>(); if ( dependencies != null ) { for ( ProjectDependency dependency : dependencies ) { - Map map = new HashMap(); + Map map = new HashMap(); map.put( ContinuumBuildAgentUtil.KEY_GROUP_ID, dependency.getGroupId() ); map.put( ContinuumBuildAgentUtil.KEY_ARTIFACT_ID, dependency.getArtifactId() ); if ( StringUtils.isNotBlank( dependency.getVersion() ) ) @@ -438,15 +438,16 @@ return pDependencies; } - protected List getProjectNotifiers( List notifiers ) + //TODO: Check the content of this method, it always return an empty list + protected List> getProjectNotifiers( List notifiers ) { - List pNotifiers = new ArrayList(); + List> pNotifiers = new ArrayList>(); if ( notifiers != null ) { for ( ProjectNotifier notifier : notifiers ) { - Map map = new HashMap(); + Map map = new HashMap(); if ( notifier.getConfiguration() != null ) { Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java Tue Apr 14 16:28:12 2009 @@ -23,9 +23,9 @@ public class ContinuumAgentBuildExecutionResult { - private File output; + private final File output; - private int exitCode; + private final int exitCode; public ContinuumAgentBuildExecutionResult( File output, int exitCode ) { Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java Tue Apr 14 16:28:12 2009 @@ -34,7 +34,7 @@ public class DefaultBuildAgentBuildExecutorManager implements BuildAgentBuildExecutorManager { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( DefaultBuildAgentBuildExecutorManager.class ); /** * @plexus.requirement role="org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutor" Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/DefaultBuildAgentMavenOneMetadataHelper.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/DefaultBuildAgentMavenOneMetadataHelper.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/DefaultBuildAgentMavenOneMetadataHelper.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/DefaultBuildAgentMavenOneMetadataHelper.java Tue Apr 14 16:28:12 2009 @@ -45,7 +45,7 @@ public class DefaultBuildAgentMavenOneMetadataHelper implements BuildAgentMavenOneMetadataHelper { - private Logger log = LoggerFactory.getLogger( getClass() ); + private static final Logger log = LoggerFactory.getLogger( DefaultBuildAgentMavenOneMetadataHelper.class ); public void mapMetadata( ContinuumProjectBuildingResult result, File metadata, Project project ) throws BuildAgentMavenOneMetadataHelperException Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java Tue Apr 14 16:28:12 2009 @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.StringWriter; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.apache.maven.artifact.manager.WagonManager; @@ -81,7 +80,7 @@ public class DefaultBuildAgentMavenBuilderHelper implements BuildAgentMavenBuilderHelper, Contextualizable, Initializable { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( DefaultBuildAgentMavenBuilderHelper.class ); /** * @plexus.requirement @@ -154,9 +153,8 @@ if ( validationResult != null && validationResult.getMessageCount() > 0 ) { - for ( Iterator i = validationResult.getMessages().iterator(); i.hasNext(); ) + for ( String valmsg : (List) validationResult.getMessages() ) { - String valmsg = i.next(); result.addError( ContinuumProjectBuildingResult.ERROR_VALIDATION, valmsg ); messages.append( valmsg ); messages.append( "\n" ); @@ -702,10 +700,8 @@ proxy.getPassword(), proxy.getNonProxyHosts() ); } - for ( Iterator i = settings.getServers().iterator(); i.hasNext(); ) + for ( Server server : (List) settings.getServers() ) { - Server server = i.next(); - wagonManager.addAuthenticationInfo( server.getId(), server.getUsername(), server.getPassword(), server.getPrivateKey(), server.getPassphrase() ); @@ -718,10 +714,8 @@ } } - for ( Iterator i = settings.getMirrors().iterator(); i.hasNext(); ) + for ( Mirror mirror : (List) settings.getMirrors() ) { - Mirror mirror = i.next(); - wagonManager.addMirror( mirror.getId(), mirror.getMirrorOf(), mirror.getUrl() ); } } Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java Tue Apr 14 16:28:12 2009 @@ -36,7 +36,7 @@ public class DefaultBuildAgentConfiguration implements BuildAgentConfiguration { - private Logger log = LoggerFactory.getLogger( getClass() ); + private static final Logger log = LoggerFactory.getLogger( DefaultBuildAgentConfiguration.class ); private File configurationFile; Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java Tue Apr 14 16:28:12 2009 @@ -13,7 +13,7 @@ public class DefaultBuildAgentConfigurationService implements BuildAgentConfigurationService { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( DefaultBuildAgentConfigurationService.class ); @Resource private BuildAgentConfiguration buildAgentConfiguration; @@ -80,7 +80,7 @@ throws BuildAgentConfigurationException { File file = getBuildOutputFile( projectId ); - + try { if ( file.exists() ) @@ -95,7 +95,7 @@ catch ( IOException e ) { log.warn( "Error reading build output for project '" + projectId + "'.", e ); - + return null; } } @@ -107,8 +107,8 @@ if ( !dir.exists() && !dir.mkdirs() ) { - throw new BuildAgentConfigurationException( - "Could not make the build output directory: " + "'" + dir.getAbsolutePath() + "'." ); + throw new BuildAgentConfigurationException( + "Could not make the build output directory: " + "'" + dir.getAbsolutePath() + "'." ); } return new File( dir, "build.log.txt" ); Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentReleaseManager.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentReleaseManager.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentReleaseManager.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentReleaseManager.java Tue Apr 14 16:28:12 2009 @@ -28,12 +28,13 @@ { String ROLE = BuildAgentReleaseManager.class.getName(); - String releasePrepare( Map project, Map properties, Map releaseVersion, Map developmentVersion, Map environments ) + String releasePrepare( Map project, Map properties, Map releaseVersion, Map developmentVersion, + Map environments ) throws ContinuumReleaseException; ReleaseResult getReleaseResult( String releaseId ); - Map getListener( String releaseId ); + Map getListener( String releaseId ); void removeListener( String releaseId ); @@ -42,8 +43,9 @@ void releasePerform( String releaseId, String goals, String arguments, boolean useReleaseProfile, Map repository ) throws ContinuumReleaseException; - String releasePerformFromScm( String goals, String arguments, boolean useReleaseProfile, Map repository, String scmUrl, String scmUsername, - String scmPassword, String scmTag, String scmTagBase, Map environments ) + String releasePerformFromScm( String goals, String arguments, boolean useReleaseProfile, Map repository, + String scmUrl, String scmUsername, String scmPassword, String scmTag, + String scmTagBase, Map environments ) throws ContinuumReleaseException; String releaseCleanup( String releaseId ); Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java Tue Apr 14 16:28:12 2009 @@ -35,7 +35,7 @@ public class DefaultBuildAgentManager implements BuildAgentManager { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( DefaultBuildAgentManager.class ); /** * @plexus.requirement @@ -47,14 +47,17 @@ { try { - MasterBuildAgentTransportClient client = new MasterBuildAgentTransportClient( - new URL( buildAgentConfigurationService.getContinuumServerUrl() ) ); + MasterBuildAgentTransportClient client = + new MasterBuildAgentTransportClient( new URL( buildAgentConfigurationService.getContinuumServerUrl() ) ) + ; client.startProjectBuild( projectId ); } catch ( MalformedURLException e ) { - log.error( "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); - throw new ContinuumException( "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); + log.error( + "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); + throw new ContinuumException( + "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); } catch ( Exception e ) { @@ -68,14 +71,17 @@ { try { - MasterBuildAgentTransportClient client = new MasterBuildAgentTransportClient( - new URL( buildAgentConfigurationService.getContinuumServerUrl() ) ); + MasterBuildAgentTransportClient client = + new MasterBuildAgentTransportClient( new URL( buildAgentConfigurationService.getContinuumServerUrl() ) ) + ; client.returnBuildResult( buildResult ); } catch ( MalformedURLException e ) { - log.error( "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); - throw new ContinuumException( "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); + log.error( + "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); + throw new ContinuumException( + "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); } catch ( Exception e ) { @@ -89,14 +95,17 @@ { try { - MasterBuildAgentTransportClient client = new MasterBuildAgentTransportClient( - new URL( buildAgentConfigurationService.getContinuumServerUrl() ) ); + MasterBuildAgentTransportClient client = + new MasterBuildAgentTransportClient( new URL( buildAgentConfigurationService.getContinuumServerUrl() ) ) + ; return client.getEnvironments( buildDefinitionId, installationType ); } catch ( MalformedURLException e ) { - log.error( "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); - throw new ContinuumException( "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); + log.error( + "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); + throw new ContinuumException( + "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); } catch ( Exception e ) { @@ -110,14 +119,17 @@ { try { - MasterBuildAgentTransportClient client = new MasterBuildAgentTransportClient( - new URL( buildAgentConfigurationService.getContinuumServerUrl() ) ); + MasterBuildAgentTransportClient client = + new MasterBuildAgentTransportClient( new URL( buildAgentConfigurationService.getContinuumServerUrl() ) ) + ; client.updateProject( project ); } catch ( MalformedURLException e ) { - log.error( "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); - throw new ContinuumException( "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); + log.error( + "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); + throw new ContinuumException( + "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); } catch ( Exception e ) { @@ -131,14 +143,17 @@ { try { - MasterBuildAgentTransportClient client = new MasterBuildAgentTransportClient( - new URL( buildAgentConfigurationService.getContinuumServerUrl() ) ); + MasterBuildAgentTransportClient client = + new MasterBuildAgentTransportClient( new URL( buildAgentConfigurationService.getContinuumServerUrl() ) ) + ; return client.shouldBuild( context ); } catch ( MalformedURLException e ) { - log.error( "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); - throw new ContinuumException( "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); + log.error( + "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); + throw new ContinuumException( + "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); } catch ( Exception e ) { @@ -152,14 +167,17 @@ { try { - MasterBuildAgentTransportClient client = new MasterBuildAgentTransportClient( - new URL( buildAgentConfigurationService.getContinuumServerUrl() ) ); + MasterBuildAgentTransportClient client = + new MasterBuildAgentTransportClient( new URL( buildAgentConfigurationService.getContinuumServerUrl() ) ) + ; client.startPrepareBuild( context ); } catch ( MalformedURLException e ) { - log.error( "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); - throw new ContinuumException( "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'", e ); + log.error( + "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); + throw new ContinuumException( + "Invalid continuum server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'", e ); } catch ( Exception e ) { @@ -173,13 +191,15 @@ { try { - MasterBuildAgentTransportClient client = new MasterBuildAgentTransportClient( - new URL( buildAgentConfigurationService.getContinuumServerUrl() ) ); + MasterBuildAgentTransportClient client = + new MasterBuildAgentTransportClient( new URL( buildAgentConfigurationService.getContinuumServerUrl() ) ) + ; client.prepareBuildFinished( context ); } catch ( MalformedURLException e ) { - throw new ContinuumException( "Invalid Continuum Server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); + throw new ContinuumException( + "Invalid Continuum Server URL '" + buildAgentConfigurationService.getContinuumServerUrl() + "'" ); } catch ( Exception e ) {