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/10 08:39:43 UTC
svn commit: r725023 [2/2] - in
/continuum/branches/continuum-distributed-builds: ./
continuum-api/src/main/java/org/apache/continuum/builder/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/
continuum-api/src/main/java/org/...
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java?rev=725023&r1=725022&r2=725023&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java Tue Dec 9 23:39:42 2008
@@ -102,9 +102,7 @@
if ( agent.getUrl().equals( buildAgent.getUrl() ) )
{
buildAgent = agent;
-
- // connect to BuildAgentXMLRPCCLIENT
- // installations = client.getAvailableInstallations();
+ installations = distributedBuildManager.getAvailableInstallations( buildAgent.getUrl() );
break;
}
}
@@ -152,6 +150,16 @@
return CONFIRM;
}
+ if ( distributedBuildManager.isBuildAgentBusy( buildAgent.getUrl() ) )
+ {
+ message = getText( "buildAgent.error.delete.busy" );
+ return ERROR;
+ }
+ else
+ {
+ distributedBuildManager.removeAgentFromTaskQueueExecutor( buildAgent.getUrl() );
+ }
+ /*
List<BuildAgentListener> listeners = distributedBuildManager.getBuildAgentListeners();
for ( BuildAgentListener listener : listeners )
@@ -169,8 +177,8 @@
break;
}
}
- }
-
+ }*/
+
ConfigurationService configuration = getContinuum().getConfiguration();
for ( BuildAgentConfiguration agent : configuration.getBuildAgents() )
Modified: continuum/branches/continuum-distributed-builds/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/pom.xml?rev=725023&r1=725022&r2=725023&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/pom.xml Tue Dec 9 23:39:42 2008
@@ -571,6 +571,11 @@
<version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-distributed-build-transport-master</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>1.5.0</version>