You are viewing a plain text version of this content. The canonical link for it is here.
Posted to lokahi-commits@incubator.apache.org by to...@apache.org on 2006/07/10 19:57:34 UTC
svn commit: r420624 - in /incubator/lokahi/lokahi/trunk: ./
src/java/org/apache/lokahi/core/agent/dao/
src/java/org/apache/lokahi/core/agent/runnable/ src/www/Apache/Entity/
src/www/Apache/Pool/ src/www/Apache/Worker/ src/www/Core/Alerts/
src/www/Core/...
Author: toback
Date: Mon Jul 10 12:57:33 2006
New Revision: 420624
URL: http://svn.apache.org/viewvc?rev=420624&view=rev
Log:
Change to the agent to allow it to process children jobs depending on the success / failure of the parent.
Some small updates to the gui to make it more consistent.
Modified:
incubator/lokahi/lokahi/trunk/STATUS
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/AgentJob.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/ReportingThread.java
incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm
incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm
incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/add.vm
incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm
incubator/lokahi/lokahi/trunk/src/www/Core/Project/add.vm
incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm
incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm
incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm
incubator/lokahi/lokahi/trunk/src/www/Template/addVhost.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/addExistingToVhost.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/confirm.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm
Modified: incubator/lokahi/lokahi/trunk/STATUS
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/STATUS?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
(empty)
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/AgentJob.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/AgentJob.java?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/AgentJob.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/dao/AgentJob.java Mon Jul 10 12:57:33 2006
@@ -23,6 +23,7 @@
import org.apache.lokahi.core.common.interfaces.Collectable;
import org.apache.lokahi.core.common.interfaces.Dao;
import org.apache.lokahi.core.common.util.PropertiesFile;
+import org.apache.lokahi.core.agent.runnable.ReportingThread;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -208,7 +209,26 @@
}
public boolean canRunNow() {
- return (parentName == null || "".equals(parentName));
+ boolean ret =
+ (parentName == null || "".equals(parentName));
+ if (!ret ) {
+ State s = ReportingThread.getParentInfo(parentName);
+ if (s != null) {
+ if (s.getPk() == State.COMPLETE.getPk()) {
+ ret = true;
+ } else if (s.getPk() == State.FAILED.getPk()) {
+ this.setStatus(State.FAILED);
+ this.setResult("Not run due to parent job failure.");
+ ret = false;
+ try {
+ this.update();
+ } catch (SQLException e) {
+ logger.info("Exception:" + e.getMessage());
+ }
+ }
+ }
+ }
+ return ret;
}
public static Collection<AgentJob> getJobs(State s) {
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/ReportingThread.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/ReportingThread.java?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/ReportingThread.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/runnable/ReportingThread.java Mon Jul 10 12:57:33 2006
@@ -33,8 +33,10 @@
*/
public class ReportingThread implements Runnable {
static final Logger logger = Logger.getLogger(JobScheduler.class);
-
+ private static final int watchLength = 20;
+ private static int queueLocation = 0;
private static volatile boolean run = false;
+ private static FinishedJobQueue queue = new FinishedJobQueue(watchLength);
public ReportingThread() {
setRun(true);
@@ -48,6 +50,14 @@
ReportingThread.run = run;
}
+ public static boolean isFinished(String jobName) {
+ return true;
+ }
+
+ public static State getParentInfo(String name){
+ return queue.getState(name);
+ }
+
public void run() {
if (logger.isDebugEnabled()) logger.debug("Starting Reporting Thread.");
while (shouldRun()) {
@@ -55,6 +65,7 @@
jobs.addAll(AgentJob.getJobs(State.FAILED));
if (logger.isDebugEnabled()) logger.debug("Number of Jobs to send back:" + jobs.size());
for (AgentJob j : jobs) {
+ queue.add(j.getName(), j.getStatus());
Message m = new TMCSOAPMessage();
String hostName = "";
try {
@@ -98,4 +109,64 @@
}
}
}
+}
+
+class FinishedJobQueue {
+ private FinishedJobQueueEntry[] queue;
+ private int loc = 0;
+ FinishedJobQueue(int length) {
+ queue = new FinishedJobQueueEntry[length];
+ }
+ void add(String name, State state) {
+ if (loc +1 >= queue.length){
+ loc = 0;
+ }
+ queue[loc] = new FinishedJobQueueEntry(name, state);
+ loc++;
+ }
+
+ State getState(String name) {
+ State s = null;
+ int loc=0;
+ while (loc < queue.length && s == null && queue[loc] != null) {
+ if (queue[loc].getJobnames() != null && name != null && name.equalsIgnoreCase(queue[loc].getJobnames())) {
+ s = queue[loc].getState();
+ }
+ }
+ return s;
+ }
+
+}
+
+class FinishedJobQueueEntry {
+ private String jobnames;
+ private State state;
+
+ public FinishedJobQueueEntry(String jobnames, State state) {
+ this.jobnames = jobnames;
+ this.state = state;
+ }
+
+ public FinishedJobQueueEntry() {
+ }
+
+
+ public String getJobnames() {
+ return jobnames;
+ }
+
+ public void setJobnames(String jobnames) {
+ this.jobnames = jobnames;
+ }
+
+ public State getState() {
+ return state;
+ }
+
+ public void setState(State state) {
+ this.state = state;
+ }
+
+
+
}
Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm Mon Jul 10 12:57:33 2006
@@ -21,8 +21,19 @@
<div align="center" class="contentbox">
<br /><br />
-<div id="bigright">
-<div class="messagebox">
+ <div class="projectbox">
+ <table width="100%" border="0" cellspacing="0" cellpadding="1">
+ <tr class="info" valign="top">
+ <td colspan="2">Infrastructure - <b>Virtualhost</b>
+ </td>
+ <td align="right">
+ #parse("Apache/Entity/menu/global.vm")
+ </td>
+ </tr>
+ </table>
+ <br />
+
+ <div class="messagebox">
#if ($request.getParameter("id"))
#set ($id = $request.getParameter("id"))
#end
@@ -158,10 +169,11 @@
#end
#end
-
- <input type="submit" value="submit" />
+<br />
+ <input type="submit" value="Submit" />
</form>
#else
+<br />
VirtualHost:
#set ($vhosts = $view.getVirtualHosts())
<select name=id onchange='OnChange(this);'>
@@ -170,9 +182,10 @@
<option value="$appRoot/Apache/Entity/modify.vm?id=$vhost.getPk()">$vhost.getName()</option>
#end
</select><br />
-
+<br />
#end
</div>
+<br />
</div>
<br />
</div>
Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm Mon Jul 10 12:57:33 2006
@@ -17,10 +17,22 @@
##
#set ($menu = "/layout/menu/ProjectTop.vm")
#parse("/layout/header.vm")
+<div align="center" class="contentbox">
+<br /><br />
-<div id="bigright">
- <div class="messagebox" align="left">
+ <div class="projectbox">
+ <table width="100%" border="0" cellspacing="0" cellpadding="1">
+ <tr class="info" valign="top">
+ <td colspan="2">Infrastructure - <b>Virtualhost</b>
+ </td>
+ <td align="right">
+ #parse("Apache/Entity/menu/global.vm")
+ </td>
+ </tr>
+ </table>
+ <br />
+ <div class="messagebox">
#if($request.getParameter("p"))
#set($pId = $request.getParameter("p"))
#end
@@ -38,6 +50,9 @@
#end
</div>
+ <br />
+ </div>
+ <br />
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm Mon Jul 10 12:57:33 2006
@@ -47,8 +47,8 @@
#end
-<!-- Number of workers: $numberOfWorkers --><br /><br />
-
+<!-- Number of workers: $numberOfWorkers -->
+<br />
<form name="Form" method="post" action='$link.setAction("administration/ApachePoolAction")'>
<table>
<tr>
@@ -143,7 +143,7 @@
#end
</table>
<input type="hidden" name="methodToCall" value="AddApachePool">
- <input type="submit" value="submit">
+ <input type="submit" value="Submit">
</form>
</div>
<br />
Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm Mon Jul 10 12:57:33 2006
@@ -16,13 +16,17 @@
## $Id$
##
#if ($User.isAllowed($function) && $methodToCall && $actionLink)
+<div class="messagebox">
<form name="Form" method="post" action='$link.setAction($actionLink)'>
+ <br />
<input type=hidden name="methodToCall" value="$methodToCall">
- <input type="submit" value="$buttonName"><br />
+ <input type="submit" value="$buttonName">
+ <br />
$methodToCall
<input type=hidden name=id value="$individual.getPk()">
$individual.getName()
</form>
+</div>
#end
<!-- todo make this much smarter -->
Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm Mon Jul 10 12:57:33 2006
@@ -41,10 +41,11 @@
#if ($id)
#set ($apacheWorker = $view.getApacheWorker($id))
-
+ <br />
<TextArea cols="90" READONLY rows="30">$!{apacheWorker.buildConfForWeb()}</textarea>
-
+ <br />
#else
+ <br />
Apache Worker:
#set ($aws = $view.getApacheWorkers())
<select name=id onchange='OnChange(this);'>
@@ -53,6 +54,7 @@
<option value="$appRoot/Apache/Pool/viewconf.vm?id=$aw.getPk()">$aw.getName()
#end
</select><br />
+ <br />
#end
</div>
Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm Mon Jul 10 12:57:33 2006
@@ -43,10 +43,11 @@
#if ($id)
#set ($apacheWorker = $view.getApacheWorker($id))
-
+ <br />
<TextArea cols="90" READONLY rows="30">$!{apacheWorker.buildWorkersProperties()}</textarea>
-
+ <br />
#else
+ <br />
Apache Worker:
#set ($aws = $view.getApacheWorkers())
<select name=id onchange='OnChange(this);'>
@@ -55,6 +56,7 @@
<option value="$appRoot/Apache/Pool/viewprop.vm?id=$aw.getPk()">$aw.getName()
#end
</select><br />
+ <br />
#end
</div>
Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm Mon Jul 10 12:57:33 2006
@@ -16,12 +16,16 @@
## $Id$
##
#if ($User.isAllowed($function) && $methodToCall && $actionLink)
+<div class="messagebox">
<form name="Form" method="post" action='$link.setAction($actionLink)'>
<input type=hidden name="methodToCall" value="$methodToCall">
- <input type="submit" value="$buttonName"><br />
+ <br />
+ <input type="submit" value="$buttonName">
+ <br />
$methodToCall
<input type=hidden name=id value="$individual.getPk()">
$individual.getName()
</form>
+</div>
#end
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/add.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Alerts/add.vm Mon Jul 10 12:57:33 2006
@@ -71,7 +71,7 @@
</tr>
</table>
<input type="hidden" name="methodToCall" value="AddAlert">
- <input type="submit" value="submit">
+ <input type="submit" value="Submit">
</form>
</div>
<br />
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Pool/add.vm Mon Jul 10 12:57:33 2006
@@ -89,7 +89,8 @@
</tr>
</table>
<input type="hidden" name="methodToCall" value="AddHostingPool">
- <input type="submit" value="submit">
+ <br />
+ <input type="submit" value="Submit">
</form>
</div>
<br />
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/add.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/add.vm Mon Jul 10 12:57:33 2006
@@ -39,7 +39,7 @@
</table>
<input type="hidden" id="parentProjectId" name="parentProjectId" value="$!{parentProjectId}">
<input type="hidden" name="methodToCall" value="AddProject">
- <input type="submit" value="submit">
+ <input type="submit" value="Submit">
</form>
</div>
</div>
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/delete.vm Mon Jul 10 12:57:33 2006
@@ -18,8 +18,19 @@
#set ($menu = "/layout/menu/ProjectTop.vm")
#set ($pageSelected = "Administration")
#parse("/layout/header.vm")
-<div id="center">
- <div class="messagebox">
+<div align="center" class="contentbox">
+ <br /><br />
+
+ <div class="projectbox">
+ <table width="100%" border="0" cellspacing="0" cellpadding="1">
+ <tr class="info" valign="top">
+ <td colspan=3>Project - <b>Delete</b>
+ </td>
+ </tr>
+ </table>
+ <br />
+
+ <div class="messagebox">
#set ($projectId = $request.getParameter("project"))
#set($actionLink = "administration/project/Delete")
@@ -61,6 +72,9 @@
#end
</div>
+ <br />
+ </div>
+ <br />
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Project/details.vm Mon Jul 10 12:57:33 2006
@@ -63,9 +63,9 @@
</td>
</tr>
</table>
-<br />
#set($c = 1)
#if( $vhosts && ! $vhosts.isEmpty())
+<br />
<table width="95%" border="0" cellspacing="0" cellpadding="1">
<tr height="15" class="info">
<td align="left" valign="center" colspan=4 >
@@ -155,7 +155,6 @@
#end
#end ## end of IF VHOST.
</TABLE>
-<br />
#set ($temp = $projectContexts.clone())
#foreach ($context in $temp)
#if($envId && $context.getEnvId().toString() != $envId)
@@ -163,6 +162,7 @@
#end
#end
#if( $projectContexts && ! $projectContexts.isEmpty())
+<br />
<TABLE WIDTH="95%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
<tr height="15" class="info">
<td align="left" valign="center" colspan=4 >
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/User/addToProject.vm Mon Jul 10 12:57:33 2006
@@ -112,6 +112,7 @@
<input type="hidden" name="methodToCall" value="AddUserToProject">
#if ($projectId)
#set ($project = $User.getProject($projectId))
+<br />
<input type="hidden" name="projectId" value="$projectId">Project: $project.getName() <br />
#else
<br />
@@ -134,7 +135,9 @@
#end
#else
User ID: <input type="text" name="userId" size="11" onkeypress="return handleEnter(this, event)">
-<br /><input type=button value="Add User" onClick='OnClickUser()'>
+<br />
+<br />
+<input type=button value="Add User" onClick='OnClickUser()'>
#end
#end
Modified: incubator/lokahi/lokahi/trunk/src/www/Template/addVhost.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Template/addVhost.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Template/addVhost.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Template/addVhost.vm Mon Jul 10 12:57:33 2006
@@ -134,10 +134,11 @@
#end
#end
-
-<input type="submit" value="submit"/>
+<br />
+<input type="submit" value="Submit"/>
</form>
</div>
+<br />
</div>
<br />
</div>
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm Mon Jul 10 12:57:33 2006
@@ -41,6 +41,7 @@
<div class="messagebox">
<form name="Form" method="post" action='$link.setAction("administration/ContextAction")'>
+ <br />
<table>
<tr>
<td>
@@ -120,7 +121,8 @@
</tr>
</table>
<input type="hidden" name="methodToCall" value="AddContext">
- <input type="submit" value="submit">
+ <br />
+ <input type="submit" value="Submit">
</form>
</div>
<br />
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/addExistingToVhost.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/addExistingToVhost.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/addExistingToVhost.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/addExistingToVhost.vm Mon Jul 10 12:57:33 2006
@@ -28,11 +28,22 @@
#set($vid = $request.getParameter("v"))
#set($vhost = $view.getVirtualHost($vid))
#end
+<div align="center" class="contentbox">
+ <br /><br />
+ <div class="projectbox">
+ <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
+ <TR CLASS="info" valign="top">
+ <TD colspan=3>Infrastructure - <b>Context</b>
+ </TD>
+ <td align="right">
+ #parse("Tomcat/Entity/menu/global.vm")
+ </td>
+ </TR>
+ </table>
+ <br />
-<div id="bigright">
- <div class="messagebox">
-
+ <div class="messagebox">
<form name="Form" method="post" action='$link.setAction("templating/AddExistingContextVhostAction")'>
<input type="hidden" id="vhostid" name="vhostid" value="$!{vid}">
@@ -72,9 +83,13 @@
</tr>
</table>
<input type="hidden" name="methodToCall" value="AddContext">
- <input type="submit" value="submit">
+ <br />
+ <input type="submit" value="Submit">
</form>
</div>
+ <br />
+ </div>
+ <br />
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm Mon Jul 10 12:57:33 2006
@@ -15,13 +15,25 @@
##
## $Id$
##
-#set ($menu = "/layout/menu/ProjectTop.vm")
+#set ($menu = "/layout/menu/PoolTop.vm")
#parse("/layout/header.vm")
-
-<div class="contentbox" align="center">
+<div align="center" class="contentbox">
<br /><br />
- <div class="messagebox" width="75%" align="center">
+ <div class="projectbox">
+ <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
+ <TR CLASS="info" valign="top">
+ <TD colspan=3>Infrastructure - <b>Context</b>
+ </TD>
+ <td align="right">
+ #parse("Tomcat/Entity/menu/global.vm")
+ </td>
+ </TR>
+ </table>
+ <br />
+
+ <div class="messagebox">
+
#set ($cid = $request.getParameter("c"))
#set ($pid = $request.getParameter("p"))
#set ($fid = $request.getParameter("f"))
@@ -58,6 +70,7 @@
<!-- $User.getContextFunctions($project.getPk(), $context) -->
<input type="hidden" name=methodToCall value="$f.getCommand()">
<!-- submit outstide -->
+ <br />
<input type="submit" value="Submit">
</form>
#end
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm Mon Jul 10 12:57:33 2006
@@ -42,6 +42,7 @@
<form name="Form" method="post" action='$link.setAction("administration/TomcatPoolAction")'>
+ <br />
<table>
<tr>
<td>
@@ -103,7 +104,7 @@
<td>
</table>
<input type="hidden" name="methodToCall" value="AddTomcatPool">
- <input type="submit" value="submit">
+ <input type="submit" value="Submit">
</form>
</div>
<br />
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/confirm.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/confirm.vm Mon Jul 10 12:57:33 2006
@@ -16,12 +16,17 @@
## $Id$
##
#if ($User.isAllowed($function) && $methodToCall && $actionLink)
+<div class="messagebox">
<form name="Form" method="post" action='$link.setAction($actionLink)'>
+ <br />
<input type=hidden name="methodToCall" value="$methodToCall">
- <input type="submit" value="$buttonName"><br />
+ <br />
+ <input type="submit" value="$buttonName">
+ <br />
$methodToCall
<input type=hidden name=id value="$individual.getPk()">
$individual.getName()
</form>
+</div>
#end
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm Mon Jul 10 12:57:33 2006
@@ -26,6 +26,9 @@
<TR CLASS="info" valign="top">
<TD colspan=3>Infrastructure - <b>Tomcat Pool</b>
</TD>
+ <td align="right">
+ #parse("Tomcat/Pool/menu/global.vm")
+ </td>
</TR>
</table>
<div class="messagebox">
@@ -35,6 +38,7 @@
#set ($tomcatPool = $view.getTomcatPool($id))
#if ($User.isAllowed("UpdateTomcatPool") && $methodToCall == "UpdateTomcatPool")
+<br />
<form name="Form" method="post" action='$link.setAction("administration/TomcatPoolAction")'>
<input type="hidden" id="id" name="id" value="$!{id}">
<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
@@ -68,9 +72,10 @@
<option value="$worker.getPk()" > $worker.getName()
#end
</select>
-<br /><br /><input type="submit" value="submit">
+<br /><br /><input type="submit" value="Submit">
#end
#else
+ <br />
Tomcat Pool:
#set ($aps = $view.getTomcatPools())
<select name=id onchange='OnChange(this);'>
@@ -79,6 +84,7 @@
<option value="$appRoot/Tomcat/Pool/update.vm?id=$ap.getPk()">$ap.getName()
#end
</select><br />
+ <br />
#end
</form>
</div>
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm Mon Jul 10 12:57:33 2006
@@ -26,18 +26,26 @@
<TR CLASS="info" valign="top">
<TD colspan=3>Infrastructure - <b>Tomcat Pool</b>
</TD>
+ <td align="right">
+ #parse("Tomcat/Pool/menu/global.vm")
+ </td>
</TR>
</table>
+ <br />
+
+ <div class="messagebox">
#if ($request.getParameter("id"))
#set ($id = $request.getParameter("id"))
#end
- <div class="messagebox">
#if ($id)
#set ($tomcatWorker = $view.getTomcatWorker($id))
<!-- $tomcatWorker -->
<!-- buildConfForWeb -->
+ <br />
<TextArea cols="90" READONLY rows="30">$!{tomcatWorker.buildConfForWeb()}</textarea>
+ <br />
#else
+ <br />
Tomcat Worker:
#set ($tws = $view.getTomcatWorkers())
<select name=id onchange='OnChange(this);'>
@@ -46,7 +54,10 @@
<option value="$appRoot/Tomcat/Pool/viewconf.vm?id=$tw.getPk()">$tw.getName()
#end
</select><br />
+ <br />
#end
+ </div>
+ <br />
</div>
<br />
</div>
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm?rev=420624&r1=420623&r2=420624&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/add.vm Mon Jul 10 12:57:33 2006
@@ -31,8 +31,10 @@
</td>
</TR>
</table>
+<br />
<div class="messagebox">
<form name="Form" method="post" action='$link.setAction("administration/TomcatAction")'>
+<br />
<table>
<tr>
<td>
@@ -159,7 +161,7 @@
-->
</table>
<input type="hidden" name="methodToCall" value="AddTomcat">
-<input type="submit" value="submit">
+<input type="submit" value="Submit">
</form>
</div>
<br />