Author: ctan
Date: Mon Jan 5 17:43:33 2009
New Revision: 731808
URL: http://svn.apache.org/viewvc?rev=731808&view=rev
Log:
fixed edit/delete build agent
Modified:
continuum/branches/continuum-distributed-builds/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgent.jsp
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=731808&r1=731807&r2=731808&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
Mon Jan 5 17:43:33 2009
@@ -189,6 +189,11 @@
log.info( "remove TaskQueueExecutor for build agent '" + buildAgentUrl + "'" );
ThreadedDistributedBuildTaskQueueExecutor executor = taskQueueExecutors.get( buildAgentUrl
);
+ if ( executor == null )
+ {
+ return;
+ }
+
try
{
executor.stop();
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgent.jsp?rev=731808&r1=731807&r2=731808&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgent.jsp
(original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgent.jsp
Mon Jan 5 17:43:33 2009
@@ -41,7 +41,14 @@
</c:if>
<table>
- <s:textfield label="%{getText('buildAgent.url.label')}" name="buildAgent.url"
required="true"/>
+ <c:choose>
+ <c:when test="${empty buildAgent.url}">
+ <s:textfield label="%{getText('buildAgent.url.label')}" name="buildAgent.url"
required="true"/>
+ </c:when>
+ <c:otherwise>
+ <s:textfield label="%{getText('buildAgent.url.label')}" name="buildAgent.url"
required="true" disabled="true"/>
+ </c:otherwise>
+ </c:choose>
<s:textfield label="%{getText('buildAgent.description.label')}" name="buildAgent.description"/>
<s:checkbox label="%{getText('buildAgent.enabled.label')}" name="buildAgent.enabled"
value="buildAgent.enabled" fieldValue="true"/>
</table>
|