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/02 14:46:12 UTC
svn commit: r722456 - in /continuum/branches/continuum-distributed-builds:
continuum-security/src/main/java/org/apache/maven/continuum/security/
continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/
continuum-webapp/src/main/mdo/ contin...
Author: ctan
Date: Tue Dec 2 05:46:11 2008
New Revision: 722456
URL: http://svn.apache.org/viewvc?rev=722456&view=rev
Log:
more ui fixes
Added:
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties (with props)
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp (contents, props changed)
- copied, changed from r722408, continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationDeleteBuildAgent.jsp
Removed:
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationDeleteBuildAgent.jsp
Modified:
continuum/branches/continuum-distributed-builds/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedBuildAction.java
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/mdo/view-models.mdo
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/localization/Continuum.properties
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/struts.xml
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildAgent.jsp
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp
Modified: continuum/branches/continuum-distributed-builds/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java?rev=722456&r1=722455&r2=722456&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-security/src/main/java/org/apache/maven/continuum/security/ContinuumRoleConstants.java Tue Dec 2 05:46:11 2008
@@ -121,4 +121,6 @@
public static final String CONTINUUM_MANAGE_REPOSITORIES = "continuum-manage-repositories";
public static final String CONTINUUM_MANAGE_PURGING = "continuum-manage-purging";
+
+ public static final String CONTINUUM_MANAGE_DISTRIBUTED_BUILDS = "continuum-manage-distributed-builds";
}
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=722456&r1=722455&r2=722456&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 2 05:46:11 2008
@@ -117,12 +117,15 @@
{
ConfigurationService configuration = getContinuum().getConfiguration();
- for ( BuildAgentConfiguration agent : configuration.getBuildAgents() )
+ if ( configuration.getBuildAgents() != null )
{
- if ( buildAgent.getUrl().equals( agent.getUrl() ) )
+ for ( BuildAgentConfiguration agent : configuration.getBuildAgents() )
{
- addActionError( "buildAgent.error.exist" );
- return ERROR;
+ if ( buildAgent.getUrl().equals( agent.getUrl() ) )
+ {
+ addActionError( getText( "buildAgent.error.exist" ) );
+ return ERROR;
+ }
}
}
@@ -149,7 +152,7 @@
{
if ( agent.isBusy() )
{
- message = "buildAgent.error.delete.busy";
+ message = getText( "buildAgent.error.delete.busy" );
return ERROR;
}
else
@@ -171,7 +174,7 @@
}
}
- message = "buildAgent.error.notfound";
+ message = getText( "buildAgent.error.notfound" );
return ERROR;
}
@@ -180,7 +183,7 @@
{
SecureActionBundle bundle = new SecureActionBundle();
bundle.setRequiresAuthentication( true );
- bundle.addRequiredAuthorization( ContinuumRoleConstants.SYSTEM_ADMINISTRATOR_ROLE, Resource.GLOBAL );
+ bundle.addRequiredAuthorization( ContinuumRoleConstants.CONTINUUM_MANAGE_DISTRIBUTED_BUILDS, Resource.GLOBAL );
return bundle;
}
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedBuildAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedBuildAction.java?rev=722456&r1=722455&r2=722456&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedBuildAction.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedBuildAction.java Tue Dec 2 05:46:11 2008
@@ -19,15 +19,15 @@
* under the License.
*/
-import java.util.LinkedHashMap;
+import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import org.apache.continuum.distributed.BuildAgent;
import org.apache.continuum.distributed.manager.DistributedBuildManager;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.security.ContinuumRoleConstants;
import org.apache.maven.continuum.web.action.ContinuumActionSupport;
+import org.apache.maven.continuum.web.model.DistributedBuildSummary;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.redback.integration.interceptor.SecureAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
@@ -46,13 +46,17 @@
*/
DistributedBuildManager distributedBuildManager;
- private Map<String, String> distributedBuilds;
+ private List<DistributedBuildSummary> distributedBuildSummary;
+
+ private int projectId;
+
+ private String buildAgentUrl;
public String view()
{
List<BuildAgent> buildAgents = distributedBuildManager.getBuildAgents();
- distributedBuilds = new LinkedHashMap<String, String>();
+ distributedBuildSummary = new ArrayList<DistributedBuildSummary>();
for ( BuildAgent buildAgent : buildAgents )
{
@@ -60,10 +64,22 @@
{
for ( Project project : buildAgent.getProjects() )
{
- distributedBuilds.put( project.getName(), buildAgent.getUrl() );
+ DistributedBuildSummary summary = new DistributedBuildSummary();
+ summary.setProjectId( project.getId() );
+ summary.setProjectName( project.getName() );
+ summary.setUrl( buildAgent.getUrl() );
+
+ distributedBuildSummary.add( summary );
}
}
}
+
+ return SUCCESS;
+ }
+
+ public String cancel()
+ throws Exception
+ {
return SUCCESS;
}
@@ -72,18 +88,38 @@
{
SecureActionBundle bundle = new SecureActionBundle();
bundle.setRequiresAuthentication( true );
- bundle.addRequiredAuthorization( ContinuumRoleConstants.SYSTEM_ADMINISTRATOR_ROLE, Resource.GLOBAL );
+ bundle.addRequiredAuthorization( ContinuumRoleConstants.CONTINUUM_MANAGE_QUEUES, Resource.GLOBAL );
return bundle;
}
- public Map<String, String> getDistributedBuilds()
+ public List<DistributedBuildSummary> getDistributedBuildSummary()
+ {
+ return distributedBuildSummary;
+ }
+
+ public void setDistributedBuildSummary( List<DistributedBuildSummary> distributedBuildSummary )
+ {
+ this.distributedBuildSummary = distributedBuildSummary;
+ }
+
+ public int getProjectId()
+ {
+ return projectId;
+ }
+
+ public void setProjectId( int projectId )
+ {
+ this.projectId = projectId;
+ }
+
+ public String getBuildAgentUrl()
{
- return distributedBuilds;
+ return buildAgentUrl;
}
- public void setDistributedBuilds( Map<String, String> distributedBuilds )
+ public void setBuildAgentUrl( String buildAgentUrl )
{
- this.distributedBuilds = distributedBuilds;
+ this.buildAgentUrl = buildAgentUrl;
}
}
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/mdo/view-models.mdo
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/mdo/view-models.mdo?rev=722456&r1=722455&r2=722456&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/mdo/view-models.mdo (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/mdo/view-models.mdo Tue Dec 2 05:46:11 2008
@@ -476,46 +476,29 @@
</fields>
</class>
<class>
- <name>BuildAgentSummary</name>
+ <name>DistributedBuildSummary</name>
<version>1.0.0+</version>
<fields>
<field>
- <name>url</name>
+ <name>projectId</name>
<version>1.0.0</version>
<required>true</required>
- <description>URL of the build agent</description>
- <type>String</type>
- </field>
- <field>
- <name>description</name>
- <version>1.0.0</version>
- <required>false</required>
- <description>Description of the build agent</description>
- <type>String</type>
+ <description>ID of the project</description>
+ <type>int</type>
</field>
<field>
- <name>enabled</name>
+ <name>projectName</name>
<version>1.0.0</version>
<required>true</required>
- <description>Determines if the build agent is enabled</description>
- <type>boolean</type>
+ <description>Name of the project</description>
+ <type>String</type>
</field>
<field>
- <name>busy</name>
+ <name>url</name>
<version>1.0.0</version>
<required>true</required>
- <description>Determines if the build agent is busy</description>
- <type>boolean</type>
- </field>
- <field>
- <name>projects</name>
- <version>1.0.0</version>
- <description></description>
- <required>false</required>
- <association>
- <type>ProjectSummary</type>
- <multiplicity>*</multiplicity>
- </association>
+ <description>URL of the build agent</description>
+ <type>String</type>
</field>
</fields>
</class>
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=722456&r1=722455&r2=722456&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/localization/Continuum.properties Tue Dec 2 05:46:11 2008
@@ -83,6 +83,7 @@
menu.administration.queues = Queues
menu.administration.repositories = Local Repositories
menu.administration.purge = Purge Configurations
+menu.administration.buildAgents = Build Agents
# ----------------------------------------------------------------------
# Page: error
@@ -242,6 +243,7 @@
configuration.releaseOutputDirectory.label = Release Output Directory
configuration.releaseOutputDirectory.message = Enter the release output directory of the Continuum web application
configuration.releaseOutputDirectory.required = You must define a release output directory
+configuration.distributedBuildEnabled.label = Enable Distributed Builds
# ----------------------------------------------------------------------
# Page: Add Project
@@ -947,4 +949,36 @@
scmResult.state = State
scmResult.projectGroupName = Project Group Name
scmResult.scmRootAddress = SCM Root URL
-scmResult.scmError = SCM Error
\ No newline at end of file
+scmResult.scmError = SCM Error
+
+# ----------------------------------------------------------------------
+# Page: BuildAgents
+# ----------------------------------------------------------------------
+buildAgents.page.title = Continuum - Build Agents
+buildAgents.section.title = Build Agents
+buildAgents.table.url = Build Agent URL
+buildAgents.table.description = Description
+buildAgents.table.enabled = Enabled
+
+# ----------------------------------------------------------------------
+# Page: Add/Edit BuildAgent
+# ----------------------------------------------------------------------
+buildAgent.page.title = Continuum - Add/Edit Build Agent
+buildAgent.section.title = Add/Edit Build Agent
+buildAgent.url.label = Build Agent URL
+buildAgent.description.label = Description
+buildAgent.enabled.label = Enabled
+
+# ----------------------------------------------------------------------
+# Page: View BuildAgent
+# ----------------------------------------------------------------------
+viewBuildAgent.page.title = Continuum - View Build Agent
+viewBuildAgent.section.title = Build Agent
+viewBuildAgent.installations.title = Available Installations
+
+# ----------------------------------------------------------------------
+# Page: Delete BuildAgent
+# ----------------------------------------------------------------------
+deleteBuildAgent.page.title = Continuum - Delete Build Agent
+deleteBuildAgent.section.title = Delete Build Agent
+deleteBuildAgent.confirmation.message = Are you sure you want to delete build agent {0} ?
\ No newline at end of file
Added: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties?rev=722456&view=auto
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties (added)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties Tue Dec 2 05:46:11 2008
@@ -0,0 +1,22 @@
+#
+# 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.
+#
+
+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
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/struts.xml?rev=722456&r1=722455&r2=722456&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/struts.xml Tue Dec 2 05:46:11 2008
@@ -869,14 +869,14 @@
</action>
<action name="saveBuildAgent" class="buildAgent" method="save">
- <result name="input">/WEB-INF/jsp/admin/addBuildAgent.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/addBuildAgent.jsp</result>
+ <result name="input">/WEB-INF/jsp/admin/editBuildAgent.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/editBuildAgent.jsp</result>
<result name="success" type="redirect-action">
<param name="actionName">buildAgentList</param>
</result>
</action>
- <action name="removeBuildAgent" class="buildAgent" method="delete">
+ <action name="deleteBuildAgent" class="buildAgent" method="delete">
<result name="error" type="redirect-action">
<param name="actionName">buildAgentList</param>
<param name="errorMessage">${message}</param>
@@ -891,7 +891,7 @@
<result name="success">/WEB-INF/jsp/admin/viewBuildAgent.jsp</result>
</action>
- <action name="viewDistributedBuilds" class="distributedBuild" method="list">
+ <action name="viewDistributedBuilds" class="distributedBuild" method="view">
<result name="success">/WEB-INF/jsp/admin/viewDistributedBuilds.jsp</result>
</action>
</package>
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp?rev=722456&r1=722455&r2=722456&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp Tue Dec 2 05:46:11 2008
@@ -61,7 +61,7 @@
</s:a>
</ec:column>
<ec:column property="deleteActions" title=" " width="1%">
- <s:url id="removeBuildAgentUrl" action="removeBuildAgent">
+ <s:url id="removeBuildAgentUrl" action="deleteBuildAgent">
<s:param name="buildAgent.url">${pageScope.buildAgent.url}</s:param>
</s:url>
<s:a href="%{removeBuildAgentUrl}">
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp?rev=722456&r1=722455&r2=722456&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp Tue Dec 2 05:46:11 2008
@@ -83,11 +83,8 @@
</p></s:param>
</s:textfield>
- <s:checkbox label="%{getText('configuration.distributedBuildEnabled.label')}" name="distributedBuildEnabled">
- <s:param name="desc"><p>
- <s:text name="configuration.distributedBuildEnabled.label"/>
- </p></s:param>
- </s:checkbox>
+ <s:checkbox label="%{getText('configuration.distributedBuildEnabled.label')}" name="distributedBuildEnabled"/>
+
<s:hidden name="requireReleaseOutput"/>
</tbody>
</table>
Copied: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp (from r722408, continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationDeleteBuildAgent.jsp)
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp?p2=continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp&p1=continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationDeleteBuildAgent.jsp&r1=722408&r2=722456&rev=722456&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationDeleteBuildAgent.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp Tue Dec 2 05:46:11 2008
@@ -41,6 +41,7 @@
<div class="functnbar3">
<s:form action="deleteBuildAgent!delete.action" method="post">
<input type="hidden" name="buildAgent.url" value="${buildAgent.url}" />
+ <s:hidden name="confirmed" value="true"/>
<c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
</s:form>
</div>
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 2 05:46:11 2008
@@ -0,0 +1 @@
+/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationDeleteBuildAgent.jsp:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339
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=722456&r1=722455&r2=722456&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 Tue Dec 2 05:46:11 2008
@@ -35,7 +35,7 @@
<c:if test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
- <p><s:text name="<s:property/>" /></p>
+ <p><s:property/></p>
</s:iterator>
</div>
</c:if>
@@ -43,9 +43,8 @@
<table>
<s:textfield label="%{getText('buildAgent.url.label')}" name="buildAgent.url" required="true"/>
<s:textfield label="%{getText('buildAgent.description.label')}" name="buildAgent.description"/>
- <s:checkbox label="%{getText('buildAgent.enabled.label')}" name="enabled" value="enabled" fieldValue="true"/>
+ <s:checkbox label="%{getText('buildAgent.enabled.label')}" name="buildAgent.enabled" value="buildAgent.enabled" fieldValue="true"/>
</table>
- <s:hidden name="buildAgent.url"/>
<div class="functnbar3">
<c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
</div>
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp?rev=722456&r1=722455&r2=722456&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp Tue Dec 2 05:46:11 2008
@@ -35,7 +35,7 @@
<c:if test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
- <p><s:text name="<s:property/>" /></p>
+ <p><s:property/></p>
</s:iterator>
</div>
</c:if>
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp?rev=722456&r1=722455&r2=722456&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp Tue Dec 2 05:46:11 2008
@@ -20,22 +20,25 @@
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri="continuum" prefix="c1" %>
+
<html>
<s:i18n name="localization.Continuum">
<head>
- <title><s:text name="buildAgent.page.title"/></title>
+ <title><s:text name="viewBuildAgent.page.title"/></title>
</head>
<body>
<div id="h3">
- <h3><s:text name="buildAgent.section.title"/></h3>
+ <h3><s:text name="viewBuildAgent.section.title"/></h3>
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
<c1:data label="%{getText('buildAgent.url.label')}" name="buildAgent.url"/>
<c1:data label="%{getText('buildAgent.description.label')}" name="buildAgent.description"/>
+ <c1:data label="%{getText('buildAgent.enabled.label')}" name="buildAgent.enabled"/>
</table>
</div>
- <h3><s:text name="buildAgent.installations.title"/></h3>
+ <h3><s:text name="viewBuildAgent.installations.title"/></h3>
<ec:table items="installations"
var="installation"
showExports="false"
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp?rev=722456&r1=722455&r2=722456&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp Tue Dec 2 05:46:11 2008
@@ -45,8 +45,15 @@
sortable="false"
filterable="false">
<ec:row>
- <ec:column property="key" title="distributedBuild.table.project"/>
- <ec:column property="value" title="distributedBuild.table.agentUrl"/>
+ <ec:column property="projectName" title="distributedBuild.table.project"/>
+ <ec:column property="url" title="distributedBuild.table.agentUrl"/>
+ <ec:column property="cancelEntry" title=" " width="1%">
+ <s:url id="cancelUrl" action="cancelDistributedBuildProject" method="cancel" namespace="/">
+ <s:param name="projectId">${pageScope.distributedBuild.projectId}</s:param>
+ <s:param name="buildAgentUrl">${pageScope.distributedBuild.url}</s:param>
+ </s:url>
+ <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
+ </ec:column>
</ec:row>
</ec:table>
</div>