You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2008/12/16 08:49:31 UTC
svn commit: r726982 - in
/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main:
java/org/apache/continuum/buildagent/
java/org/apache/continuum/buildagent/action/ java/org/a...
Author: ctan
Date: Mon Dec 15 23:49:29 2008
New Revision: 726982
URL: http://svn.apache.org/viewvc?rev=726982&view=rev
Log:
-fix implementation of slave agent
Added:
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildCancelledException.java
- copied, changed from r726867, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildCancelledException.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java
- copied, changed from r726867, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutionResult.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutor.java
- copied, changed from r726867, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutor.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutorException.java
- copied, changed from r726867, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutorException.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumUtils.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultShellCommandHelper.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ExecutionResult.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ShellCommandHelper.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/resources/META-INF/spring-context.xml
Removed:
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildCancelledException.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutionResult.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutor.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutorException.java
Modified:
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/DefaultContinuum.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ExecuteBuilderAction.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ant/AntBuildExecutor.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/BuildExecutorManager.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildExecutorManager.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/MavenOneBuildExecutor.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultMavenBuilderHelper.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/MavenTwoBuildExecutor.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/shell/ShellBuildExecutor.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultConfigurationService.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultInstallationService.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultTaskQueueManager.java
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java Mon Dec 15 23:49:29 2008
@@ -5,6 +5,7 @@
import java.util.Map;
import org.apache.continuum.buildagent.buildcontext.BuildContext;
+import org.apache.continuum.buildagent.buildcontext.manager.BuildContextManager;
import org.apache.continuum.buildagent.configuration.ConfigurationService;
import org.apache.continuum.buildagent.model.Installation;
import org.apache.continuum.buildagent.taskqueue.manager.TaskQueueManager;
@@ -12,6 +13,9 @@
import org.apache.continuum.taskqueue.manager.TaskQueueManagerException;
import org.apache.maven.continuum.ContinuumException;
+/**
+ * @plexus.component role="org.apache.continuum.buildagent.ContinuumBuildAgentService"
+ */
public class ContinuumBuildAgentServiceImpl
implements ContinuumBuildAgentService
{
@@ -30,6 +34,11 @@
*/
private TaskQueueManager taskQueueManager;
+ /**
+ * @plexus.requirement
+ */
+ private BuildContextManager buildContextManager;
+
public void buildProjects( List<Map> projectsBuildContext )
throws ContinuumBuildAgentException
{
@@ -113,9 +122,12 @@
buildContext.add( context );
}
+ buildContextManager.setBuildContextList( buildContext );
+
return buildContext;
}
+ /*
public ConfigurationService getConfigurationService()
{
return configurationService;
@@ -145,4 +157,5 @@
{
this.taskQueueManager = taskQueueManager;
}
+ */
}
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/DefaultContinuum.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/DefaultContinuum.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/DefaultContinuum.java Mon Dec 15 23:49:29 2008
@@ -5,14 +5,13 @@
import java.util.Map;
import org.apache.continuum.buildagent.buildcontext.BuildContext;
-import org.apache.continuum.buildagent.buildcontext.manager.BuildContextManager;
import org.apache.continuum.buildagent.configuration.ConfigurationService;
import org.apache.continuum.buildagent.taskqueue.manager.TaskQueueManager;
import org.apache.continuum.buildagent.utils.BuildContextToBuildDefinition;
import org.apache.continuum.buildagent.utils.BuildContextToProject;
import org.apache.continuum.buildagent.utils.ContinuumBuildAgentUtil;
+import org.apache.continuum.buildagent.utils.ContinuumUtils;
import org.apache.continuum.taskqueue.BuildProjectTask;
-import org.apache.continuum.utils.ContinuumUtils;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
@@ -53,50 +52,53 @@
{
Map<String, Object> context = null;
- try
+ if ( buildContexts != null && buildContexts.size() > 0 )
{
- for ( BuildContext buildContext : buildContexts )
+ try
{
- context = buildContext.getActionContext();
-
- BuildDefinition buildDef = BuildContextToBuildDefinition.getBuildDefinition( buildContext );
-
- log.info( "Check scm root state" );
- if ( !checkProjectScmRoot( context ) )
- {
- break;
- }
-
- log.info( "Initializing prepare build" );
- initializeActionContext( buildContext );
-
- log.info( "Starting prepare build" );
-
- try
+ for ( BuildContext buildContext : buildContexts )
{
- if ( buildDef.isBuildFresh() )
+ context = buildContext.getActionContext();
+
+ BuildDefinition buildDef = BuildContextToBuildDefinition.getBuildDefinition( buildContext );
+
+ log.info( "Check scm root state" );
+ if ( !checkProjectScmRoot( context ) )
{
- log.info( "Clean up working directory" );
- cleanWorkingDirectory( buildContext );
+ break;
+ }
+
+ log.info( "Initializing prepare build" );
+ initializeActionContext( buildContext );
+
+ log.info( "Starting prepare build" );
+
+ try
+ {
+ if ( buildDef.isBuildFresh() )
+ {
+ log.info( "Clean up working directory" );
+ cleanWorkingDirectory( buildContext );
+ }
+
+ log.info( "Updating working directory" );
+ updateWorkingDirectory( buildContext );
+ }
+ finally
+ {
+ endProjectPrepareBuild( buildContext );
}
-
- log.info( "Updating working directory" );
- updateWorkingDirectory( buildContext );
- }
- finally
- {
- endProjectPrepareBuild( buildContext );
}
}
- }
- finally
- {
- endPrepareBuild( context );
- }
+ finally
+ {
+ endPrepareBuild( context );
+ }
- if ( !checkProjectScmRoot( context ) )
- {
- buildProjects( buildContexts );
+ if ( !checkProjectScmRoot( context ) )
+ {
+ buildProjects( buildContexts );
+ }
}
}
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/CheckoutProjectAction.java Mon Dec 15 23:49:29 2008
@@ -11,9 +11,9 @@
import org.apache.continuum.buildagent.utils.BuildContextToBuildDefinition;
import org.apache.continuum.buildagent.utils.BuildContextToProject;
import org.apache.continuum.buildagent.utils.ContinuumBuildAgentUtil;
+import org.apache.continuum.buildagent.utils.ContinuumUtils;
import org.apache.continuum.scm.ContinuumScm;
import org.apache.continuum.scm.ContinuumScmConfiguration;
-import org.apache.continuum.utils.ContinuumUtils;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.scm.ScmResult;
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ExecuteBuilderAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ExecuteBuilderAction.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ExecuteBuilderAction.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/action/ExecuteBuilderAction.java Mon Dec 15 23:49:29 2008
@@ -4,13 +4,13 @@
import java.util.Date;
import java.util.Map;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildCancelledException;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutionResult;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutor;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildCancelledException;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutionResult;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutor;
import org.apache.continuum.buildagent.build.execution.manager.BuildExecutorManager;
import org.apache.continuum.buildagent.configuration.ConfigurationService;
import org.apache.continuum.buildagent.utils.ContinuumBuildAgentUtil;
-import org.apache.continuum.utils.ContinuumUtils;
+import org.apache.continuum.buildagent.utils.ContinuumUtils;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.model.project.Project;
@@ -46,7 +46,7 @@
int trigger = ContinuumBuildAgentUtil.getTrigger( context );
- ContinuumBuildExecutor buildExecutor = buildExecutorManager.getBuildExecutor( project.getExecutorId() );
+ ContinuumAgentBuildExecutor buildExecutor = buildExecutorManager.getBuildExecutor( project.getExecutorId() );
// ----------------------------------------------------------------------
// Make the buildResult
@@ -68,13 +68,13 @@
{
File buildOutputFile = configurationService.getBuildOutputFile( project.getId() );
- ContinuumBuildExecutionResult result = buildExecutor.build( project, buildDefinition, buildOutputFile );
+ ContinuumAgentBuildExecutionResult result = buildExecutor.build( project, buildDefinition, buildOutputFile );
buildResult.setState( result.getExitCode() == 0 ? ContinuumProjectState.OK : ContinuumProjectState.FAILED );
buildResult.setExitCode( result.getExitCode() );
}
- catch ( ContinuumBuildCancelledException e )
+ catch ( ContinuumAgentBuildCancelledException e )
{
getLogger().info( "Cancelled build" );
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/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-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/AbstractBuildExecutor.java Mon Dec 15 23:49:29 2008
@@ -2,21 +2,17 @@
import java.io.File;
import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import org.apache.continuum.buildagent.configuration.ConfigurationService;
import org.apache.continuum.buildagent.installation.InstallationService;
-import org.apache.continuum.utils.shell.ExecutionResult;
-import org.apache.continuum.utils.shell.ShellCommandHelper;
+import org.apache.continuum.buildagent.utils.shell.ExecutionResult;
+import org.apache.continuum.buildagent.utils.shell.ShellCommandHelper;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.model.scm.ChangeSet;
-import org.apache.maven.continuum.model.system.Installation;
-import org.apache.maven.continuum.model.system.Profile;
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.codehaus.plexus.commandline.ExecutableResolver;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
@@ -27,7 +23,7 @@
import org.slf4j.LoggerFactory;
public abstract class AbstractBuildExecutor
- implements ContinuumBuildExecutor, Initializable
+ implements ContinuumAgentBuildExecutor, Initializable
{
protected Logger log = LoggerFactory.getLogger( getClass() );
@@ -213,9 +209,9 @@
return actualExecutable;
}
- protected ContinuumBuildExecutionResult executeShellCommand( Project project, String executable, String arguments,
+ protected ContinuumAgentBuildExecutionResult executeShellCommand( Project project, String executable, String arguments,
File output, Map<String, String> environments )
- throws ContinuumBuildExecutorException, ContinuumBuildCancelledException
+ throws ContinuumAgentBuildExecutorException, ContinuumAgentBuildCancelledException
{
File workingDirectory = getWorkingDirectory( project.getId() );
@@ -235,24 +231,24 @@
log.info( "Exit code: " + result.getExitCode() );
- return new ContinuumBuildExecutionResult( output, result.getExitCode() );
+ return new ContinuumAgentBuildExecutionResult( output, result.getExitCode() );
}
catch ( CommandLineException e )
{
if ( e.getCause() instanceof InterruptedException )
{
- throw new ContinuumBuildCancelledException( "The build was cancelled", e );
+ throw new ContinuumAgentBuildCancelledException( "The build was cancelled", e );
}
else
{
- throw new ContinuumBuildExecutorException(
+ throw new ContinuumAgentBuildExecutorException(
"Error while executing shell command. The most common error is that '" + executable + "' " +
"is not in your path.", e );
}
}
catch ( Exception e )
{
- throw new ContinuumBuildExecutorException( "Error while executing shell command. " +
+ throw new ContinuumAgentBuildExecutorException( "Error while executing shell command. " +
"The most common error is that '" + executable + "' " + "is not in your path.", e );
}
}
@@ -289,7 +285,7 @@
}
public List<Artifact> getDeployableArtifacts( Project project, File workingDirectory, BuildDefinition buildDefinition )
- throws ContinuumBuildExecutorException
+ throws ContinuumAgentBuildExecutorException
{
// Not supported by this builder
return Collections.EMPTY_LIST;
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildCancelledException.java (from r726867, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildCancelledException.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildCancelledException.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildCancelledException.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildCancelledException.java&r1=726867&r2=726982&rev=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildCancelledException.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildCancelledException.java Mon Dec 15 23:49:29 2008
@@ -2,15 +2,15 @@
import org.apache.maven.continuum.execution.ContinuumBuildExecutorException;
-public class ContinuumBuildCancelledException
+public class ContinuumAgentBuildCancelledException
extends ContinuumBuildExecutorException
{
- public ContinuumBuildCancelledException( String message )
+ public ContinuumAgentBuildCancelledException( String message )
{
super( message );
}
- public ContinuumBuildCancelledException( String message, Throwable cause )
+ public ContinuumAgentBuildCancelledException( String message, Throwable cause )
{
super( message, cause );
}
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java (from r726867, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutionResult.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutionResult.java&r1=726867&r2=726982&rev=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutionResult.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutionResult.java Mon Dec 15 23:49:29 2008
@@ -2,13 +2,13 @@
import java.io.File;
-public class ContinuumBuildExecutionResult
+public class ContinuumAgentBuildExecutionResult
{
private File output;
private int exitCode;
- public ContinuumBuildExecutionResult( File output, int exitCode )
+ public ContinuumAgentBuildExecutionResult( File output, int exitCode )
{
this.output = output;
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutor.java (from r726867, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutor.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutor.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutor.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutor.java&r1=726867&r2=726982&rev=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutor.java Mon Dec 15 23:49:29 2008
@@ -7,12 +7,12 @@
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
-public interface ContinuumBuildExecutor
+public interface ContinuumAgentBuildExecutor
{
- String ROLE = ContinuumBuildExecutor.class.getName();
+ String ROLE = ContinuumAgentBuildExecutor.class.getName();
- ContinuumBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput )
- throws ContinuumBuildExecutorException, ContinuumBuildCancelledException;
+ ContinuumAgentBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput )
+ throws ContinuumAgentBuildExecutorException, ContinuumAgentBuildCancelledException;
boolean isBuilding( Project project );
@@ -20,5 +20,5 @@
// TODO: are these part of the builder interface, or a separate project/build definition interface?
List<Artifact> getDeployableArtifacts( Project project, File workingDirectory, BuildDefinition buildDefinition )
- throws ContinuumBuildExecutorException;
+ throws ContinuumAgentBuildExecutorException;
}
Copied: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutorException.java (from r726867, continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutorException.java)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutorException.java?p2=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutorException.java&p1=continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutorException.java&r1=726867&r2=726982&rev=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumBuildExecutorException.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ContinuumAgentBuildExecutorException.java Mon Dec 15 23:49:29 2008
@@ -1,19 +1,19 @@
package org.apache.continuum.buildagent.build.execution;
-public class ContinuumBuildExecutorException
+public class ContinuumAgentBuildExecutorException
extends Exception
{
- public ContinuumBuildExecutorException( String message )
+ public ContinuumAgentBuildExecutorException( String message )
{
super( message );
}
- public ContinuumBuildExecutorException( Throwable cause )
+ public ContinuumAgentBuildExecutorException( Throwable cause )
{
super( cause );
}
- public ContinuumBuildExecutorException( String message, Throwable cause )
+ public ContinuumAgentBuildExecutorException( String message, Throwable cause )
{
super( message, cause );
}
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ant/AntBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ant/AntBuildExecutor.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ant/AntBuildExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/ant/AntBuildExecutor.java Mon Dec 15 23:49:29 2008
@@ -5,10 +5,10 @@
import java.util.Properties;
import org.apache.continuum.buildagent.build.execution.AbstractBuildExecutor;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildCancelledException;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutionResult;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutor;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutorException;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildCancelledException;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutionResult;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutor;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutorException;
import org.apache.continuum.buildagent.installation.InstallationService;
import org.apache.maven.continuum.execution.ContinuumBuildExecutorConstants;
import org.apache.maven.continuum.model.project.BuildDefinition;
@@ -17,7 +17,7 @@
public class AntBuildExecutor
extends AbstractBuildExecutor
- implements ContinuumBuildExecutor
+ implements ContinuumAgentBuildExecutor
{
public static final String CONFIGURATION_EXECUTABLE = "executable";
@@ -30,8 +30,8 @@
super( ID, true );
}
- public ContinuumBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput )
- throws ContinuumBuildExecutorException, ContinuumBuildCancelledException
+ public ContinuumAgentBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput )
+ throws ContinuumAgentBuildExecutorException, ContinuumAgentBuildCancelledException
{
String executable = getInstallationService().getExecutorConfigurator( InstallationService.ANT_TYPE )
.getExecutable();
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/BuildExecutorManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/BuildExecutorManager.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/BuildExecutorManager.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/BuildExecutorManager.java Mon Dec 15 23:49:29 2008
@@ -1,13 +1,13 @@
package org.apache.continuum.buildagent.build.execution.manager;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutor;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutor;
import org.apache.maven.continuum.ContinuumException;
public interface BuildExecutorManager
{
String ROLE = BuildExecutorManager.class.getName();
- ContinuumBuildExecutor getBuildExecutor( String executorId )
+ ContinuumAgentBuildExecutor getBuildExecutor( String executorId )
throws ContinuumException;
boolean hasBuildExecutor( String executorId );
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildExecutorManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildExecutorManager.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildExecutorManager.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildExecutorManager.java Mon Dec 15 23:49:29 2008
@@ -4,7 +4,7 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutor;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutor;
import org.apache.maven.continuum.ContinuumException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,7 +19,7 @@
private Logger log = LoggerFactory.getLogger( this.getClass() );
/**
- * @plexus.requirement role="org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutor"
+ * @plexus.requirement role="org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutor"
*/
private Map executors;
@@ -53,10 +53,10 @@
// BuildExecutorManager Implementation
// ----------------------------------------------------------------------
- public ContinuumBuildExecutor getBuildExecutor( String builderType )
+ public ContinuumAgentBuildExecutor getBuildExecutor( String builderType )
throws ContinuumException
{
- ContinuumBuildExecutor executor = (ContinuumBuildExecutor) executors.get( builderType );
+ ContinuumAgentBuildExecutor executor = (ContinuumAgentBuildExecutor) executors.get( builderType );
if ( executor == null )
{
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/MavenOneBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/MavenOneBuildExecutor.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/MavenOneBuildExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/MavenOneBuildExecutor.java Mon Dec 15 23:49:29 2008
@@ -5,10 +5,10 @@
import java.util.Properties;
import org.apache.continuum.buildagent.build.execution.AbstractBuildExecutor;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildCancelledException;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutionResult;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutor;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutorException;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildCancelledException;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutionResult;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutor;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutorException;
import org.apache.continuum.buildagent.installation.InstallationService;
import org.apache.maven.continuum.execution.ContinuumBuildExecutorConstants;
import org.apache.maven.continuum.model.project.BuildDefinition;
@@ -17,7 +17,7 @@
public class MavenOneBuildExecutor
extends AbstractBuildExecutor
- implements ContinuumBuildExecutor
+ implements ContinuumAgentBuildExecutor
{
public final static String CONFIGURATION_GOALS = "goals";
@@ -28,8 +28,8 @@
super( ID, true );
}
- public ContinuumBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput )
- throws ContinuumBuildExecutorException, ContinuumBuildCancelledException
+ public ContinuumAgentBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput )
+ throws ContinuumAgentBuildExecutorException, ContinuumAgentBuildCancelledException
{
String executable = getInstallationService().getExecutorConfigurator( InstallationService.MAVEN1_TYPE )
.getExecutable();
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultMavenBuilderHelper.java Mon Dec 15 23:49:29 2008
@@ -45,7 +45,8 @@
import org.slf4j.LoggerFactory;
/**
- * @plexus.component role="org.apache.continuum.buildagent.build.execution.maven.m2.MavenBuilderHelper" role-hint="default"
+ * @plexus.component role="org.apache.continuum.buildagent.build.execution.maven.m2.MavenBuilderHelper"
+ * role-hint="default"
*/
public class DefaultMavenBuilderHelper
implements MavenBuilderHelper, Contextualizable, Initializable
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/MavenTwoBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/MavenTwoBuildExecutor.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/MavenTwoBuildExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/MavenTwoBuildExecutor.java Mon Dec 15 23:49:29 2008
@@ -4,14 +4,13 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
-import java.util.Map;
import java.util.Properties;
import org.apache.continuum.buildagent.build.execution.AbstractBuildExecutor;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildCancelledException;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutionResult;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutor;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutorException;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildCancelledException;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutionResult;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutor;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutorException;
import org.apache.continuum.buildagent.installation.InstallationService;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
@@ -26,7 +25,7 @@
public class MavenTwoBuildExecutor
extends AbstractBuildExecutor
- implements ContinuumBuildExecutor
+ implements ContinuumAgentBuildExecutor
{
public static final String CONFIGURATION_GOALS = "goals";
@@ -57,8 +56,18 @@
this.projectHelper = projectHelper;
}
- public ContinuumBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput )
- throws ContinuumBuildExecutorException, ContinuumBuildCancelledException
+ public MavenBuilderHelper getBuilderHelper()
+ {
+ return builderHelper;
+ }
+
+ public void setBuilderHelper( MavenBuilderHelper builderHelper )
+ {
+ this.builderHelper = builderHelper;
+ }
+
+ public ContinuumAgentBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput )
+ throws ContinuumAgentBuildExecutorException, ContinuumAgentBuildCancelledException
{
String executable = getInstallationService().getExecutorConfigurator( InstallationService.MAVEN2_TYPE )
.getExecutable();
@@ -90,7 +99,7 @@
@Override
public List<Artifact> getDeployableArtifacts( Project continuumProject, File workingDirectory,
BuildDefinition buildDefinition )
- throws ContinuumBuildExecutorException
+ throws ContinuumAgentBuildExecutorException
{
MavenProject project = getMavenProject( continuumProject, workingDirectory, buildDefinition );
@@ -184,7 +193,7 @@
private MavenProject getMavenProject( Project continuumProject, File workingDirectory,
BuildDefinition buildDefinition )
- throws ContinuumBuildExecutorException
+ throws ContinuumAgentBuildExecutorException
{
ContinuumProjectBuildingResult result = new ContinuumProjectBuildingResult();
@@ -192,14 +201,14 @@
if ( !f.exists() )
{
- throw new ContinuumBuildExecutorException( "Could not find Maven project descriptor '" + f + "'." );
+ throw new ContinuumAgentBuildExecutorException( "Could not find Maven project descriptor '" + f + "'." );
}
MavenProject project = builderHelper.getMavenProject( result, f );
if ( result.hasErrors() )
{
- throw new ContinuumBuildExecutorException(
+ throw new ContinuumAgentBuildExecutorException(
"Unable to read the Maven project descriptor '" + f + "': " + result.getErrorsAsString() );
}
return project;
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/shell/ShellBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/shell/ShellBuildExecutor.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/shell/ShellBuildExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/shell/ShellBuildExecutor.java Mon Dec 15 23:49:29 2008
@@ -3,17 +3,17 @@
import java.io.File;
import org.apache.continuum.buildagent.build.execution.AbstractBuildExecutor;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildCancelledException;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutionResult;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutor;
-import org.apache.continuum.buildagent.build.execution.ContinuumBuildExecutorException;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildCancelledException;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutionResult;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutor;
+import org.apache.continuum.buildagent.build.execution.ContinuumAgentBuildExecutorException;
import org.apache.maven.continuum.execution.ContinuumBuildExecutorConstants;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
public class ShellBuildExecutor
extends AbstractBuildExecutor
- implements ContinuumBuildExecutor
+ implements ContinuumAgentBuildExecutor
{
public static final String CONFIGURATION_EXECUTABLE = "executable";
@@ -24,8 +24,8 @@
super( ID, false );
}
- public ContinuumBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput )
- throws ContinuumBuildExecutorException, ContinuumBuildCancelledException
+ public ContinuumAgentBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput )
+ throws ContinuumAgentBuildExecutorException, ContinuumAgentBuildCancelledException
{
String executable = getBuildFileForProject( project, buildDefinition );
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultConfigurationService.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultConfigurationService.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultConfigurationService.java Mon Dec 15 23:49:29 2008
@@ -110,7 +110,7 @@
return buildAgentConfiguration.getContinuumServerUrl();
}
- public List<Installation> getAvailableInstallations()
+ public List getAvailableInstallations()
{
return buildAgentConfiguration.getInstallations();
}
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultInstallationService.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultInstallationService.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultInstallationService.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultInstallationService.java Mon Dec 15 23:49:29 2008
@@ -35,5 +35,4 @@
this.typesValues
.put( InstallationService.MAVEN2_TYPE, new ExecutorConfigurator( "mvn", "bin", "M2_HOME", "-v" ) );
}
-
}
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java Mon Dec 15 23:49:29 2008
@@ -9,8 +9,8 @@
import org.apache.continuum.buildagent.buildcontext.manager.BuildContextManager;
import org.apache.continuum.buildagent.utils.BuildContextToBuildDefinition;
import org.apache.continuum.buildagent.utils.ContinuumBuildAgentUtil;
+import org.apache.continuum.buildagent.utils.ContinuumUtils;
import org.apache.continuum.taskqueue.BuildProjectTask;
-import org.apache.continuum.utils.ContinuumUtils;
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.scm.ScmException;
@@ -23,6 +23,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * @plexus.component role="org.codehaus.plexus.taskqueue.execution.TaskExecutor"
+ * role-hint="build-agent"
+ */
public class BuildProjectTaskExecutor
implements TaskExecutor
{
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultTaskQueueManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultTaskQueueManager.java?rev=726982&r1=726981&r2=726982&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultTaskQueueManager.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultTaskQueueManager.java Mon Dec 15 23:49:29 2008
@@ -20,6 +20,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * @plexus.component role="org.apache.continuum.buildagent.taskqueue.manager.TaskQueueManager"
+ */
public class DefaultTaskQueueManager
implements TaskQueueManager, Contextualizable
{
Added: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumUtils.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumUtils.java?rev=726982&view=auto
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumUtils.java (added)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumUtils.java Mon Dec 15 23:49:29 2008
@@ -0,0 +1,52 @@
+package org.apache.continuum.buildagent.utils;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+public class ContinuumUtils
+{
+ public static final String EOL = System.getProperty( "line.separator" );
+
+ public static String throwableToString( Throwable error )
+ {
+ if ( error == null )
+ {
+ return "";
+ }
+
+ StringWriter writer = new StringWriter();
+
+ PrintWriter printer = new PrintWriter( writer );
+
+ error.printStackTrace( printer );
+
+ printer.flush();
+
+ return writer.getBuffer().toString();
+ }
+
+ public static String throwableMessagesToString( Throwable error )
+ {
+ if ( error == null )
+ {
+ return "";
+ }
+
+ StringBuffer buffer = new StringBuffer();
+
+ buffer.append( error.getMessage() );
+
+ error = error.getCause();
+
+ while ( error != null )
+ {
+ buffer.append( EOL );
+
+ buffer.append( error.getMessage() );
+
+ error = error.getCause();
+ }
+
+ return buffer.toString();
+ }
+}
Added: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultShellCommandHelper.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultShellCommandHelper.java?rev=726982&view=auto
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultShellCommandHelper.java (added)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/DefaultShellCommandHelper.java Mon Dec 15 23:49:29 2008
@@ -0,0 +1,206 @@
+package org.apache.continuum.buildagent.utils.shell;
+
+import java.io.File;
+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;
+import org.apache.maven.shared.release.exec.MavenExecutorException;
+import org.apache.maven.shared.release.exec.TeeConsumer;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.CommandLineException;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+import org.codehaus.plexus.util.cli.StreamConsumer;
+import org.codehaus.plexus.util.cli.WriterStreamConsumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @plexus.component role="org.apache.continuum.buildagent.utils.shell.ShellCommandHelper"
+ * role-hint="default"
+ */
+public class DefaultShellCommandHelper
+ implements ShellCommandHelper
+{
+ private Logger log = LoggerFactory.getLogger( this.getClass() );
+
+ // ----------------------------------------------------------------------
+ // ShellCommandHelper Implementation
+ // ----------------------------------------------------------------------
+
+ public ExecutionResult executeShellCommand( File workingDirectory, String executable, String arguments, File output,
+ long idCommand, Map<String, String> environments )
+ throws Exception
+ {
+ Commandline cl = new Commandline();
+
+ Commandline.Argument argument = cl.createArgument();
+
+ argument.setLine( arguments );
+
+ return executeShellCommand( workingDirectory, executable, argument.getParts(), output, idCommand,
+ environments );
+ }
+
+ /**
+ * Make the command line
+ *
+ * @param workingDirectory
+ * @param executable
+ * @param arguments
+ * @param idCommand
+ * @param environments
+ * @return
+ * @throws Exception
+ */
+ protected Commandline createCommandline( File workingDirectory, String executable, String[] arguments,
+ long idCommand, Map<String, String> environments )
+ throws Exception
+ {
+ Commandline cl = new Commandline();
+
+ cl.setPid( idCommand );
+
+ cl.addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
+
+ if ( environments != null && !environments.isEmpty() )
+ {
+ for ( Iterator<String> iterator = environments.keySet().iterator(); iterator.hasNext(); )
+ {
+ String key = iterator.next();
+ String value = environments.get( key );
+ cl.addEnvironment( key, value );
+ }
+ }
+
+ cl.addSystemEnvironment();
+
+ cl.setExecutable( executable );
+
+ cl.setWorkingDirectory( workingDirectory.getAbsolutePath() );
+
+ if ( arguments != null )
+ {
+ for ( int i = 0; i < arguments.length; i++ )
+ {
+ String argument = arguments[i];
+
+ cl.createArgument().setValue( argument );
+ }
+ }
+
+ return cl;
+ }
+
+ public ExecutionResult executeShellCommand( File workingDirectory, String executable, String[] arguments,
+ File output, long idCommand, Map<String, String> environments )
+ throws Exception
+ {
+
+ Commandline cl = createCommandline( workingDirectory, executable, arguments, idCommand, environments );
+
+ log.info( "Executing: " + cl );
+ log.info( "Working directory: " + cl.getWorkingDirectory().getAbsolutePath() );
+ log.debug( "EnvironmentVariables " + Arrays.asList( cl.getEnvironmentVariables() ) );
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ //CommandLineUtils.StringStreamConsumer consumer = new CommandLineUtils.StringStreamConsumer();
+
+ Writer writer = new FileWriter( output );
+
+ StreamConsumer consumer = new WriterStreamConsumer( writer );
+
+ int exitCode = CommandLineUtils.executeCommandLine( cl, consumer, consumer );
+
+ writer.flush();
+
+ writer.close();
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ return new ExecutionResult( exitCode );
+ }
+
+ public boolean isRunning( long idCommand )
+ {
+ return CommandLineUtils.isAlive( idCommand );
+ }
+
+ public void killProcess( long idCommand )
+ {
+ CommandLineUtils.killProcess( idCommand );
+ }
+
+ public void executeGoals( File workingDirectory, String goals, boolean interactive, String arguments,
+ ReleaseResult relResult, Map<String, String> environments )
+ throws Exception
+ {
+ Commandline cl = new Commandline();
+
+ Commandline.Argument argument = cl.createArgument();
+
+ argument.setLine( arguments );
+
+ executeGoals( workingDirectory, goals, interactive, argument.getParts(), relResult, environments );
+ }
+
+ public void executeGoals( File workingDirectory, String goals, boolean interactive, String[] arguments,
+ ReleaseResult relResult, Map<String, String> environments )
+ throws Exception
+ {
+ Commandline cl = createCommandline( workingDirectory, "mvn", arguments, -1, environments );
+
+ if ( goals != null )
+ {
+ // accept both space and comma, so the old way still work
+ String[] tokens = StringUtils.split( goals, ", " );
+
+ for ( int i = 0; i < tokens.length; ++i )
+ {
+ cl.createArgument().setValue( tokens[i] );
+ }
+ }
+
+ cl.createArgument().setValue( "--no-plugin-updates" );
+
+ if ( !interactive )
+ {
+ cl.createArgument().setValue( "--batch-mode" );
+ }
+
+ StreamConsumer stdOut = new TeeConsumer( System.out );
+
+ StreamConsumer stdErr = new TeeConsumer( System.err );
+
+ try
+ {
+ relResult.appendInfo( "Executing: " + cl.toString() );
+ log.info( "Executing: " + cl.toString() );
+
+ int result = CommandLineUtils.executeCommandLine( cl, stdOut, stdErr );
+
+ if ( result != 0 )
+ {
+ throw new MavenExecutorException( "Maven execution failed, exit code: \'" + result + "\'", result,
+ stdOut.toString(), stdErr.toString() );
+ }
+ }
+ catch ( CommandLineException e )
+ {
+ throw new MavenExecutorException( "Can't run goal " + goals, stdOut.toString(), stdErr.toString(), e );
+ }
+ finally
+ {
+ relResult.appendOutput( stdOut.toString() );
+ }
+ }
+}
Added: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ExecutionResult.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ExecutionResult.java?rev=726982&view=auto
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ExecutionResult.java (added)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ExecutionResult.java Mon Dec 15 23:49:29 2008
@@ -0,0 +1,16 @@
+package org.apache.continuum.buildagent.utils.shell;
+
+public class ExecutionResult
+{
+ private int exitCode;
+
+ public ExecutionResult( int exitCode )
+ {
+ this.exitCode = exitCode;
+ }
+
+ public int getExitCode()
+ {
+ return exitCode;
+ }
+}
Added: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ShellCommandHelper.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ShellCommandHelper.java?rev=726982&view=auto
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ShellCommandHelper.java (added)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/shell/ShellCommandHelper.java Mon Dec 15 23:49:29 2008
@@ -0,0 +1,31 @@
+package org.apache.continuum.buildagent.utils.shell;
+
+import java.io.File;
+import java.util.Map;
+
+import org.apache.maven.shared.release.ReleaseResult;
+
+public interface ShellCommandHelper
+{
+ String ROLE = ShellCommandHelper.class.getName();
+
+ ExecutionResult executeShellCommand( File workingDirectory, String executable, String arguments, File output,
+ long idCommand, Map<String, String> environments )
+ throws Exception;
+
+ ExecutionResult executeShellCommand( File workingDirectory, String executable, String[] arguments, File output,
+ long idCommand, Map<String, String> environments )
+ throws Exception;
+
+ boolean isRunning( long idCommand );
+
+ void killProcess( long idCommand );
+
+ void executeGoals( File workingDirectory, String goals, boolean interactive, String arguments,
+ ReleaseResult relResult, Map<String, String> environments )
+ throws Exception;
+
+ void executeGoals( File workingDirectory, String goals, boolean interactive, String[] arguments,
+ ReleaseResult relResult, Map<String, String> environments )
+ throws Exception;
+}
Added: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/resources/META-INF/spring-context.xml?rev=726982&view=auto
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/resources/META-INF/spring-context.xml (added)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/resources/META-INF/spring-context.xml Mon Dec 15 23:49:29 2008
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+
+ <bean name="continuumAgentBuildExecutor#maven2"
+ class="org.apache.continuum.buildagent.build.execution.maven.m2.MavenTwoBuildExecutor" autowire="byName">
+ <property name="defaultExecutable" value="mvn"/>
+ <property name="builderHelper" ref="mavenBuilderHelper"/>
+ <property name="projectHelper" ref="mavenProjectHelper"/>
+ </bean>
+ <bean name="continuumAgentBuildExecutor#maven-1"
+ class="org.apache.continuum.buildagent.build.execution.maven.m1.MavenOneBuildExecutor" autowire="byName">
+ <property name="defaultExecutable" value="maven"/>
+ </bean>
+ <bean name="continuumAgentBuildExecutor#ant"
+ class="org.apache.continuum.buildagent.build.execution.ant.AntBuildExecutor" autowire="byName">
+ <property name="defaultExecutable" value="ant"/>
+ </bean>
+ <bean name="continuumAgentBuildExecutor#shell"
+ class="org.apache.continuum.buildagent.build.execution.shell.ShellBuildExecutor" autowire="byName">
+ </bean>
+
+ <bean id="configurationService" class="org.apache.continuum.buildagent.configuration.DefaultConfigurationService">
+ <property name="configuration" ref="continuumConfiguration" />
+ </bean>
+
+ <bean id="continuumConfiguration" class="org.apache.continuum.buildagent.configuration.DefaultContinuumConfiguration">
+ <property name="configurationFile" value="file:${appserver.base}/conf/continuum.xml" />
+ </bean>
+
+</beans>
+
\ No newline at end of file