incubator-lokahi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tob...@apache.org
Subject svn commit: r392982 [19/25] - in /incubator/lokahi/lokahi/trunk: ./ conf/ database/ docs/ lib/ src/ src/java/ src/java/lokahi/ src/java/lokahi/core/ src/java/lokahi/core/agent/ src/java/lokahi/core/agent/callable/ src/java/lokahi/core/agent/callable/co...
Date Mon, 10 Apr 2006 16:20:11 GMT
Added: incubator/lokahi/lokahi/trunk/src/java/lokahi/tomcat/gui/www/TomcatWorkerAction.java
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/java/lokahi/tomcat/gui/www/TomcatWorkerAction.java?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/lokahi/tomcat/gui/www/TomcatWorkerAction.java (added)
+++ incubator/lokahi/lokahi/trunk/src/java/lokahi/tomcat/gui/www/TomcatWorkerAction.java Mon Apr 10 09:19:33 2006
@@ -0,0 +1,127 @@
+/*
+* Copyright 2006  The Apache Software Foundation
+*
+* Licensed 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.
+*/
+package lokahi.tomcat.gui.www;
+
+import lokahi.core.api.function.Function;
+import lokahi.core.api.user.User;
+import lokahi.core.common.collection.TMCSet;
+import lokahi.core.common.exception.AuthorizationException;
+import lokahi.core.common.exception.TMCException;
+import lokahi.core.common.exception.TMCIllegalArgumentException;
+import lokahi.core.gui.www.TMCAction;
+import lokahi.tomcat.api.worker.TomcatWorker;
+import lokahi.tomcat.api.worker.TomcatWorkerModel;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.validator.DynaValidatorForm;
+
+import java.sql.SQLException;
+import java.util.Collection;
+
+/**
+ * @author Stephen Toback
+ * @version $Id: TomcatWorkerAction.java,v 1.1 2006/03/07 20:18:52 drtobes Exp $
+ */
+public class TomcatWorkerAction extends TMCAction {
+  static final Logger logger = Logger.getLogger(TomcatWorkerAction.class);
+
+  public ActionMessages executeFunctions(DynaValidatorForm form, Function f, User user) {
+    ActionMessages messages = new ActionMessages();
+    try {
+      Collection<TomcatWorker> c = getMultiTemplate(form);
+      TomcatWorkerModel twm = new TomcatWorkerModel();
+      twm.perform(f, new Class[]{user.getClass(), Collection.class, f.getClass()}, new Object[]{user, c, f});
+      messages = this.addMessage(messages, SUCCESS_MESSAGE, new ActionMessage("function.success." + f.getCommand()));
+    } catch (AuthorizationException e) {
+      messages = this.addMessage(messages, new ActionMessage("error.notAuthorized"));
+      if (logger.isInfoEnabled()) {
+        logger.info("Exception: " + e.getMessage());
+      }
+    } catch (SQLException e) {
+      if (logger.isInfoEnabled()) {
+        logger.info("Exception: " + e.getMessage());
+      }
+      messages = this.addMessage(messages, new ActionMessage("error.db"));
+    } catch (TMCIllegalArgumentException e) {
+      messages = this.addMessage(messages, new ActionMessage("error.badData"));
+      if (logger.isInfoEnabled()) {
+        logger.info("Exception: " + e.getMessage());
+      }
+    } catch (NoSuchMethodException e) {
+      if (logger.isInfoEnabled()) {
+        logger.info("Exception: " + e.getMessage());
+      }
+      messages = this.addMessage(messages, new ActionMessage("error.invalidFunction", f.getCommand()));
+    } catch (TMCException e) {
+      if (logger.isInfoEnabled()) {
+        logger.info("Exception: " + e.getMessage());
+      }
+      messages = this.addMessage(messages, new ActionMessage("error.badData"));
+    }
+    return messages;
+  }
+
+  private TomcatWorker getTemplate(DynaValidatorForm dynaForm) {
+    TomcatWorker tw = new TomcatWorker();
+    String Id = null;
+    if (dynaForm.getMap().containsKey("workerId")) {
+      Id = (String) dynaForm.get("workerId");
+    }
+    String name = (String) dynaForm.get("workerName");
+    String workerId = (String) dynaForm.get("tomcatId");
+    String stateId = (String) dynaForm.get("stateId");
+    String hardwareId = (String) dynaForm.get("hardwareId");
+    if (Id != null && !"".equals(Id)) {
+      tw.setPk(Integer.parseInt(Id));
+    }
+    if (hardwareId != null && !"".equals(hardwareId)) {
+      tw.setHardwareId(Integer.parseInt(hardwareId));
+    }
+    if (stateId != null && !"".equals(stateId)) {
+      tw.setStateId(Integer.parseInt(stateId));
+    }
+    if (workerId != null && !"".equals(workerId)) {
+      tw.setWorkerId(Integer.parseInt(workerId));
+    }
+    tw.setName(name);
+    return tw;
+  }
+
+  private Collection<TomcatWorker> getMultiTemplate(DynaValidatorForm dynaForm) throws SQLException {
+    Collection<TomcatWorker> c = new TMCSet<TomcatWorker>();
+    String[] ids = (String[]) dynaForm.get("id");
+    if (ids != null && ids.length > 0) {
+      StringBuffer names = new StringBuffer();
+      for (int i = 0; i < ids.length; i++) {
+        if (!"".equals(ids[i])) {
+          TomcatWorker hp = TomcatWorker.getTomcatWorker(Integer.parseInt(ids[i]), false);
+          if (hp != null) {
+            c.add(hp);
+            names.append(hp.getName());
+            names.append(',');
+          }
+        }
+      }
+    }
+    return c;
+  }
+
+}
+
+
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/add.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,79 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: add.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set ($menu = "/layout/PoolTop.vm")
+#set ($pageSelected = "Entity")
+#parse("/layout/header.vm")
+<div id="bigright">
+<div class="messagebox">
+<form name="Form" method="post" action='$link.setAction("administration/VirtualHostAction")'>
+<table>
+<tr>
+<td>
+Name:
+</td>
+<td>
+<input type="text" id="name" name="name" value="$!{name}">
+</td>
+</tr>
+<tr>
+<td>
+Entry:
+</td>
+<td>
+<textarea id="entry" name="entry" cols="70" rows="7" value="$!{entry}"></textarea>
+</td>
+</tr>
+<tr>
+<td>
+Environment:
+</td>
+<td>
+#set ($envs = $view.getEnvironments())
+<select name=envId>
+			      #foreach ($env in $envs)
+			      <option value="$env.getPk()">$env.getName()
+			      #end
+			      </select>
+</td>
+</tr>
+<tr>
+<td>
+State:
+</td>
+<td>
+Active
+<input type="hidden" id="stateId" name="stateId" value="8">
+</td>
+</tr>
+<tr>
+<td>
+Aliases (space delimited):
+</td>
+<td>
+<input type="text" id="aliases" name="aliases" value="$!{aliases}">
+</td>
+</tr>
+</table>
+<input type="hidden" name="methodToCall" value="AddVirtualHost">
+<input type="submit" value="submit">
+</form>
+</div>
+</div>
+#parse("/layout/footer.vm")
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/confirm.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/confirm.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/confirm.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/confirm.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,29 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: confirm.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+<!-- $User.isAllowed($function)  $methodToCall  $actionLink -->
+#if ($User.isAllowed($function) && $methodToCall && $actionLink)
+<form name="Form" method="post" action='$link.setAction($actionLink)'>
+<input type=hidden name="methodToCall" value="$methodToCall" >
+<input type="submit" value="$buttonName"><BR>
+$methodToCall
+<input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;
+$individual.getName()
+</form>
+#end
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/delete.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/delete.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/delete.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/delete.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,25 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: delete.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set($actionLink = "administration/VirtualHost/Delete")
+#set($methodToCall = "DeleteVirtualHost")
+#set($buttonName = "Delete")
+#set ($function = "DeleteVirtualHost")
+#set($currentPage = "$appRoot/Apache/Entity/delete.vm")
+#parse("Apache/Entity/list.vm")
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/details.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,75 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: details.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#if(!$menu)
+#set ($menu = "/layout/menu/PoolTop.vm")
+#set ($pageSelected = "Entity")
+#end
+#parse("/layout/header.vm")
+<div id="bigright">
+<div class="messagebox">
+
+
+#set ($id = $request.getParameter("id"))
+#set ($methodToCall = "UpdateVirtualHost")
+
+#if($id)
+#set ($vh = $view.getVirtualHost($id))
+
+#if ($User.isAllowed("ViewVirtualHost") && $methodToCall == "UpdateVirtualHost")
+<br>Name: $!{vh.getName()}
+<br>Entry: <textarea id="entry" READONLY name="entry" cols="70" rows="7">$!{vh.getEntry()}</textarea><BR>
+<br>Environment:
+#set ($envs = $view.getEnvironments())
+
+<select name=envId>
+<option value="$!{vh.getEnv().getPk()}">$!{vh.getEnv().getName()}
+#foreach ($env in $envs)
+<option value="$env.getPk()">$env.getName()
+#end
+</select><BR>
+      
+State: Active
+#end
+<br>
+#if ($User.isAllowed("UpdateVirtualHost") && $methodToCall == "UpdateVirtualHost")
+<br><A href="$appRoot/Apache/Entity/update.vm?id=$!{id}"> Update this Vhost</a><br>
+#end
+
+#if ($User.isAllowed("DeleteVirtualHost"))
+  <form name="Form" method="post" action='$appRoot/administration/VirtualHost/Delete.do'>
+  <input type=hidden name="methodToCall" value="delete" >
+  <input type=hidden name=id value="$id">
+  <input type="submit" value="Delete">
+  </form>
+#end
+
+
+#else
+VirtualHost:
+#set ($vhosts = $view.getVirtualHosts())
+               <select name=id onchange='OnChange(this);'>
+                          <option value="">Select one
+              			      #foreach ($vhost in $vhosts)
+              			      <option value="$appRoot/Apache/Entity/details.vm?id=$vhost.getPk()">$vhost.getName()
+              			      #end
+              			      </select><BR>
+              			      
+#end
+#parse("/layout/footer.vm")
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/list.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/list.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/list.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/list.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,45 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: list.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#if (!$collection)
+#set ($menu = "/layout/menu/PoolTop.vm")
+#set ($pageSelected = "Entity")
+#parse("/layout/header.vm")
+#set ($plf = "true")
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#set ($individual = $view.getVirtualHost($id))
+#set ($indivPage = "/Apache/Entity/confirm.vm")
+#else
+#set ($collection = $view.getVirtualHosts())
+#end
+#end
+#set ($entity = "Virtualhost")
+#set ($usesEnv = "true")
+#set ($path = "Apache/Entity")
+#if (! $currentPage)
+#set ($currentPage = "$appRoot/$path/list.vm")
+#end
+
+
+
+#parse("/layout/list2.vm")
+#if ($plf)
+#parse("/layout/footer.vm")
+#end
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/global.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/global.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/global.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/global.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,25 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: global.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+<select name=methodToCall onchange='OnChange(this);'>
+<option value="" selected>Select Action
+<option value="$appRoot/Apache/Entity/details.vm">&nbsp;Details&nbsp;</option>
+<option value="$appRoot/Apache/Entity/add.vm">&nbsp;Add&nbsp;</option>
+<option value="$appRoot/Apache/Entity/update.vm">&nbsp;Update&nbsp;</option>
+<option value="$appRoot/Apache/Entity/delete.vm">&nbsp;Delete&nbsp;</option>
+</select>
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/indiv.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/indiv.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/indiv.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/menu/indiv.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,24 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: indiv.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+<select name=methodToCall onchange='OnChange(this);'>
+<option value="" selected>Select Action
+<option value="$appRoot/Apache/Entity/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+<option value="$appRoot/Apache/Entity/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+<option value="$appRoot/Apache/Entity/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+</select>
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/modify.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,181 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: modify.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set ($menu = "/layout/menu/PoolTop.vm")
+#set ($pageSelected = "Entity")
+#parse("/layout/header.vm")
+<div align="center" class="contentbox">
+<br /><br />
+<div id="bigright">
+<div class="messagebox">
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#end
+
+#if ($request.getParameter("p"))
+#set ($pId = $request.getParameter("p"))
+#end
+
+
+
+#if ($id)
+<H4> Modify a VirtualHost</h4>
+#set ($vhost = $view.getVirtualHost($id))
+#set ($hp = $vhost.getHostingPool())
+#set ($hostingPoolId = $request.getParameter("hostingPoolId"))
+
+<SCRIPT LANGUAGE=javascript>
+<!--
+
+function ToChange(dropdown)
+{
+	var myindex  = dropdown.selectedIndex;
+	var SelValue = dropdown.options[myindex].value;
+	#if($pId)
+	var baseURL  = "$appRoot/Apache/Entity/modify.vm?id=$id&p=$pId&hostingPoolId=" + SelValue;
+	#else
+	var baseURL  = "$appRoot/Apache/Entity/modify.vm?id=$id&hostingPoolId=" + SelValue;
+	#end
+	top.location.href = baseURL;
+
+	return true;
+}
+
+
+function switchCheckBoxes() {
+		if (document.Form.nameVirtualHost.checked) {
+			document.Form.catchAll.disabled = false;
+			document.Form.catchAll.checked = false;
+		} else {
+			document.Form.catchAll.checked = true;
+			document.Form.catchAll.disabled = true; }
+
+	} // end of unShade function
+
+//-->
+</SCRIPT>
+
+
+
+
+<form name="Form" method="post" action='$link.setAction("templating/AddVirtualHostAction")'>
+<input type="hidden" id="methodToCall" name="methodToCall" value="UpdateVirtualHost">
+<input type="hidden" id="id" name="id" value="$id">
+#if ($pId)
+<input type="hidden" id="projectId" name="projectId" value="$!{pId}">
+#end
+Hosting Pool:
+#set ($hps = $view.getHostingPools())
+               <select name=hostingPoolId onchange='ToChange(this);'>
+              			      #foreach ($hp in $hps)
+              			      #if (($hp == $vhost.getHostingPool() && !$hostingPoolId) || ($hostingPoolId && $hp == $view.getHostingPool($hostingPoolId)))
+              			      <option value="$hp.getPk()" selected>$hp.getName()
+              			      #else
+              			      <option value="$hp.getPk()">$hp.getName()              			      
+              			      #end
+              			      #end
+              			      </select><BR>
+Server Name: <input type="text" id="vhostName" name="vhostName" value="$!{vhost.getName()}"><BR>
+Entry:
+<textarea id="entry" name="entry" cols="70" rows="7">$!{vhost.getEntry()}</textarea><br>
+NameVirtualHost:
+#if ($vhost.isNameBased())
+<input type=checkbox name=nameVirtualHost value=true checked onClick="switchCheckBoxes()"><BR>
+#else
+<input type=checkbox name=nameVirtualHost value=true onClick="switchCheckBoxes()"><BR>
+#end
+Catch All:
+#if ($vhost.isCatchAll())
+<input type=checkbox name=catchAll checked value=true><BR>
+#else
+<input type=checkbox name=catchAll value=true><BR>
+#end
+<!--Aliases (space delimited):
+<textarea id="aliases" name="aliases" cols="70" rows="2">$!{aliases}</textarea><BR>-->
+<BR>
+<!--Contexts:
+#if($hostingPoolId && $projectId)
+<A href="addVhost.vm?project=$projectId&tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
+#elseif($hostingPoolId)
+<A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
+#elseif($projectId)
+<A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&project=$projectId">Add another</a><br>
+#else
+<A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)">Add another</a><br>
+#end
+
+#if ($numberOfContexts > 0)
+#foreach($context in [1..$numberOfContexts])
+Context Name: <input type="text" id="contextName" name="contextName" value="$!{contextName}"> here again need to be able to add an existing...<BR>
+DocBase: <input type="text" id="docBase" name="docBase" value="$!{docBase}"> <BR>
+#end
+#end
+-->
+#if((!$hostingPoolId) || ($vhost.getHostingPool().getPk() == $hostingPoolId))
+#set ($hardware = $vhost.getHostingPool().getApachePool().getHardwares())
+<!-- $hardware -->
+Ips for $vhost.getHostingPool().getName():<br>
+Servername:  IP:<BR>
+  #foreach ($h in $hardware)
+$h.getName() <select name=ipId>
+    #foreach ($ip in $h.getIpCollection().orderByName().values())
+      #if ($vhost.getIps().contains($ip))
+        <option value="$ip.getPk()" selected>$ip.getName()
+      #else
+        <option value="$ip.getPk()">$ip.getName()
+      #end
+    #end
+  </select><br>
+  #end
+
+#else
+  #set ($hp = $view.getHostingPool($hostingPoolId))
+  #set ($ap = $hp.getApachePool())
+  #set($hardware = $ap.getHardwares())
+
+
+Ips for $hp.getName():<br>
+Servername:  IP:<BR>
+  #foreach ($h in $hardware)
+$h.getName() <select name=ipId>
+    #foreach ($ip in $h.getIpCollection().orderByName().values())
+    <option value="$ip.getPk()">$ip.getName()
+    #end
+  </select><br>
+  #end
+
+#end
+
+<input type="submit" value="submit">
+</form>
+#else
+VirtualHost:
+#set ($vhosts = $view.getVirtualHosts())
+               <select name=id onchange='OnChange(this);'>
+                          <option value="">Select one
+              			      #foreach ($vhost in $vhosts)
+              			      <option value="$appRoot/Apache/Entity/modify.vm?id=$vhost.getPk()">$vhost.getName()
+              			      #end
+              			      </select><BR>
+              			      
+#end
+</div>
+</div>
+<br />
+</div>
+#parse("/layout/footer.vm")
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/update.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,156 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: update.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set ($menu = "/layout/menu/PoolTop.vm")
+#set ($pageSelected = "Virtualhost")
+#parse("/layout/header.vm")
+<div align="center" class="contentbox">
+<br /><br />
+<div id="bigright">
+<div class="messagebox">
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#end
+
+#if ($id)
+<h4> Modify a VirtualHost</h4>
+#set ($vhost = $view.getVirtualHost($id))
+#set ($hp = $vhost.getHostingPool())
+#set ($hostingPoolId = $request.getParameter("hostingPoolId"))
+
+<SCRIPT LANGUAGE=javascript>
+<!--
+function ToChange(dropdown)
+{
+	var myindex  = dropdown.selectedIndex;
+	var SelValue = dropdown.options[myindex].value;
+	var baseURL  = "$appRoot/administration/VirtualHost/modify.vm?tcontexts=$numberOfContexts&hostingPoolId=" + SelValue;
+	top.location.href = baseURL;
+
+	return true;
+}
+function switchCheckBoxes() {
+		if (document.Form.nameVirtualHost.checked) {
+			document.Form.catchAll.disabled = false;
+			document.Form.catchAll.checked = false;
+		} else {
+			document.Form.catchAll.checked = true;
+			document.Form.catchAll.disabled = true; }
+
+	} // end of unShade function
+
+//-->
+</SCRIPT>
+
+
+
+
+<form name="Form" method="post" action='$link.setAction("templating/AddVirtualHostAction")'>
+<input type="hidden" id="methodToCall" name="methodToCall" value="UpdateVirtualHost">
+<input type="hidden" id="id" name="id" value="$id">
+Hosting Pool:
+#set ($hps = $view.getHostingPools())
+               <select name=hostingPoolId onchange='OnChange(this);'>
+              			      #foreach ($hp in $hps)
+              			      #if ($hp == $vhost.getHostingPool())
+              			      <option value="$hp.getPk()" selected>$hp.getName()
+              			      #else
+              			      <option value="$hp.getPk()">$hp.getName()
+              			      #end
+              			      #end
+              			      </select><BR>
+Server Name: <input type="text"  readonly id="vhostName" name="vhostName" value="$!{vhost.getName()}"><BR>
+Entry:
+<textarea id="entry" name="entry" cols="70" rows="7">$!{vhost.getEntry()}</textarea><br>
+NameVirtualHost: <input type=checkbox name=nameVirtualHost value=true checked onClick="switchCheckBoxes()"><BR>
+Catch All: <input type=checkbox name=catchAll value=true><BR>
+<!--Aliases (space delimited):
+<textarea id="aliases" name="aliases" cols="70" rows="2">$!{aliases}</textarea><BR>-->
+<BR>
+<!--Contexts:
+#if($hostingPoolId && $projectId)
+<A href="addVhost.vm?project=$projectId&tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
+#elseif($hostingPoolId)
+<A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br>
+#elseif($projectId)
+<A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)&project=$projectId">Add another</a><br>
+#else
+<A href="addVhost.vm?tcontexts=$math.add($numberOfContexts, 1)">Add another</a><br>
+#end
+
+#if ($numberOfContexts > 0)
+#foreach($context in [1..$numberOfContexts])
+Context Name: <input type="text" readonly id="contextName" name="contextName" value="$!{contextName}"> here again need to be able to add an existing...<BR>
+DocBase: <input type="text"  readonly id="docBase" name="docBase" value="$!{docBase}"> <BR>
+#end
+#end
+-->
+#if((!$hostingPoolId) || ($vhost.getHostingPool().getPk() == $hostingPoolId))
+#set ($treemap = $vhost.getIps())
+#set ($hardware = $vhost.getHostingPool().getApachePool().getHardwares())
+
+Ips for $vhost.getHostingPool().getName():<br>
+Servername:  IP:<BR>
+  #foreach ($h in $hardware)
+    #set ($ipSelected = $treemap.get($h))
+$h.getName() <select name=ipId>
+    #foreach ($ip in $h.getIps())
+      #if ($ipSelected == $ip)
+        <option value="$ip.getPk()" selected>$ip.getName()
+      #else
+        <option value="$ip.getPk()">$ip.getName()
+      #end
+    #end
+  </select><br>
+  #end
+
+#else
+  #set ($hp = $view.getHostingPool($hostingPoolId))
+  #set ($ap = $hp.getApachePool())
+  #set($hardware = $ap.getHardwares())
+
+Ips for $hp.getName():<br>
+Servername:  IP:<BR>
+  #foreach ($h in $hardware)
+$h.getName() <select name=ipId>
+    #foreach ($ip in $h.getIps())
+    <option value="$ip.getPk()">$ip.getName()
+    #end
+  </select><br>
+  #end
+
+#end
+
+<input type="submit" value="submit">
+</form>
+#else
+VirtualHost:
+#set ($vhosts = $view.getVirtualHosts())
+               <select name=id onchange='ToChange(this);'>
+                          <option value="">Select one
+              			      #foreach ($vhost in $vhosts)
+              			      <option value="$vhost.getPk()">$vhost.getName()
+              			      #end
+              			      </select><BR>
+              			      
+#end
+</div>
+</div>
+<br />
+</div>
+#parse("/layout/footer.vm")
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Entity/view.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,45 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: view.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set ($menu = "/layout/menu/ProjectTop.vm")
+#parse("/layout/header.vm")
+
+<div id="bigright">
+<div class="messagebox" align="left">
+
+#if($request.getParameter("p"))
+#set($pId = $request.getParameter("p"))
+#end
+#set ($id = $request.getParameter("id"))
+#if($id)
+#set ($vhost = $view.getVirtualHost($id))
+ $vhost.buildVhostEntriesForWeb()
+#if ($User.isAllowed("UpdateVirtualHost"))
+#if ($pId)
+<a href="$appRoot/Apache/Entity/modify.vm?id=$id&p=$pId">Modify this Vhost</a> &nbsp;<BR><BR>
+#else
+<a href="$appRoot/Apache/Entity/modify.vm?id=$id">Modify this Vhost</a> &nbsp;<BR><BR>
+#end
+#end
+#end
+
+</div>
+</div>
+
+#parse("/layout/footer.vm")
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/add.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,136 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: add.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set ($menu = "/layout/menu/PoolTop.vm")
+#set ($pageSelected = "Pool")
+#parse("/layout/header.vm")
+<div id="bigright">
+<div class="messagebox">
+#if ($request.getParameter("workers"))
+#set($numberOfWorkers = $math.toInteger($request.getParameter("workers")))
+#else
+#set($numberOfWorkers = 1)
+#end
+
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#end
+
+
+<!-- Number of workers: $numberOfWorkers --><BR><BR>
+
+<form name="Form" method="post" action='$link.setAction("administration/ApachePoolAction")'>
+<table>
+<tr>
+<td>
+Pool Name:
+</td>
+<td>
+#if($id)
+#set ($apachePool = $view.getApachePool($id))
+<input type="text" id="poolName" name="poolName" value="$!{apachePool.getName()}">
+#else
+<input type="text" id="poolName" name="poolName" value="$!{poolName}">
+#end
+</td>
+</tr>
+<tr>
+<td>
+Environment:
+</td>
+<td>
+#set ($envs = $view.getEnvironments())
+<select name=envId>
+			      #foreach ($env in $envs)
+			      <option value="$env.getPk()">$env.getName()
+			      #end
+			      </select>
+</td>
+</tr>
+<tr>
+<td collspan="2">
+<A href="add.vm?workers=$math.add($numberOfWorkers, 1)"> Add another Apache Worker</A>
+</td>
+</tr>
+<tr>
+<td>
+Apache Container:
+</td>
+<td>
+Hardware:
+</td>
+</tr>
+#if ($id)
+  #set($Apaches = $view.getApaches())
+  #set($hardware = $view.getHardwares())
+#else
+  #set($Apaches = $view.getApaches())
+  #set($hardware = $view.getHardwares())
+#end
+
+#if ($id)
+#foreach($run in [1..$numberOfWorkers])
+<tr>
+<td>
+$run
+<select name=apacheId>
+			      #foreach ($apache in $Apaches)
+			      <option value="$apache.getPk()">$apache.getName()
+			      #end
+			      </select>
+
+</td>
+<td>
+<select name=hardwareId>
+			      #foreach ($h in $hardware)
+			      <option value="$h.getPk()">$h.getName()
+			      #end
+			      </select>
+</td>
+</tr>
+#end
+#else
+#foreach($run in [1..$numberOfWorkers])
+<tr>
+<td>
+$run
+<select name=apacheId>
+			      #foreach ($apache in $Apaches)
+			      <option value="$apache.getPk()">$apache.getName()
+			      #end
+			      </select>
+
+</td>
+<td>
+<select name=hardwareId>
+			      #foreach ($h in $hardware)
+			      <option value="$h.getPk()">$h.getName()
+			      #end
+			      </select>
+</td>
+</tr>
+#end
+#end
+</table>
+<input type="hidden" name="methodToCall" value="AddApachePool">
+<input type="submit" value="submit">
+</form>
+</div>
+</div>
+#parse("/layout/footer.vm")
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/buildconf.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/buildconf.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/buildconf.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/buildconf.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,24 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: buildconf.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set($actionLink = "ApachePool/SubmitJobAction")
+#set($methodToCall = "BuildConfig")
+#set($buttonName = "Build Config")
+#set ($function = "BuildApacheConfig")
+#set ($currentPage = "$appRoot/Apache/Pool/buildconf.vm")
+#parse("/Apache/Pool/list.vm")
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/configtestapache.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/configtestapache.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/configtestapache.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/configtestapache.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,24 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: configtestapache.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set($actionLink = "ApachePool/SubmitJobAction")
+#set($methodToCall = "ConfigtestApache")
+#set($buttonName = "Configtest Apache")
+#set ($function = "ConfigtestApache")
+#set ($currentPage = "$appRoot/Apache/Pool/configtestapache.vm")
+#parse("Apache/Pool/list.vm")
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/confirm.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,29 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: confirm.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#if ($User.isAllowed($function) && $methodToCall && $actionLink)
+<form name="Form" method="post" action='$link.setAction($actionLink)'>
+<input type=hidden name="methodToCall" value="$methodToCall" >
+<input type="submit" value="$buttonName"><BR>
+$methodToCall
+<input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;
+$individual.getName()
+</form>
+#end
+
+<!-- todo make this much smarter -->
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/delete.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/delete.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/delete.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/delete.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,25 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: delete.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set($actionLink = "administration/ApachePool/Delete")
+#set($methodToCall = "DeleteApachePool")
+#set($buttonName = "Delete")
+#set ($function = "DeleteApachePool")
+#set ($currentPage = "$appRoot/Apache/Pool/delete.vm")
+#parse("Apache/Pool/list.vm")
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/deployconf.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/deployconf.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/deployconf.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/deployconf.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,24 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: deployconf.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set($actionLink = "ApachePool/SubmitJobAction")
+#set($methodToCall = "DeployApacheConfig")
+#set($buttonName = "Build and Deploy Config")
+#set ($function = "DeployApacheConfig")
+#set ($currentPage = "$appRoot/Apache/Pool/deployconf.vm")
+#parse("/Apache/Pool/list.vm")
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/details.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,164 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: details.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#if (! $page)
+#set ($menu = "/layout/menu/PoolTop.vm")
+#set ($pageSelected = "Pool")
+#set ($page = "details.vm")
+#end
+#parse("/layout/header.vm")
+
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#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="2">Infrastructure - <b>Apache Pool</b>
+  </td>
+  <td align="right">
+  #parse("/Apache/Pool/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
+
+
+#if ($id)
+  #set ($apachePool = $view.getApachePool($id))
+
+<table width="95%" border="0" cellspacing="0" cellpadding="1">
+  <tr height="15" class="info">
+	<td align="left" valign="center" colspan=2 >
+	  Apache Pool - $!{apachePool.getName()}
+	</b>
+	</td>
+	<TD align=right>
+  #set($ent = $apachePool)
+  #parse("/Apache/Pool/menu/indiv.vm")
+  </tr>
+			<tr class="headercolor1">
+			<td>Environment</td><td><A href="$appRoot/Core/Environment/details.vm?id=$!{apachePool.getEnv().getPk()}">$!{apachePool.getEnv().getName()}</a></td><td> </td></tr>
+			<tr class="headercolor2">
+			<td>Apache Workers:</td><td></td><td></td></tr>
+        #set ($apacheWorkers = $apachePool.getApaches())
+        #set ($c=1)
+        #foreach ($worker in $apacheWorkers)
+          <tr class="headercolor2">
+			    <td> </td>
+			    <td class="bodycolor2$c"><A href="$appRoot/Apache/Worker/$page?id=$worker.getPk()">$worker.getName()</a></td>
+			    <td align="right" class="bodycolor2$c">
+    #set($ent = $worker)
+    #parse("/Apache/Worker/menu/indiv.vm")
+			       </td>
+			    </tr>
+          #if ($c == 1)
+            #set($c=2)
+          #else
+            #set($c=1)
+          #end
+        #end
+</table>
+
+#set ($collection = $view.getHostingPools($apachePool))
+#if( $collection && ! $collection.isEmpty())
+<br />
+#parse("/Core/Pool/list.vm")
+#end 
+
+#set ($vhosts = $view.getVirtualHosts($User, $apachePool))
+#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 >
+	  Virtualhosts
+	</b>
+	</td>
+  </tr>
+  <tr class="info">
+  <th width=25%> Hostname </th>
+  <th width=15%> Environment </th>
+  <th width=30%> Worker </th>
+  <th width=30%>  </th>
+  </tr>
+  #set($c = 1)
+	#foreach ($vhost in $vhosts)
+		#set ($count = 1)
+    	<tr class="headercolor$c">
+		  <td><A href="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}"> $!{vhost.getName()} </td>
+    	<td> $!{vhost.getEnv().getName()} </td>
+		<td>
+		#foreach ($apacheWorker in $apachePool.getApaches())
+		  <A href="$appRoot/Apache/Worker/details.vm?id=$!{apacheWorker.getPk()}">$!{apacheWorker.getName()} </a><br>
+		#end
+		</td>
+		<td align="right">
+      #if ($User.isAllowed("AddContext") || $User.isAllowed("DeleteVirtualHost", $vhost) || $User.isAllowed("ViewVirtualHost",  $vhost) || $User.isAllowed("UpdateVirtualHost", $vhost))
+	      <select name=methodToCall onchange='OnChange(this);'>
+       	<option value="" selected>Select Action
+        #if ($User.isAllowed("AddContext"))
+          <option value="$appRoot/Tomcat/Entity/add.vm?id=$!{vhost.getPk()}">Add a context
+          <option value="$appRoot/Tomcat/Entity/addExistingToVhost.vm?v=$!{vhost.getPk()}">Add an existing context
+        #end
+        <!-- $User.isAllowed("DeleteVirtualHost", $vhost) -->
+        #if ($User.isAllowed("DeleteVirtualHost", $vhost))
+          <option value="$appRoot/Apache/Entity/delete.vm?id=$!{vhost.getPk()}">Delete this Vhost
+        #end
+        #if ($User.isAllowed("UpdateVirtualHost", $vhost))
+          <option value="$appRoot/Apache/Entity/modify.vm?id=$!{vhost.getPk()}">Modify this Vhost
+        #end
+        #if ($User.isAllowed("ViewVirtualHost", $vhost))
+          <option value="$appRoot/Apache/Entity/view.vm?id=$!{vhost.getPk()}">View this Vhost
+        #end
+        </select>
+      #end
+		</td>
+ 	  </tr>
+		#set ($count = $math.add($count, 1))
+        #if ($c == 1)
+          #set($c=2)
+        #else
+          #set($c=1)
+        #end
+	#end ##of all servers for this context
+</TABLE>
+#end 	## of all contexts
+
+#else
+  Apache Pool:
+  #set ($aps = $view.getApachePools())
+               <select name=id onchange='OnChange(this);'>
+                          <option value="">Select one
+              			      #foreach ($ap in $aps)
+              			      <option value="$appRoot/Apache/Pool/$page?id=$ap.getPk()">$ap.getName()
+              			      #end
+              			      </select><BR>
+#end
+
+
+<br>
+</div>
+<br>
+</div>
+
+#parse("/layout/footer.vm")
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/gracefulapache.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/gracefulapache.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/gracefulapache.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/gracefulapache.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,24 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: gracefulapache.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set($actionLink = "ApachePool/SubmitJobAction")
+#set($methodToCall = "GracefulApache")
+#set($buttonName = "Graceful Apache")
+#set ($function = "GracefulApache")
+#set ($currentPage = "$appRoot/Apache/Pool/gracefulapache.vm")
+#parse("Apache/Pool/list.vm")
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/list.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/list.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/list.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/list.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,43 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: list.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#if (!$collection)
+#set ($menu = "/layout/menu/PoolTop.vm")
+#set ($pageSelected = "Pool")
+#parse("/layout/header.vm")
+#set ($plf = "true")
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#set ($individual = $view.getApachePool($id))
+#set ($indivPage = "/Apache/Pool/confirm.vm")
+#else
+#set ($collection = $view.getApachePools())
+#end
+#end
+#set ($entity = "ApachePool")
+#set ($usesEnv = "true")
+#set ($path = "Apache/Pool")
+#if (! $currentPage)
+#set ($currentPage = "$appRoot/Apache/Pool/list.vm")
+#end
+
+#parse("/layout/list2.vm")
+#if ($plf)
+#parse("/layout/footer.vm")
+#end
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/global.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/global.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/global.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/global.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,59 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: global.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+<select name=methodToCall onchange='OnChange(this);'>
+<option value="" selected>Select Action
+#if($page)
+<option value="$appRoot/Apache/Pool/$page">&nbsp;Details&nbsp;</option>
+#else
+<option value="$appRoot/Apache/Pool/details.vm">&nbsp;Details&nbsp;</option>
+#end
+#if($User.isAllowed("UpdateApachePool"))
+<option value="$appRoot/Apache/Pool/update.vm">&nbsp;Update&nbsp;</option>
+#end
+#if($User.isAllowed("AddApachePool"))
+<option value="$appRoot/Apache/Pool/add.vm">&nbsp;Add&nbsp;</option>
+#end
+#if($User.isAllowed("DeleteApachePool"))
+<option value="$appRoot/Apache/Pool/delete.vm">&nbsp;Delete&nbsp;</option>
+#end
+#if($User.isAllowed("RestartApache"))
+<option value="$appRoot/Apache/Pool/restartapache.vm">&nbsp;Restart&nbsp;</option>
+#end
+#if($User.isAllowed("GracefulApache"))
+<option value="$appRoot/Apache/Pool/gracefulapache.vm">&nbsp;Graceful&nbsp;</option>
+#end
+#if($User.isAllowed("StopApache"))
+<option value="$appRoot/Apache/Pool/stopapache.vm">&nbsp;Stop&nbsp;</option>
+#end
+#if($User.isAllowed("StartApache"))
+<option value="$appRoot/Apache/Pool/startapache.vm">&nbsp;Start&nbsp;</option>
+#end
+#if($User.isAllowed("ConfigtestApache"))
+<option value="$appRoot/Apache/Pool/configtestapache.vm">&nbsp;Configtest&nbsp;</option>
+#end
+#if($User.isAllowed("ViewApachePool"))
+<option value="$appRoot/Apache/Pool/viewconf.vm">&nbsp;View Apache Config&nbsp;</option>
+#end
+#if($User.isAllowed("ViewApachePool"))
+<option value="$appRoot/Apache/Pool/viewprop.vm">&nbsp;View workers.properties&nbsp;</option>
+#end
+#if($User.isAllowed("DeployApacheConfig"))
+<option value="$appRoot/Apache/Pool/deployconf.vm">&nbsp;Deploy Apache Config&nbsp;</option>
+#end
+</select>
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/indiv.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/indiv.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/indiv.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/menu/indiv.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,56 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: indiv.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+<select name=methodToCall onchange='OnChange(this);'>
+<option value="" selected>Select Action
+#if($page)
+<option value="$appRoot/Apache/Pool/$page?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+#else
+<option value="$appRoot/Apache/Pool/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+#end
+#if($User.isAllowed("UpdateApachePool"))
+<option value="$appRoot/Apache/Pool/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+#end
+#if($User.isAllowed("DeleteApachePool"))
+<option value="$appRoot/Apache/Pool/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+#end
+#if($User.isAllowed("RestartApache"))
+<option value="$appRoot/Apache/Pool/restartapache.vm?id=$!{ent.getPk()}">&nbsp;Restart&nbsp;</option>
+#end
+#if($User.isAllowed("GracefulApache"))
+<option value="$appRoot/Apache/Pool/gracefulapache.vm?id=$!{ent.getPk()}">&nbsp;Graceful&nbsp;</option>
+#end
+#if($User.isAllowed("StopApache"))
+<option value="$appRoot/Apache/Pool/stopapache.vm?id=$!{ent.getPk()}">&nbsp;Stop&nbsp;</option>
+#end
+#if($User.isAllowed("StartApache"))
+<option value="$appRoot/Apache/Pool/startapache.vm?id=$!{ent.getPk()}">&nbsp;Start&nbsp;</option>
+#end
+#if($User.isAllowed("ConfigtestApache"))
+<option value="$appRoot/Apache/Pool/configtestapache.vm?id=$!{ent.getPk()}">&nbsp;Configtest&nbsp;</option>
+#end
+#if($User.isAllowed("ViewApachePool"))
+<option value="$appRoot/Apache/Pool/viewconf.vm">&nbsp;View Apache Config&nbsp;</option>
+#end
+#if($User.isAllowed("ViewApachePool"))
+<option value="$appRoot/Apache/Pool/viewprop.vm">&nbsp;View workers.properties&nbsp;</option>
+#end
+#if($User.isAllowed("DeployApacheConfig"))
+<option value="$appRoot/Apache/Pool/deployconf.vm?id=$!{ent.getPk()}">&nbsp;Deploy Apache Config&nbsp;</option>
+#end
+</select>
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/restartapache.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/restartapache.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/restartapache.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/restartapache.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,24 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: restartapache.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set($actionLink = "ApachePool/SubmitJobAction")
+#set($methodToCall = "RestartApache")
+#set($buttonName = "Restart Apache")
+#set ($function = "RestartApache")
+#set ($currentPage = "$appRoot/Apache/Pool/restartapache.vm")
+#parse("Apache/Pool/list.vm")
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/startapache.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/startapache.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/startapache.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/startapache.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,24 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: startapache.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set($actionLink = "ApachePool/SubmitJobAction")
+#set($methodToCall = "StartApache")
+#set($buttonName = "Start Apache")
+#set ($function = "StartApache")
+#set ($currentPage = "$appRoot/Apache/Pool/startapache.vm")
+#parse("Apache/Pool/list.vm")
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/stopapache.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/stopapache.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/stopapache.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/stopapache.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,24 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: stopapache.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set($actionLink = "ApachePool/SubmitJobAction")
+#set($methodToCall = "StopApache")
+#set($buttonName = "Stop Apache")
+#set ($function = "StopApache")
+#set ($currentPage = "$appRoot/Apache/Pool/stopapache.vm")
+#parse("Apache/Pool/list.vm")
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/update.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,87 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: update.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set ($menu = "/layout/menu/PoolTop.vm")
+#set ($pageSelected = "Pool")
+#parse("/layout/header.vm")
+<div id="bigright">
+<div class="messagebox">
+#set ($id = $request.getParameter("id"))
+#set ($methodToCall = "UpdateApachePool")
+
+<table>
+#if($id)
+#set ($apachePool = $view.getApachePool($id))
+#set ($numberOfWorkers = $apachePool.getApaches().size())
+
+#if ($User.isAllowed("UpdateApachePool") && $methodToCall == "UpdateApachePool")
+<form name="Form" method="post" action='$link.setAction("administration/ApachePoolAction")'>
+<input type="hidden" id="id" name="id" value="$!{id}">
+<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+<tr><td>
+Pool Name:</td><td> <input type="text" id="poolName" name="poolName" value="$!{apachePool.getName()}"><BR>
+</td></tr>
+<tr><td>
+Environment:</td><td>
+#set ($envs = $view.getEnvironments())
+<select name=envId>
+##if ($apachePool.getEnv())
+##if ($envs.remove($apachePool.getEnv()))
+
+##end
+##end
+            <option value="$apachePool.getEnv().getPk()">$apachePool.getEnv().getName()
+			      #foreach ($env in $envs)
+			      <option value="$env.getPk()">$env.getName()
+			      #end
+			      </select>
+			      </td></tr>
+			      
+
+
+##Steve testing
+<tr><td><b>Apache Workers</b> - <A href="update.vm?id=$id&workers=$math.add($numberOfWorkers, 1)"> Add Worker</a></td></tr>
+
+#foreach ($worker in $apachePool.getApaches())
+		<tr><td nowrap>
+		 $worker.getName() -</td>
+		 <td> 
+		 <A href="$appRoot/Apache/Worker/delete.vm?id=$worker.getPk()"> Delete</A> |
+		 <A href="modify.vm?workerId=$worker.getPk()"> Modify</A>
+		 
+		</td></tr>
+#end
+</td></tr>
+#end
+#else
+  Apache Pool:
+  #set ($aps = $view.getApachePools())
+               <select name=id onchange='OnChange(this);'>
+                          <option value="">Select one
+              			      #foreach ($ap in $aps)
+              			      <option value="$appRoot/Apache/Pool/update.vm?id=$ap.getPk()">$ap.getName()
+              			      #end
+              			      </select>
+              			      </td></tr>
+#end
+</table>
+</form>
+</div>
+</div>
+#parse("/layout/footer.vm")
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/view.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/view.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/view.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/view.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,21 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: view.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set ($menu = "/layout/menu/ProjectTop.vm")
+#set ($page = "view.vm")
+#parse("/Apache/Pool/details.vm")
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewconf.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,49 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: viewconf.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set ($menu = "/layout/PoolTop.vm")
+#set ($pageSelected = "Pool")
+#parse("/layout/header.vm")
+
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#end
+
+<div id="bigright">
+<div class="messagebox">
+
+#if ($id)
+#set ($apacheWorker = $view.getApacheWorker($id))
+
+<TextArea cols="90" READONLY rows="30">$!{apacheWorker.buildConfForWeb()}</textarea>
+
+#else
+Apache Worker:
+#set ($aws = $view.getApacheWorkers())
+               <select name=id onchange='OnChange(this);'>
+                          <option value="">Select one
+              			      #foreach ($aw in $aws)
+              			      <option value="$appRoot/Apache/Pool/viewconf.vm?id=$aw.getPk()">$aw.getName()
+              			      #end
+              			      </select><BR>
+#end
+
+</div>
+</div>
+#parse("/layout/footer.vm")
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Pool/viewprop.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,51 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: viewprop.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set ($menu = "/layout/PoolTop.vm")
+#set ($pageSelected = "Pool")
+#parse("/layout/header.vm")
+
+
+
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#end
+
+<div id="bigright">
+<div class="messagebox">
+
+#if ($id)
+#set ($apacheWorker = $view.getApacheWorker($id))
+
+<TextArea cols="90" READONLY rows="30">$!{apacheWorker.buildWorkersProperties()}</textarea>
+
+#else
+Apache Worker:
+#set ($aws = $view.getApacheWorkers())
+               <select name=id onchange='OnChange(this);'>
+                          <option value="">Select one
+              			      #foreach ($aw in $aws)
+              			      <option value="$appRoot/Apache/Pool/viewprop.vm?id=$aw.getPk()">$aw.getName()
+              			      #end
+              			      </select><BR>
+#end
+
+</div>
+</div>
+#parse("/layout/footer.vm")
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/add.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,152 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: add.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set ($menu = "/layout/menu/PoolTop.vm")
+#set ($pageSelected = "Server")
+#parse("/layout/header.vm")
+<div id="bigright">
+<div class="messagebox">
+<form name="Form" method="post" action='$link.setAction("administration/ApacheAction")'>
+<table>
+
+<tr>
+<td>
+Name:
+</td>
+<td>
+<input type="text" id="name" name="name" value="$!{name}">
+</td>
+</tr>
+<tr>
+<td>
+Server Root:
+</td>
+<td>
+<input type="text" id="serverRoot" name="serverRoot" value="$!{serverRoot}">
+</td>
+</tr>
+<tr>
+<td>
+Log Location:
+</td>
+<td>
+<input type="text" id="logLocation" name="logLocation" value="$!{logLocation}">
+</td>
+</tr>
+<tr>
+<td>
+System User:
+</td>
+<td>
+<input type="text" id="sysUser" name="sysUser" value="$!{sysUser}">
+</td>
+</tr>
+<tr>
+<td>
+System Group:
+</td>
+<td>
+<input type="text" id="sysGroup" name="sysGroup" value="$!{sysGroup}">
+</td>
+</tr>
+<tr>
+<td>
+Start Command:
+</td>
+<td>
+<input type="text" id="startCommand" name="startCommand" value="$!{startCommand}">
+</td>
+</tr>
+<tr>
+<td>
+Stop Command:
+</td>
+<td>
+<input type="text" id="stopCommand" name="stopCommand" value="$!{stopCommand}">
+</td>
+</tr>
+<tr>
+<td>
+Restart Command:
+</td>
+<td>
+<input type="text" id="restartCommand" name="restartCommand" value="$!{restartCommand}">
+</td>
+</tr>
+<tr>
+<td>
+Fork Wait:
+</td>
+<td>
+<input type="text" id="forkWait" name="forkWait" value="$!{forkWait}">
+</td>
+</tr>
+<tr>
+<td>
+Environment Varibles:
+</td>
+<td>
+<input type="text" id="envVaribles" name="envVaribles" value="$!{envVaribles}">
+</td>
+</tr>
+<tr>
+<td>
+Pid File Location:
+</td>
+<td>
+<input type="text" id="pidFileLocation" name="pidFileLocation" value="$!{pidFileLocation}">
+</td>
+</tr>
+<tr>
+<td>
+Apache Main:
+</td>
+<td>
+#set ($allFiles = $view.getFiles())
+
+<select name=mainId>
+			      #foreach ($file in $allFiles)
+			      <option value="$file.getPk()">$file.getName()
+			      #end
+			      </select>
+</td>
+</tr>
+<!--
+<tr>
+<td>
+Files:
+</td>
+<td>
+#set ($allFiles = $view.getFiles())
+
+<select name=files multiple>
+			      #foreach ($file in $allFiles)
+			      <option value="$file.getPk()">$file.getName()
+			      #end
+			      </select>
+</td>
+</tr>
+-->
+</table>
+<input type="hidden" name="methodToCall" value="AddApache">
+<input type="submit" value="Add">
+</form>
+</div>
+</div>
+#parse("/layout/footer.vm")
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/confirm.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/confirm.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/confirm.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/confirm.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,27 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: confirm.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#if ($User.isAllowed($function) && $methodToCall && $actionLink)
+<form name="Form" method="post" action='$link.setAction($actionLink)'>
+<input type=hidden name="methodToCall" value="$methodToCall" >
+<input type="submit" value="$buttonName"><BR>
+$methodToCall
+<input type=hidden name=id value="$individual.getPk()" >&nbsp;&nbsp;
+$individual.getName()
+</form>
+#end
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/delete.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/delete.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/delete.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/delete.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,25 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: delete.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set($actionLink = "administration/Apache/Delete")
+#set($methodToCall = "DeleteApache")
+#set($buttonName = "Delete")
+#set ($function = "DeleteApache")
+#set ($currentPage = "$appRoot/Apache/Server/delete.vm")
+#parse("/Apache/Server/list.vm")
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/details.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,95 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: details.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#set ($menu = "/layout/menu/PoolTop.vm")
+#set ($pageSelected = "Server")
+#parse("/layout/header.vm")
+
+
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#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="2">Infrastructure - <b>Apache</b>
+  </td>
+  <td align="right">
+  #parse("/Apache/Server/menu/global.vm")
+  </td>
+</tr>
+</table>
+<br />
+
+
+#if ($id)
+  #set ($apache = $view.getApache($id))
+  #set ($ent = $apache)
+<table width="95%" border="0" cellspacing="0" cellpadding="1">
+  <tr height="15" class="info">
+	<td align="left" valign="center" colspan=2 >
+	  Apache - $!{apache.getName()}
+	</b>
+	</td>
+	<td align="right">
+#if ($ent)
+#parse("/Apache/Server/menu/indiv.vm")
+#end
+</td></tr>
+
+<tr class="headercolor1"><td>Server Root:</td><td>$!{apache.getServerRoot()}</td><td> </td></tr>
+<tr class="headercolor2"><td>Log Location:</td><td>$!{apache.getLogLocation()}</td><td> </td></tr>
+<tr class="headercolor1"><td>System User:</td><td>$!{apache.getSysUser()}</td><td> </td></tr>
+<tr class="headercolor2"><td>System Group:</td><td>$!{apache.getSysGroup()}</td><td> </td></tr>
+<tr class="headercolor1"><td>Start Command:</td><td>$!{apache.getStartCommand()}</td><td> </td></tr>
+<tr class="headercolor2"><td>Stop Command:</td><td>$!{apache.getStopCommand()}</td><td> </td></tr>
+<tr class="headercolor1"><td>Restart Command:</td><td>$!{apache.getRestartCommand()}</td><td> </td></tr>
+<tr class="headercolor2"><td>Environment Varibles:</td><td>$!{apache.getEnvVaribles()}</td><td> </td></tr>
+<tr class="headercolor1"><td>Pid File Location:</td><td>$!{apache.getPidFileLocation()}</td><td> </td></tr>
+<tr class="headercolor2"><td>Apache Main:</td><td><a href="$appRoot/Core/File/details.vm?id=$!{apache.getMain().getPk()}"> $!{apache.getMain().getDescriptor()}</a></td><td> </td></tr>
+
+</table>
+
+
+#set ($collection = $view.getApacheWorkers($apache))
+#if( $collection && ! $collection.isEmpty())
+<br />
+#parse("/Apache/Worker/list.vm")
+#end 	## of all apaches
+
+#else
+  Apache:
+  #set ($aps = $view.getApaches())
+               <select name=id onchange='OnChange(this);'>
+                          <option value="">Select one
+              			      #foreach ($ap in $aps)
+              			      <option value="$appRoot/Apache/Server/details.vm?id=$ap.getPk()">$ap.getName()
+              			      #end
+              			      </select><BR>
+#end
+
+
+<br>
+
+
+</div>
+
+#parse("/layout/footer.vm")
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/list.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/list.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/list.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/list.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,45 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: list.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+#if (!$collection)
+#set ($menu = "/layout/menu/PoolTop.vm")
+#set ($pageSelected = "Server")
+#parse("/layout/header.vm")
+#set ($plf = "true")
+#if ($request.getParameter("id"))
+#set ($id = $request.getParameter("id"))
+#set ($individual = $view.getApache($id))
+#set ($indivPage = "/Apache/Server/confirm.vm")
+#else
+#set ($collection = $view.getApaches())
+#end
+#end
+#set ($entity = "Apache")
+#set ($usesEnv = "false")
+#set ($path = "Apache/Server")
+
+#if (! $currentPage)
+#set ($currentPage = "$appRoot/$path/list.vm")
+#end
+
+
+#parse("/layout/list2.vm")
+#if ($plf)
+#parse("/layout/footer.vm")
+#end
+
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/global.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/global.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/global.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/global.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,25 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: global.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+<select name=methodToCall onchange='OnChange(this);'>
+<option value="" selected>Select Action
+<option value="$appRoot/Apache/Server/details.vm">&nbsp;Details&nbsp;</option>
+<option value="$appRoot/Apache/Server/add.vm">&nbsp;Add&nbsp;</option>
+<option value="$appRoot/Apache/Server/update.vm">&nbsp;Update&nbsp;</option>
+<option value="$appRoot/Apache/Server/delete.vm">&nbsp;Delete&nbsp;</option>
+</select>
+

Added: incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/indiv.vm
URL: http://svn.apache.org/viewcvs/incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/indiv.vm?rev=392982&view=auto
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/indiv.vm (added)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Server/menu/indiv.vm Mon Apr 10 09:19:33 2006
@@ -0,0 +1,24 @@
+##
+## Copyright 2006  The Apache Software Foundation
+##
+## Licensed 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.
+##
+## $Id: indiv.vm,v 1.1.1.1 2005/11/30 22:35:36 drtobes Exp $
+##
+<select name=methodToCall onchange='OnChange(this);'>
+<option value="" selected>Select Action
+<option value="$appRoot/Apache/Server/details.vm?id=$!{ent.getPk()}">&nbsp;Details&nbsp;</option>
+<option value="$appRoot/Apache/Server/update.vm?id=$!{ent.getPk()}">&nbsp;Update&nbsp;</option>
+<option value="$appRoot/Apache/Server/delete.vm?id=$!{ent.getPk()}">&nbsp;Delete&nbsp;</option>
+</select>
+



Mime
View raw message