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/01 15:13:00 UTC
svn commit: r722076 - in /continuum/branches/continuum-distributed-builds:
continuum-api/src/main/java/org/apache/continuum/distributed/
continuum-api/src/main/java/org/apache/continuum/distributed/manager/
continuum-core/src/main/java/org/apache/conti...
Author: ctan
Date: Mon Dec 1 06:12:59 2008
New Revision: 722076
URL: http://svn.apache.org/viewvc?rev=722076&view=rev
Log:
- added ui pages
- more fix in distributedbuildmanager
Added:
continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/distributed/BuildAgent.java (props changed)
- copied unchanged from r721318, continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/continuum/distributed/BuildAgent.java
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java (contents, props changed)
- copied, changed from r721372, continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildAgentAction.java
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedBuildAction.java (with props)
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/addBuildAgent.jsp (with props)
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp (with props)
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationDeleteBuildAgent.jsp (with props)
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp (with props)
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp (with props)
Removed:
continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/continuum/distributed/BuildAgent.java
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildAgentAction.java
Modified:
continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/distributed/manager/DistributedBuildManager.java
continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/continuum/distributed/manager/DefaultDistributedBuildManager.java
continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/resources/struts.xml
Propchange: continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/distributed/BuildAgent.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/distributed/manager/DistributedBuildManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/distributed/manager/DistributedBuildManager.java?rev=722076&r1=722075&r2=722076&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/distributed/manager/DistributedBuildManager.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-api/src/main/java/org/apache/continuum/distributed/manager/DistributedBuildManager.java Mon Dec 1 06:12:59 2008
@@ -19,8 +19,10 @@
* under the License.
*/
+import java.util.List;
import java.util.Map;
+import org.apache.continuum.distributed.BuildAgent;
import org.apache.maven.continuum.ContinuumException;
/**
@@ -43,4 +45,6 @@
void updateBuildResult( Map context )
throws ContinuumException;
+
+ List<BuildAgent> getBuildAgents();
}
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/continuum/distributed/manager/DefaultDistributedBuildManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/continuum/distributed/manager/DefaultDistributedBuildManager.java?rev=722076&r1=722075&r2=722076&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/continuum/distributed/manager/DefaultDistributedBuildManager.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/continuum/distributed/manager/DefaultDistributedBuildManager.java Mon Dec 1 06:12:59 2008
@@ -540,4 +540,9 @@
}
}
}
+
+ public List<BuildAgent> getBuildAgents()
+ {
+ return buildAgents;
+ }
}
Copied: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java (from r721372, continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/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?p2=continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java&p1=continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildAgentAction.java&r1=721372&r2=722076&rev=722076&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/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 Mon Dec 1 06:12:59 2008
@@ -1,10 +1,30 @@
-package org.apache.maven.continuum.web.action.admin;
+package org.apache.continuum.web.action.admin;
+
+/*
+ * 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.
+ */
import org.apache.continuum.configuration.BuildAgentConfiguration;
import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.model.system.Installation;
import org.apache.maven.continuum.security.ContinuumRoleConstants;
-import org.apache.maven.continuum.web.action.ContinuumActionSupport;
+import org.apache.maven.continuum.web.action.ContinuumConfirmAction;
+import org.apache.struts2.ServletActionContext;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.redback.integration.interceptor.SecureAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
@@ -12,21 +32,34 @@
import java.util.List;
+/**
+ * @author Maria Catherine Tan
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="buildAgent"
+ */
public class BuildAgentAction
- extends ContinuumActionSupport
+ extends ContinuumConfirmAction
implements SecureAction
{
private List<BuildAgentConfiguration> buildAgents;
private BuildAgentConfiguration buildAgent;
- private String buildAgentUrl;
-
private List<Installation> installations;
+ private boolean confirmed;
+
+ private String message;
+
public String list()
throws Exception
{
+ String errorMessage = ServletActionContext.getRequest().getParameter( "errorMessage" );
+
+ if ( errorMessage != null )
+ {
+ addActionError( errorMessage );
+ }
+
this.buildAgents = getContinuum().getConfiguration().getBuildAgents();
return SUCCESS;
}
@@ -38,10 +71,10 @@
for ( BuildAgentConfiguration agent : configuration.getBuildAgents() )
{
- if ( agent.getUrl().equals( buildAgentUrl ) )
+ if ( agent.getUrl().equals( buildAgent.getUrl() ) )
{
buildAgent = agent;
-
+
// connect to BuildAgentXMLRPCCLIENT
// installations = client.getAvailableInstallations();
break;
@@ -73,18 +106,23 @@
public String delete()
throws Exception
{
+ if ( !confirmed )
+ {
+ return CONFIRM;
+ }
+
ConfigurationService configuration = getContinuum().getConfiguration();
for ( BuildAgentConfiguration agent : configuration.getBuildAgents() )
{
if ( buildAgent.getUrl().equals( agent.getUrl() ) )
{
- configuration.removeBuildAgent( buildAgent );
+ configuration.removeBuildAgent( agent );
return SUCCESS;
}
}
- addActionError( "buildAgent.error.notfound" );
+ message = "buildAgent.error.notfound";
return ERROR;
}
@@ -118,23 +156,33 @@
this.buildAgent = buildAgent;
}
- public String getBuildAgentUrl()
+ public List<Installation> getInstallations()
+ {
+ return installations;
+ }
+
+ public void setInstallations( List<Installation> installations )
{
- return buildAgentUrl;
+ this.installations = installations;
}
- public void setBuildAgentUrl( String buildAgentUrl )
+ public boolean isConfirmed()
{
- this.buildAgentUrl = buildAgentUrl;
+ return confirmed;
}
- public List<Installation> getInstallations()
+ public void setConfirmed( boolean confirmed )
{
- return installations;
+ this.confirmed = confirmed;
}
- public void setInstallations( List<Installation> installations )
+ public String getMessage()
{
- this.installations = installations;
+ return this.message;
+ }
+
+ public void setMessage( String message )
+ {
+ this.message = message;
}
}
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java
------------------------------------------------------------------------------
svn:mergeinfo =
Added: 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=722076&view=auto
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedBuildAction.java (added)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedBuildAction.java Mon Dec 1 06:12:59 2008
@@ -0,0 +1,91 @@
+package org.apache.continuum.web.action.admin;
+
+/*
+ * 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.
+ */
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+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.codehaus.plexus.redback.rbac.Resource;
+import org.codehaus.redback.integration.interceptor.SecureAction;
+import org.codehaus.redback.integration.interceptor.SecureActionBundle;
+import org.codehaus.redback.integration.interceptor.SecureActionException;
+
+/**
+ * @author Maria Catherine Tan
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="distributedBuild"
+ */
+public class DistributedBuildAction
+ extends ContinuumActionSupport
+ implements SecureAction
+{
+ /**
+ * @plexus.requirement
+ */
+ DistributedBuildManager distributedBuildManager;
+
+ private Map<String, String> distributedBuilds;
+
+ public String view()
+ {
+ List<BuildAgent> buildAgents = distributedBuildManager.getBuildAgents();
+
+ distributedBuilds = new LinkedHashMap<String, String>();
+
+ for ( BuildAgent buildAgent : buildAgents )
+ {
+ if ( buildAgent.getProjects() != null )
+ {
+ for ( Project project : buildAgent.getProjects() )
+ {
+ distributedBuilds.put( project.getName(), buildAgent.getUrl() );
+ }
+ }
+ }
+ return SUCCESS;
+ }
+
+ public SecureActionBundle getSecureActionBundle()
+ throws SecureActionException
+ {
+ SecureActionBundle bundle = new SecureActionBundle();
+ bundle.setRequiresAuthentication( true );
+ bundle.addRequiredAuthorization( ContinuumRoleConstants.SYSTEM_ADMINISTRATOR_ROLE, Resource.GLOBAL );
+
+ return bundle;
+ }
+
+ public Map<String, String> getDistributedBuilds()
+ {
+ return distributedBuilds;
+ }
+
+ public void setDistributedBuilds( Map<String, String> distributedBuilds )
+ {
+ this.distributedBuilds = distributedBuilds;
+ }
+}
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedBuildAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/DistributedBuildAction.java
------------------------------------------------------------------------------
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=722076&r1=722075&r2=722076&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 Mon Dec 1 06:12:59 2008
@@ -859,6 +859,36 @@
</result>
</action>
+ <action name="buildAgentList" class="buildAgent" method="list">
+ <result name="success">/WEB-INF/jsp/admin/buildAgentsList.jsp</result>
+ </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="success" type="redirect-action">
+ <param name="actionName">buildAgentList</param>
+ </result>
+ </action>
+
+ <action name="removeBuildAgent" class="buildAgent" method="delete">
+ <result name="error" type="redirect-action">
+ <param name="actionName">buildAgentList</param>
+ <param name="errorMessage">${message}</param>
+ </result>
+ <result name="confirm">/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp</result>
+ <result name="success" type="redirect-action">
+ <param name="actionName">buildAgentList</param>
+ </result>
+ </action>
+
+ <action name="viewBuildAgent" class="buildAgent" method="view">
+ <result name="success">/WEB-INF/jsp/admin/viewBuildAgent.jsp</result>
+ </action>
+
+ <action name="viewDistributedBuilds" class="distributedBuild" method="list">
+ <result name="success">/WEB-INF/jsp/admin/viewDistributedBuilds.jsp</result>
+ </action>
</package>
<package name="component" extends="default">
Added: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/addBuildAgent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/addBuildAgent.jsp?rev=722076&view=auto
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/addBuildAgent.jsp (added)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/addBuildAgent.jsp Mon Dec 1 06:12:59 2008
@@ -0,0 +1,57 @@
+<%--
+ ~ 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="buildAgent.page.title"/><title>
+ </head>
+ <body>
+ <div class="app">
+ <div id="axial" class="h3">
+ <h3><s:text name="buildAgent.page.title"/></h3>
+
+ <div class="axial">
+ <s:form action="saveBuildAgent" method="post" validate="true">
+ <c:if test="${!empty actionErrors}">
+ <div class="errormessage">
+ <s:iterator value="actionErrors">
+ <p><s:text name="<s:property/>" /></p>
+ </s:iterator>
+ </div>
+ </c:if>
+
+ <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"/>
+ </table>
+
+ <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/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/addBuildAgent.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/addBuildAgent.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: 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=722076&view=auto
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp (added)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp Mon Dec 1 06:12:59 2008
@@ -0,0 +1,73 @@
+<%--
+ ~ 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="http://www.extremecomponents.org" prefix="ec" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<html>
+ <s:i18n name="localization.Continuum">
+ <head>
+ <title><s:text name="buildAgents.page.title"/></title>
+ </head>
+ <body>
+ <div id="h3">
+ <h3><s:text name="buildAgents.section.title"/></h3>
+ <c:if test="${!empty actionErrors}">
+ <div class="errormessage">
+ <s:iterator value="actionErrors">
+ <p><s:text name="<s:property/>" /></p>
+ </s:iterator>
+ </div>
+ </c:if>
+ <s:set name="buildAgents" value="buildAgents" scope="request"/>
+ <ec:table items="buildAgents"
+ var="buildAgent"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row>
+ <ec:column property="url" title="buildAgents.table.url">
+ <s:url id="viewBuildAgentUrl" action="viewBuildAgent">
+ <s:param name="buildAgent.url">${pageScope.buildAgent.url}</s:param>
+ </s:url>
+ <s:a href="%{viewBuildAgentUrl}">${pageScope.buildAgent.url}</s:a>
+ </ec:column>
+ <ec:column property="enabled" title="buildAgents.table.enabled"/>
+ <ec:column property="description" title="buildAgents.table.description"/>
+ <ec:column property="deleteActions" title=" " width="1%">
+ <s:url id="removeBuildAgentUrl" action="removeBuildAgent">
+ <s:param name="buildAgent.url">${pageScope.buildAgent.url}</s:param>
+ </s:url>
+ <s:a href="%{removeBuildAgentUrl}">
+ <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" border="0">
+ </s:a>
+ </ec:column>
+ </ec:row>
+ </ec:table>
+ </div>
+ <div class="functnbar3">
+ <s:form action="addBuildAgent" method="post">
+ <s:submit value="%{getText('add')}"/>
+ </s:form>
+ </div>
+ </body>
+ </s:i18n>
+</html>
\ No newline at end of file
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: 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/configurationDeleteBuildAgent.jsp?rev=722076&view=auto
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationDeleteBuildAgent.jsp (added)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationDeleteBuildAgent.jsp Mon Dec 1 06:12:59 2008
@@ -0,0 +1,50 @@
+<%--
+ ~ 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="deleteBuildAgent.page.title"/></title>
+ </head>
+ <body>
+ <div id="axial" class="h3">
+ <h3><s:text name="deleteBuildAgent.section.title"/></h3>
+
+ <div class="warningmessage">
+ <p>
+ <strong>
+ <s:text name="deleteBuildAgent.confirmation.message">
+ <s:param><s:property value="buildAgent.url"/></s:param>
+ </s:text>
+ </strong>
+ </p>
+ </div>
+ <div class="functnbar3">
+ <s:form action="deleteBuildAgent!delete.action" method="post">
+ <input type="hidden" name="buildAgent.url" value="${buildAgent.url}" />
+ <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ </s:form>
+ </div>
+ </div>
+ </body>
+ </s:i18n>
+</html>
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationDeleteBuildAgent.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationDeleteBuildAgent.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: 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=722076&view=auto
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp (added)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp Mon Dec 1 06:12:59 2008
@@ -0,0 +1,56 @@
+<%--
+ ~ 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="http://www.extremecomponents.org" prefix="ec" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<html>
+ <s:i18n name="localization.Continuum">
+ <head>
+ <title><s:text name="buildAgent.page.title"/></title>
+ </head>
+ <body>
+ <div id="h3">
+ <h3><s:text name="buildAgent.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"/>
+ </table>
+ </div>
+
+ <h3><s:text name="buildAgent.installations.title"/></h3>
+ <ec:table items="installations"
+ var="installation"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row highlightRow="true">
+ <ec:column property="name" title="Name" style="white-space: nowrap" />
+ <ec:column property="type" title="Type" style="white-space: nowrap" />
+ <ec:column property="varName" title="Env Var Name" style="white-space: nowrap" />
+ <ec:column property="varValue" title="Value/Path" style="white-space: nowrap" />
+ </ec:row>
+ </ec:table>
+ </div>
+ </body>
+ </s:i18n>
+</html>
\ No newline at end of file
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewBuildAgent.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: 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=722076&view=auto
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp (added)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp Mon Dec 1 06:12:59 2008
@@ -0,0 +1,55 @@
+<%--
+ ~ 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="http://www.extremecomponents.org" prefix="ec" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+
+<html>
+ <s:i18n name="localization.Continuum">
+ <head>
+ <title><s:text name="distributedBuilds.page.title"/></title>
+ </head>
+ <body>
+ <div id="h3">
+ <h3><s:text name="distributedBuilds.section.title"/></h3>
+ <c:if test="${!empty actionErrors}">
+ <div class="errormessage">
+ <s:iterator value="actionErrors">
+ <p><s:text name="<s:property/>" /></p>
+ </s:iterator>
+ </div>
+ </c:if>
+ <s:set name="distributedBuilds" value="distributedBuilds" scope="request"/>
+ <ec:table items="distributedBuilds"
+ var="distributedBuild"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row>
+ <ec:column property="key" title="distributedBuild.table.project"/>
+ <ec:column property="value" title="distributedBuild.table.agentUrl"/>
+ </ec:row>
+ </ec:table>
+ </div>
+ </body>
+ </s:i18n>
+</html>
\ No newline at end of file
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision