You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2009/04/15 22:59:11 UTC
svn commit: r765355 [1/5] - in /continuum/trunk:
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/settings/
continuum-...
Author: evenisse
Date: Wed Apr 15 20:59:07 2009
New Revision: 765355
URL: http://svn.apache.org/viewvc?rev=765355&view=rev
Log:
merge -r 764862:764863 from 1.3.x branch
Removed:
continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/build/settings/BuildSettingsConstants.java
Modified:
continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java
continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java
continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/PrepareBuildProjectsTask.java
continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/shell/DefaultShellCommandHelper.java
continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java
continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutionResult.java
continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java
continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CreateBuildProjectTaskAction.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateProjectFromWorkingDirectoryAction.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/DefaultBuildAgentMavenOneMetadataHelper.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentReleaseManager.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentReleaseManager.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/PrepareBuildProjectsTask.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/PrepareBuildProjectsTaskExecutor.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/WorkingCopyContentGenerator.java
continuum/trunk/continuum-buildagent/continuum-buildagent-webapp/src/main/java/org/apache/continuum/web/startup/BuildAgentStartup.java
continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java
continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/ThreadedDistributedBuildTaskQueueExecutor.java
continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/deferred/DistributedBuildProjectTaskExecutorDeferred.java
continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/overall/DistributedBuildProjectTaskExecutorOverall.java
continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
continuum/trunk/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java
continuum/trunk/continuum-core/src/main/java/org/apache/continuum/release/distributed/DistributedReleaseUtil.java
continuum/trunk/continuum-core/src/main/java/org/apache/continuum/release/distributed/manager/DefaultDistributedReleaseManager.java
continuum/trunk/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java
continuum/trunk/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java
continuum/trunk/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java
continuum/trunk/continuum-core/src/main/java/org/apache/continuum/taskqueueexecutor/ParallelBuildsThreadedTaskQueueExecutor.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectGroupAction.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectGroupAction.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/console/ConsoleNotifier.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/manager/spring/NotifierFactoryBean.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/EasySSLSocketFactory.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/EasyX509TrustManager.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
continuum/trunk/continuum-core/src/test/java/org/apache/continuum/buildmanager/ParallelBuildsManagerTest.java
continuum/trunk/continuum-core/src/test/java/org/apache/continuum/notification/mail/MockJavaMailSender.java
continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/AddMaven2ProjectTest.java
continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutorTest.java
continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionServiceTest.java
continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataTest.java
continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java
continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m2/TestMavenBuilderHelper.java
continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java
continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java
continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java
continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java
continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java
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=765355&r1=765354&r2=765355&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 Wed Apr 15 20:59:07 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/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=765355&r1=765354&r2=765355&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 Wed Apr 15 20:59:07 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 <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @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/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=765355&r1=765354&r2=765355&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 Wed Apr 15 20:59:07 2009
@@ -26,17 +26,17 @@
public class PrepareBuildProjectsTask
implements Task
{
- private Map<Integer, Integer> projectsBuildDefinitionsMap;
+ private final Map<Integer, Integer> 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<Integer, Integer> projectsBuildDefinitionsMap, int trigger, int projectGroupId,
String projectGroupName, String scmRootAddress, int projectScmRootId )
@@ -60,21 +60,11 @@
return projectsBuildDefinitionsMap;
}
- public void setProjectsBuildDefinitionsMap( Map<Integer, Integer> 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/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=765355&r1=765354&r2=765355&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 Wed Apr 15 20:59:07 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/trunk/continuum-api/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/continuum/utils/shell/ExecutionResult.java Wed Apr 15 20:59:07 2009
@@ -25,7 +25,7 @@
*/
public class ExecutionResult
{
- private int exitCode;
+ private final int exitCode;
public ExecutionResult( int exitCode )
{
Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutionResult.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutionResult.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutionResult.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutionResult.java Wed Apr 15 20:59:07 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/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java (original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/project/builder/ContinuumProjectBuildingResult.java Wed Apr 15 20:59:07 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<Project> projects = new ArrayList<Project>();
+ private final List<Project> projects = new ArrayList<Project>();
- private List<ProjectGroup> projectGroups = new ArrayList<ProjectGroup>();
+ private final List<ProjectGroup> projectGroups = new ArrayList<ProjectGroup>();
- private Map<String, String> errors = new HashMap<String, String>();
-
- public static final String LS = System.getProperty( "line.separator" );
+ private final Map<String, String> errors = new HashMap<String, String>();
+
+ private static final String LS = System.getProperty( "line.separator" );
public void addProject( Project project )
{
@@ -184,11 +184,11 @@
{
return new ArrayList<String>( errors.keySet() );
}
-
- public Map<String,String> getErrorsWithCause()
+
+ public Map<String, String> getErrorsWithCause()
{
return errors;
- }
+ }
/**
* Quick check to see if there are any errors.
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java Wed Apr 15 20:59:07 2009
@@ -24,18 +24,18 @@
public interface ContinuumBuildAgentService
{
- void buildProjects( List<Map> projectsBuildContext )
+ void buildProjects( List<Map<String, Object>> projectsBuildContext )
throws ContinuumBuildAgentException;
-
- List<Map> getAvailableInstallations()
+
+ List<Map<String, String>> getAvailableInstallations()
throws ContinuumBuildAgentException;
- Map getBuildResult( int projectId )
+ Map<String, Object> 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<String, Object> getReleasePluginParameters( int projectId, String pomFilename )
throws ContinuumBuildAgentException;
List<Map<String, String>> processProject( int projectId, String pomFilename, boolean autoVersionSubmodules )
throws ContinuumBuildAgentException;
- String releasePrepare( Map project, Map properties, Map releaseVersion, Map developmentVersion, Map<String, String> environments )
+ String releasePrepare( Map project, Map properties, Map releaseVersion, Map developmentVersion,
+ Map<String, String> environments )
throws ContinuumBuildAgentException;
- Map getReleaseResult( String releaseId )
+ Map<String, Object> getReleaseResult( String releaseId )
throws ContinuumBuildAgentException;
- Map getListener( String releaseId )
+ Map<String, Object> 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<String, String> environments )
+ String releasePerformFromScm( String goals, String arguments, boolean useReleaseProfile, Map repository,
+ String scmUrl, String scmUsername, String scmPassword, String scmTag,
+ String scmTagBase, Map<String, String> environments )
throws ContinuumBuildAgentException;
String releaseCleanup( String releaseId )
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java Wed Apr 15 20:59:07 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<Map> projectsBuildContext )
+ public void buildProjects( List<Map<String, Object>> projectsBuildContext )
throws ContinuumBuildAgentException
{
List<BuildContext> buildContextList = initializeBuildContext( projectsBuildContext );
@@ -117,17 +117,17 @@
}
- public List<Map> getAvailableInstallations()
+ public List<Map<String, String>> getAvailableInstallations()
throws ContinuumBuildAgentException
{
- List<Map> installationsList = new ArrayList<Map>();
-
+ List<Map<String, String>> installationsList = new ArrayList<Map<String, String>>();
+
List<Installation> installations = buildAgentConfigurationService.getAvailableInstallations();
for ( Installation installation : installations )
{
- Map map = new HashMap();
-
+ Map<String, String> map = new HashMap<String, String>();
+
if ( StringUtils.isBlank( installation.getName() ) )
{
map.put( ContinuumBuildAgentUtil.KEY_INSTALLATION_NAME, "" );
@@ -170,18 +170,18 @@
return installationsList;
}
- public Map getBuildResult( int projectId )
+ public Map<String, Object> getBuildResult( int projectId )
throws ContinuumBuildAgentException
{
- Map result = new HashMap();
+ Map<String, Object> result = new HashMap<String, Object>();
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<String, Object> getReleasePluginParameters( int projectId, String pomFilename )
throws ContinuumBuildAgentException
{
- Map releaseParameters = new HashMap();
+ Map<String, Object> releaseParameters = new HashMap<String, Object>();
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<Plugin>) 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<Map<String, String>>processProject( int projectId, String pomFilename, boolean autoVersionSubmodules )
+ public List<Map<String, String>> processProject( int projectId, String pomFilename, boolean autoVersionSubmodules )
throws ContinuumBuildAgentException
{
List<Map<String, String>> projects = new ArrayList<Map<String, String>>();
@@ -466,12 +475,14 @@
return projects;
}
- public String releasePrepare( Map project, Map properties, Map releaseVersion, Map developmentVersion, Map<String, String> environments )
+ public String releasePrepare( Map project, Map properties, Map releaseVersion, Map developmentVersion,
+ Map<String, String> 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<String, Object> 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<String, Object> map = new HashMap<String, Object>();
+ 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<String, Object> 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<String, String> environments )
+ public String releasePerformFromScm( String goals, String arguments, boolean useReleaseProfile, Map repository,
+ String scmUrl, String scmUsername, String scmPassword, String scmTag,
+ String scmTagBase, Map<String, String> 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<Map<String, String>> projects )
+ private void processProject( String workingDirectory, String pomFilename, boolean autoVersionSubmodules,
+ List<Map<String, String>> 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<BuildContext> initializeBuildContext( List<Map> projectsBuildContext )
+ private List<BuildContext> initializeBuildContext( List<Map<String, Object>> projectsBuildContext )
{
List<BuildContext> buildContext = new ArrayList<BuildContext>();
-
- for ( Map map : projectsBuildContext )
+
+ for ( Map<String, Object> 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<Map> scmChanges )
+ private ScmResult getScmResult( List<Map<String, Object>> scmChanges )
{
ScmResult scmResult = null;
if ( scmChanges != null && scmChanges.size() > 0 )
{
scmResult = new ScmResult();
-
- for ( Map map : scmChanges )
+
+ for ( Map<String, Object> 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<String, Object> context )
{
- List<Map> files = ContinuumBuildAgentUtil.getChangeSetFiles( context );
+ List<Map<String, Object>> files = ContinuumBuildAgentUtil.getChangeSetFiles( context );
if ( files != null )
{
- for ( Map map : files )
+ for ( Map<String, Object> map : files )
{
ChangeFile changeFile = new ChangeFile();
changeFile.setName( ContinuumBuildAgentUtil.getChangeFileName( map ) );
@@ -707,14 +722,11 @@
private PrepareBuildProjectsTask createPrepareBuildProjectsTask( List<BuildContext> 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/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java Wed Apr 15 20:59:07 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/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CreateBuildProjectTaskAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CreateBuildProjectTaskAction.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CreateBuildProjectTaskAction.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CreateBuildProjectTaskAction.java Wed Apr 15 20:59:07 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/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateProjectFromWorkingDirectoryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateProjectFromWorkingDirectoryAction.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateProjectFromWorkingDirectoryAction.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/UpdateProjectFromWorkingDirectoryAction.java Wed Apr 15 20:59:07 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/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java Wed Apr 15 20:59:07 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<String, Object> projectMap = new HashMap<String, Object>();
projectMap.put( ContinuumBuildAgentUtil.KEY_PROJECT_ID, project.getId() );
projectMap.put( ContinuumBuildAgentUtil.KEY_PROJECT_VERSION, project.getVersion() );
@@ -380,15 +380,15 @@
}
}
- protected List<Map> getProjectDevelopers( List<ProjectDeveloper> developers )
+ protected List<Map<String, String>> getProjectDevelopers( List<ProjectDeveloper> developers )
{
- List<Map> pDevelopers = new ArrayList<Map>();
+ List<Map<String, String>> pDevelopers = new ArrayList<Map<String, String>>();
if ( developers != null )
{
for ( ProjectDeveloper developer : developers )
{
- Map map = new HashMap();
+ Map<String, String> map = new HashMap<String, String>();
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<String, Object> getProjectParent( ProjectDependency parent )
{
- Map map = new HashMap();
+ Map<String, Object> map = new HashMap<String, Object>();
if ( parent != null )
{
@@ -412,15 +412,15 @@
return map;
}
- protected List<Map> getProjectDependencies( List<ProjectDependency> dependencies )
+ protected List<Map<String, Object>> getProjectDependencies( List<ProjectDependency> dependencies )
{
- List<Map> pDependencies = new ArrayList<Map>();
+ List<Map<String, Object>> pDependencies = new ArrayList<Map<String, Object>>();
if ( dependencies != null )
{
for ( ProjectDependency dependency : dependencies )
{
- Map map = new HashMap();
+ Map<String, Object> map = new HashMap<String, Object>();
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<Map> getProjectNotifiers( List<ProjectNotifier> notifiers )
+ //TODO: Check the content of this method, it always return an empty list
+ protected List<Map<String, Object>> getProjectNotifiers( List<ProjectNotifier> notifiers )
{
- List<Map> pNotifiers = new ArrayList<Map>();
+ List<Map<String, Object>> pNotifiers = new ArrayList<Map<String, Object>>();
if ( notifiers != null )
{
for ( ProjectNotifier notifier : notifiers )
{
- Map map = new HashMap();
+ Map<String, Object> map = new HashMap<String, Object>();
if ( notifier.getConfiguration() != null )
{
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java Wed Apr 15 20:59:07 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/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java Wed Apr 15 20:59:07 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/trunk/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/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/DefaultBuildAgentMavenOneMetadataHelper.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/DefaultBuildAgentMavenOneMetadataHelper.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/DefaultBuildAgentMavenOneMetadataHelper.java Wed Apr 15 20:59:07 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/trunk/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/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java Wed Apr 15 20:59:07 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<String> i = validationResult.getMessages().iterator(); i.hasNext(); )
+ for ( String valmsg : (List<String>) 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<Server> i = settings.getServers().iterator(); i.hasNext(); )
+ for ( Server server : (List<Server>) settings.getServers() )
{
- Server server = i.next();
-
wagonManager.addAuthenticationInfo( server.getId(), server.getUsername(), server.getPassword(),
server.getPrivateKey(), server.getPassphrase() );
@@ -718,10 +714,8 @@
}
}
- for ( Iterator<Mirror> i = settings.getMirrors().iterator(); i.hasNext(); )
+ for ( Mirror mirror : (List<Mirror>) settings.getMirrors() )
{
- Mirror mirror = i.next();
-
wagonManager.addMirror( mirror.getId(), mirror.getMirrorOf(), mirror.getUrl() );
}
}
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java Wed Apr 15 20:59:07 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/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java Wed Apr 15 20:59:07 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/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentReleaseManager.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentReleaseManager.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentReleaseManager.java Wed Apr 15 20:59:07 2009
@@ -28,12 +28,13 @@
{
String ROLE = BuildAgentReleaseManager.class.getName();
- String releasePrepare( Map project, Map properties, Map releaseVersion, Map developmentVersion, Map<String, String> environments )
+ String releasePrepare( Map project, Map properties, Map releaseVersion, Map developmentVersion,
+ Map<String, String> environments )
throws ContinuumReleaseException;
ReleaseResult getReleaseResult( String releaseId );
- Map getListener( String releaseId );
+ Map<String, Object> 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<String, String> environments )
+ String releasePerformFromScm( String goals, String arguments, boolean useReleaseProfile, Map repository,
+ String scmUrl, String scmUsername, String scmPassword, String scmTag,
+ String scmTagBase, Map<String, String> environments )
throws ContinuumReleaseException;
String releaseCleanup( String releaseId );
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java?rev=765355&r1=765354&r2=765355&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java Wed Apr 15 20:59:07 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 )
{