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 2009/02/26 15:47:02 UTC
svn commit: r748163 [2/2] - in /continuum/trunk:
continuum-api/src/main/java/org/apache/continuum/builder/distributed/executor/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/
continuum-api/src/main/java/org/apache/continu...
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/startup/ContinuumStartup.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/startup/ContinuumStartup.java?rev=748163&r1=748162&r2=748163&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/startup/ContinuumStartup.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/startup/ContinuumStartup.java Thu Feb 26 14:47:01 2009
@@ -82,6 +82,12 @@
DistributedBuildManager distributedBuildManager = (DistributedBuildManager) wac.getBean( PlexusToSpringUtils
.buildSpringId( DistributedBuildManager.class ) );
+
+ TaskQueueExecutor distributedBuildProjectOverall = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils
+ .buildSpringId( TaskQueueExecutor.class, "distributed-build-project-overall" ) );
+
+ TaskQueueExecutor distributedBuildProjectDeferred = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils
+ .buildSpringId( TaskQueueExecutor.class, "distributed-build-project-deferred" ) );
}
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java?rev=748163&r1=748162&r2=748163&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java Thu Feb 26 14:47:01 2009
@@ -24,6 +24,8 @@
import java.util.List;
import org.apache.commons.lang.StringUtils;
+import org.apache.continuum.configuration.BuildAgentGroupConfiguration;
+import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.installation.InstallationService;
import org.apache.maven.continuum.model.system.Installation;
import org.apache.maven.continuum.model.system.Profile;
@@ -71,8 +73,23 @@
private List<Installation> profileInstallations;
+ private List<BuildAgentGroupConfiguration> buildAgentGroups;
+
private String message;
+ public void prepare()
+ throws Exception
+ {
+ super.prepare();
+
+ List<BuildAgentGroupConfiguration> agentGroups = getContinuum().getConfiguration().getBuildAgentGroups();
+ if ( agentGroups == null )
+ {
+ agentGroups = Collections.EMPTY_LIST;
+ }
+ this.setBuildAgentGroups( agentGroups );
+ }
+
// -------------------------------------------------------
// Webwork Methods
// -------------------------------------------------------
@@ -139,11 +156,15 @@
// but in the UI maybe some installations has been we retrieve it
// and only set the name related to CONTINUUM-1361
String name = profile.getName();
+ String buildAgentGroup = profile.getBuildAgentGroup();
+
profile = profileService.getProfile( profile.getId() );
// CONTINUUM-1746 we update the profile only if the name has changed
- if ( !StringUtils.equals( name, profile.getName() ) )
+ // jancajas: added build agent group. updated profile if agent group is changed also.
+ if ( !StringUtils.equals( name, profile.getName() ) || !StringUtils.equals( buildAgentGroup, profile.getBuildAgentGroup() ))
{
profile.setName( name );
+ profile.setBuildAgentGroup( buildAgentGroup );
profileService.updateProfile( profile );
}
}
@@ -311,4 +332,14 @@
{
this.message = message;
}
+
+ public List<BuildAgentGroupConfiguration> getBuildAgentGroups()
+ {
+ return buildAgentGroups;
+ }
+
+ public void setBuildAgentGroups( List<BuildAgentGroupConfiguration> buildAgentGroups )
+ {
+ this.buildAgentGroups = buildAgentGroups;
+ }
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java?rev=748163&r1=748162&r2=748163&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java Thu Feb 26 14:47:01 2009
@@ -27,13 +27,13 @@
import org.apache.commons.lang.ArrayUtils;
import org.apache.continuum.buildmanager.BuildManagerException;
+import org.apache.continuum.builder.distributed.executor.DistributedBuildTaskQueueExecutor;
import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
import org.apache.continuum.model.project.ProjectScmRoot;
import org.apache.continuum.taskqueue.BuildProjectTask;
import org.apache.continuum.taskqueue.CheckOutTask;
import org.apache.continuum.taskqueue.PrepareBuildProjectsTask;
-import org.apache.continuum.taskqueue.manager.TaskQueueManager;
-import org.apache.maven.continuum.Continuum;
+import org.apache.continuum.taskqueue.manager.TaskQueueManagerException;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.project.ContinuumProjectState;
@@ -45,6 +45,7 @@
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.taskqueue.Task;
+import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.codehaus.redback.integration.interceptor.SecureAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;
@@ -229,7 +230,7 @@
distributedBuildSummary.add( summary );
}
- distributedBuildQueues = getContinuum().getTaskQueueManager().getDistributedBuildProjectsInQueue();
+ distributedBuildQueues = aggregateQueues();
return DISTRIBUTED_BUILD_SUCCESS;
}
@@ -671,4 +672,32 @@
{
this.scmRootAddress = scmRootAddress;
}
+
+ private List<PrepareBuildProjectsTask> aggregateQueues() throws TaskQueueManagerException
+ {
+ List<PrepareBuildProjectsTask> aggregatedQueues = new ArrayList<PrepareBuildProjectsTask>();
+
+ List<PrepareBuildProjectsTask> overallQueues = getContinuum().getTaskQueueManager().getDistributedBuildProjectsInQueue();
+
+ Map <String, DistributedBuildTaskQueueExecutor> agentTaskQueueExecutors = distributedBuildManager.getTaskQueueExecutors();
+
+ for ( String url : agentTaskQueueExecutors.keySet() )
+ {
+ try
+ {
+ getLogger().debug("size of each queue snapshot " + url + " : " + agentTaskQueueExecutors.get( url ).getQueue().getQueueSnapshot().size());
+ aggregatedQueues.addAll( agentTaskQueueExecutors.get( url ).getQueue().getQueueSnapshot() ) ;
+ }
+ catch ( TaskQueueException e )
+ {
+ //silently ignore error
+ getLogger().error( "Error encountered retrieving queue snapshot from queue :" + url, e );
+ }
+ }
+
+ getLogger().debug("size of agg. queue " + aggregatedQueues.size() );
+ aggregatedQueues.addAll( overallQueues );
+
+ return aggregatedQueues;
+ }
}
Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=748163&r1=748162&r2=748163&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Thu Feb 26 14:47:01 2009
@@ -725,6 +725,7 @@
profilesList.page.title= Continuum - Build Environments
profilesList.section.title= Build Environments
profilesList.installations.label = Installations
+profilesList.buildAgentGroup.label = Build Agent Group
# ----------------------------------------------------------------------
# Page: Profile Edit
@@ -742,6 +743,7 @@
profile.remove.error = The Build Environment can't be removed, it is probably used by a build definition.
profile.installation.name.label = Installation Name
profile.actionError = Action Error
+profile.build.agent.group = Build Agent Group
# ----------------------------------------------------------------------
# Page: Installations List
@@ -1054,6 +1056,11 @@
buildAgents.table.url = Build Agent URL
buildAgents.table.description = Description
buildAgents.table.enabled = Enabled
+buildAgents.empty = No Build Agents
+
+buildAgentGroups.section.title = Build Agent Groups
+buildAgentGroups.table.name = Name
+buildAgentGroups.table.agents = Build Agents
# ----------------------------------------------------------------------
# Page: Add/Edit BuildAgent
@@ -1065,6 +1072,7 @@
buildAgent.enabled.label = Enabled
buildAgent.error.doesnotexist = Build agent does not exist
buildAgent.error.duplicate = Build agent already exists
+buildAgent.error.remove.in.use = Build agent can't be removed, it is probably used by a build agent group.
# ----------------------------------------------------------------------
# Page: View BuildAgent
@@ -1091,3 +1099,26 @@
distributedBuild.table.agentUrl = Build Agent URL
distributedBuilds.empty = No Distributed Builds
distributedBuilds.removeEntries = Cancel Entries
+
+# ----------------------------------------------------------------------
+# Page: Delete BuildAgentGroup
+# ----------------------------------------------------------------------
+deleteBuildAgentGroup.page.title = Continuum - Delete Build Agent Group
+deleteBuildAgentGroup.section.title = Delete Build Agent Group
+deleteBuildAgentGroup.confirmation.message = Are you sure you want to delete build agent group {0} ?
+
+# ----------------------------------------------------------------------
+# Page: Add/Edit BuildAgentGroup
+# ----------------------------------------------------------------------
+buildAgentGroup.page.title = Continuum - Add/Edit Build Agent Group
+buildAgentGroup.section.title = Add/Edit Build Agent Group
+buildAgentGroup.name.label = Name
+buildAgentGroup.agents.label = Agents
+buildAgentGroup.error.doesnotexist = Build agent group does not exist.
+buildAgentGroup.error.duplicate = Build agent group already exists.
+buildAgentGroup.error.name.required = Build agent group name required.
+buildAgentGroup.error.name.cannot.be.spaces = Build agent group name cannot contain spaces only.
+buildAgentGroup.available.buildAgents = --- Available Build Agents ---
+buildAgentGroup.available.buildAgents.used = --- Used Build Agents ---
+buildAgentGroup.buildAgents.define = Configure the used Build Agents
+buildAgentGroup.error.remove.in.use = Build agent group can't be removed, it is probably used by a build environment.
Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties?rev=748163&r1=748162&r2=748163&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties Thu Feb 26 14:47:01 2009
@@ -20,4 +20,4 @@
buildAgent.url.required = Build agent url is required.
buildAgent.error.exist = Build agent already exists.
buildAgent.error.delete.busy = Cannot delete build agent because it's busy at the moment
-buildAgent.error.notfound = Build agent does not exist.
\ No newline at end of file
+buildAgent.error.notfound = Build agent does not exist.
Modified: continuum/trunk/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/struts.xml?rev=748163&r1=748162&r2=748163&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/struts.xml Thu Feb 26 14:47:01 2009
@@ -962,6 +962,30 @@
<result name="success">/WEB-INF/jsp/admin/viewBuildAgent.jsp</result>
</action>
+ <action name="deleteBuildAgentGroup" class="buildAgent" method="deleteGroup">
+ <result name="error" type="redirect-action">
+ <param name="actionName">buildAgentList</param>
+ <param name="errorMessage">${message}</param>
+ </result>
+ <result name="confirm">/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp</result>
+ <result name="success" type="redirect-action">
+ <param name="actionName">buildAgentList</param>
+ </result>
+ </action>
+
+ <action name="editBuildAgentGroup" class="buildAgent" method="inputGroup">
+ <result name="input">/WEB-INF/jsp/admin/editBuildAgentGroup.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/editBuildAgentGroup.jsp</result>
+ </action>
+
+ <action name="saveBuildAgentGroup" class="buildAgent" method="saveGroup">
+ <result name="input">/WEB-INF/jsp/admin/editBuildAgentGroup.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/editBuildAgentGroup.jsp</result>
+ <result name="success" type="redirect-action">
+ <param name="actionName">buildAgentList</param>
+ </result>
+ </action>
+
</package>
<package name="component" extends="default">
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp?rev=748163&r1=748162&r2=748163&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp Thu Feb 26 14:47:01 2009
@@ -76,6 +76,51 @@
<s:submit value="%{getText('add')}"/>
</s:form>
</div>
+ <div id="h3">
+ <h3><s:text name="buildAgentGroups.section.title"/></h3>
+ <s:set name="buildAgentGroups" value="buildAgentGroups" scope="request"/>
+ <ec:table items="buildAgentGroups"
+ var="buildAgentGroup"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row>
+ <ec:column property="name" title="buildAgentGroups.table.name"></ec:column>
+ <ec:column property="Agents" title="buildAgentGroups.table.agents" style="white-space: nowrap">
+ <ul>
+ <c:if test="${!empty buildAgentGroup.buildAgents}" >
+ <c:forEach var="envVar" items="${buildAgentGroup.buildAgents}">
+ <li><c:out value="${envVar.url}" /></li>
+ </c:forEach>
+ </c:if>
+ </ul>
+ </ec:column>
+ <ec:column property="editActions" title=" " width="1%">
+ <s:url id="editBuildAgentGroupUrl" action="editBuildAgentGroup">
+ <s:param name="buildAgentGroup.name">${pageScope.buildAgentGroup.name}</s:param>
+ </s:url>
+ <s:a href="%{editBuildAgentGroupUrl}">
+ <img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0"/>
+ </s:a>
+ </ec:column>
+ <ec:column property="deleteActions" title=" " width="1%">
+ <s:url id="removeBuildAgentGroupUrl" action="deleteBuildAgentGroup">
+ <s:param name="buildAgentGroup.name">${pageScope.buildAgentGroup.name}</s:param>
+ </s:url>
+ <s:a href="%{removeBuildAgentGroupUrl}">
+ <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"/>
+ </s:a>
+ </ec:column>
+ </ec:row>
+ </ec:table>
+ </div>
+ <div class="functnbar3">
+ <s:form name="addBuildAgentGroup" action="editBuildAgentGroup" method="post">
+ <s:submit value="%{getText('add')}"/>
+ </s:form>
+ </div>
</body>
</s:i18n>
</html>
\ No newline at end of file
Added: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp?rev=748163&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp (added)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp Thu Feb 26 14:47:01 2009
@@ -0,0 +1,51 @@
+<%--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ --%>
+
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+
+<html>
+ <s:i18n name="localization.Continuum">
+ <head>
+ <title><s:text name="deleteBuildAgentGroup.page.title"/></title>
+ </head>
+ <body>
+ <div id="axial" class="h3">
+ <h3><s:text name="deleteBuildAgentGroup.section.title"/></h3>
+
+ <div class="warningmessage">
+ <p>
+ <strong>
+ <s:text name="deleteBuildAgentGroup.confirmation.message">
+ <s:param><s:property value="buildAgentGroup.name"/></s:param>
+ </s:text>
+ </strong>
+ </p>
+ </div>
+ <div class="functnbar3">
+ <s:form action="deleteBuildAgentGroup!deleteGroup.action" method="post">
+ <input type="hidden" name="buildAgentGroup.name" value="${buildAgentGroup.name}" />
+ <s:hidden name="confirmed" value="true"/>
+ <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ </s:form>
+ </div>
+ </div>
+ </body>
+ </s:i18n>
+</html>
Propchange: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgentGroup.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgentGroup.jsp?rev=748163&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgentGroup.jsp (added)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgentGroup.jsp Thu Feb 26 14:47:01 2009
@@ -0,0 +1,95 @@
+<%--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ --%>
+
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<html>
+ <s:i18n name="localization.Continuum">
+ <head>
+ <title><s:text name="buildAgentGroup.page.title"/><title>
+ </head>
+ <body>
+ <div class="app">
+ <div id="axial" class="h3">
+ <h3><s:text name="buildAgentGroup.section.title"/></h3>
+
+ <div class="axial">
+ <s:form action="saveBuildAgentGroup" method="post" name="buildAgentGroup">
+ <c:if test="${!empty actionErrors}">
+ <div class="errormessage">
+ <s:iterator value="actionErrors">
+ <p><s:property/></p>
+ </s:iterator>
+ </div>
+ </c:if>
+
+ <table>
+ <s:hidden name="typeGroup"/>
+ <c:choose>
+ <c:when test="${typeGroup=='new'}">
+ <s:textfield label="%{getText('buildAgentGroup.name.label')}" name="buildAgentGroup.name" required="true"/>
+ </c:when>
+ <c:otherwise>
+ <s:hidden name="buildAgentGroup.name"/>
+ <s:textfield label="%{getText('buildAgentGroup.name.label')}" name="buildAgentGroup.name" required="true" disabled="true"/>
+ </c:otherwise>
+ </c:choose>
+ </table>
+
+ <c:choose>
+ <c:when test="${not empty buildAgents}">
+ <table>
+ <s:optiontransferselect
+ label="%{getText('buildAgentGroup.buildAgents.define')}"
+ name="buildAgentIds"
+ list="buildAgents"
+ listKey="url"
+ listValue="url"
+ headerKey="-1"
+ headerValue="%{getText('buildAgentGroup.available.buildAgents')}"
+ multiple="true"
+ emptyOption="false"
+ doubleName="selectedBuildAgentIds"
+ doubleList="buildAgentGroup.buildAgents"
+ doubleListKey="url"
+ doubleListValue="url"
+ doubleHeaderKey="-1"
+ doubleHeaderValue="%{getText('buildAgentGroup.available.buildAgents.used')}"
+ doubleMultiple="true"
+ doubleEmptyOption="false"
+ formName="buildAgentGroup" />
+ </table>
+ </c:when>
+ <c:otherwise>
+ <table>
+ <s:text name="buildAgents.empty"/>
+ </table>
+ </c:otherwise>
+ </c:choose>
+
+ <div class="functnbar3">
+ <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ </div>
+ </s:form>
+ </div>
+ </div>
+ </div>
+ </s:i18n>
+ </html>
\ No newline at end of file
Propchange: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgentGroup.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgentGroup.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp?rev=748163&r1=748162&r2=748163&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp Thu Feb 26 14:47:01 2009
@@ -52,9 +52,27 @@
<!-- if other fields are added ProfileAction#save must be changed -->
<table>
<tbody>
- <s:hidden name="profile.id" />
- <s:textfield label="%{getText('profile.name.label')}" name="profile.name"
- required="true" />
+ <tr>
+ <td>
+ <s:hidden name="profile.id" />
+ <s:textfield label="%{getText('profile.name.label')}" name="profile.name"
+ required="true" />
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <s:if test ="profile != null">
+ <s:if test="profile.buildAgentGroup == null">
+ <s:select label="%{getText('profile.build.agent.group')}" name="profile.buildAgentGroup" list="buildAgentGroups" listValue="name"
+ value="-1" listKey="name" headerKey="" headerValue=""/>
+ </s:if>
+ <s:else>
+ <s:select label="%{getText('profile.build.agent.group')}" name="profile.buildAgentGroup" list="buildAgentGroups" listValue="name"
+ listKey="name" headerKey="" headerValue=""/>
+ </s:else>
+ </s:if>
+ </td>
+ </tr>
</tbody>
</table>
<div class="functnbar3">
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp?rev=748163&r1=748162&r2=748163&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp Thu Feb 26 14:47:01 2009
@@ -66,6 +66,7 @@
</s:if>
</ul>
</ec:column>
+ <ec:column property="buildAgentGroup" title="profilesList.buildAgentGroup.label" style="white-space: nowrap" />
<ec:column property="id" title=" " width="1%">
<a href="editBuildEnv!edit.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
<img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0" />
@@ -75,7 +76,7 @@
<a href="confirmDeleteBuildEnv!confirmDelete.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
<img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
</a>
- </ec:column>
+ </ec:column>
</ec:row>
</ec:table>
</c:if>