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/11 11:36:24 UTC
svn commit: r725645 - in
/continuum/branches/continuum-distributed-builds/continuum-builder: ./
src/main/java/org/apache/continuum/builder/distributed/executor/
src/main/java/org/apache/continuum/builder/distributed/manager/
Author: ctan
Date: Thu Dec 11 02:36:23 2008
New Revision: 725645
URL: http://svn.apache.org/viewvc?rev=725645&view=rev
Log:
- removed xmlrpc-server dependency
- more fix in implementation
Modified:
continuum/branches/continuum-distributed-builds/continuum-builder/pom.xml
continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java
continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
Modified: continuum/branches/continuum-distributed-builds/continuum-builder/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-builder/pom.xml?rev=725645&r1=725644&r2=725645&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-builder/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-builder/pom.xml Thu Dec 11 02:36:23 2008
@@ -57,11 +57,6 @@
<artifactId>continuum-distributed-build-transport-master</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>xmlrpc-server</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
Modified: continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java?rev=725645&r1=725644&r2=725645&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java Thu Dec 11 02:36:23 2008
@@ -23,7 +23,6 @@
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.apache.xmlrpc.XmlRpcException;
import org.codehaus.plexus.taskqueue.Task;
import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
import org.codehaus.plexus.util.dag.CycleDetectedException;
Modified: continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java?rev=725645&r1=725644&r2=725645&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java Thu Dec 11 02:36:23 2008
@@ -171,7 +171,7 @@
else if ( !agent.isEnabled() && taskQueueExecutors.containsKey( agent.getUrl() ) )
{
log.info( "agent is disabled, remove TaskQueueExecutor for build agent '" + agent.getUrl() + "'" );
- taskQueueExecutors.remove( agent.getUrl() );
+ removeAgentFromTaskQueueExecutor( agent.getUrl() );
}
}
}
@@ -192,7 +192,7 @@
}
catch ( StoppingException e )
{
- throw new ContinuumException( "", e );
+ throw new ContinuumException( "Error while stopping task queue executor", e );
}
}