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/05 21:11:36 UTC
svn commit: r419344 [6/7] - in /incubator/lokahi/lokahi/trunk: ./ conf/
database/ docs/ src/java/org/apache/lokahi/core/agent/
src/java/org/apache/lokahi/core/agent/dao/
src/java/org/apache/lokahi/core/agent/job/
src/java/org/apache/lokahi/core/agent/r...
Modified: incubator/lokahi/lokahi/trunk/src/www/Template/addInternetProject.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Template/addInternetProject.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Template/addInternetProject.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Template/addInternetProject.vm Wed Jul 5 14:11:29 2006
@@ -19,87 +19,86 @@
#set ($letter = "Add")
#parse("/layout/header.vm")
<div align="center" class="contentbox">
-<br /><br />
-#parse("/Core/Project/availtemplates.vm")
-<div id="bigright">
-<div class="messagebox" align="left">
-#if ($request.getParameter("hostingPoolId"))
-#set ($hostingPoolId = $request.getParameter("hostingPoolId"))
-#end
-#if ($request.getParameter("tcontexts"))
-#set($numberOfContexts = $math.toInteger($request.getParameter("tcontexts")))
-#else
-#set($numberOfContexts = 0)
-#end
-<SCRIPT LANGUAGE=javascript>
-<!--
-function ToChange(dropdown)
-{
- var myindex = dropdown.selectedIndex;
- var SelValue = dropdown.options[myindex].value;
- var baseURL = "$appRoot/Template/addInternetProject.vm?tcontexts=$numberOfContexts&hostingPoolId=" + SelValue;
- top.location.href = baseURL;
-
- return true;
-}
-//-->
-</SCRIPT>
-
-<form name="Form" method="post" action='$link.setAction("templating/AddInternetSiteAction")'>
-Project Name: <input type="text" id="projectName" name="projectName" value="$!{projectName}" /><br />
-Site Name: <input type="text" id="vhostName" name="vhostName" value="$!{vhostName}" /><br />
-Hosting Pool:
-#set ($hps = $view.getHostingPools())
- <select name=hostingPoolId onchange='ToChange(this);'>
- #if($hostingPoolId)
- <option value="$hostingPoolId">$view.getHostingPool($hostingPoolId).getName()</option>
- #if($hps.remove($view.getHostingPool($hostingPoolId)))
-
- #end
- #else
- <option value="">Select one</option>
- #end
- #foreach ($hp in $hps)
- <option value="$hp.getPk()">$hp.getName()</option>
- #end
- </select><br />
-Contexts:
-#if($hostingPoolId)
-<a href="addInternetProject.vm?tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add another</a><br />
-#else
-<a href="addInternetProject.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}" /><br />
-DocBase: <input type="text" id="docBase" name="docBase" value="$!{docBase}" /> <br />
-#end
-#end
-#if($hostingPoolId)
-#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()</option>
-#end
-</select><br />
-
-#end
-#end
-
-
-
-
-<input type="hidden" name="methodToCall" value="AddInternetProject" />
-<input type="submit" value="submit" />
-</form>
-</div>
-</div>
-<br />
+ <br/><br/>
+ #parse("/Core/Project/availtemplates.vm")
+ <div id="bigright">
+ <div class="messagebox" align="left">
+ #if ($request.getParameter("hostingPoolId"))
+ #set ($hostingPoolId = $request.getParameter("hostingPoolId"))
+ #end
+ #if ($request.getParameter("tcontexts"))
+ #set($numberOfContexts = $math.toInteger($request.getParameter("tcontexts")))
+ #else
+ #set($numberOfContexts = 0)
+ #end
+ <SCRIPT LANGUAGE=javascript>
+ <!--
+ function ToChange(dropdown)
+ {
+ var myindex = dropdown.selectedIndex;
+ var SelValue = dropdown.options[myindex].value;
+ var baseURL = "$appRoot/Template/addInternetProject.vm?tcontexts=$numberOfContexts&hostingPoolId=" + SelValue;
+ top.location.href = baseURL;
+
+ return true;
+ }
+ //-->
+ </SCRIPT>
+
+ <form name="Form" method="post" action='$link.setAction("templating/AddInternetSiteAction")'>
+ Project Name: <input type="text" id="projectName" name="projectName" value="$!{projectName}"/><br/>
+ Site Name: <input type="text" id="vhostName" name="vhostName" value="$!{vhostName}"/><br/>
+ Hosting Pool:
+ #set ($hps = $view.getHostingPools())
+ <select name=hostingPoolId onchange='ToChange(this);'>
+ #if($hostingPoolId)
+ <option value="$hostingPoolId">$view.getHostingPool($hostingPoolId).getName()</option>
+ #if($hps.remove($view.getHostingPool($hostingPoolId)))
+
+ #end
+ #else
+ <option value="">Select one</option>
+ #end
+ #foreach ($hp in $hps)
+ <option value="$hp.getPk()">$hp.getName()</option>
+ #end
+ </select><br/>
+ Contexts:
+ #if($hostingPoolId)
+ <a href="addInternetProject.vm?tcontexts=$math.add($numberOfContexts, 1)&hostingPoolId=$hostingPoolId">Add
+ another</a><br/>
+ #else
+ <a href="addInternetProject.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}"/><br/>
+ DocBase: <input type="text" id="docBase" name="docBase" value="$!{docBase}"/> <br/>
+ #end
+ #end
+ #if($hostingPoolId)
+ #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()</option>
+ #end
+ </select><br/>
+
+ #end
+ #end
+
+
+ <input type="hidden" name="methodToCall" value="AddInternetProject"/>
+ <input type="submit" value="submit"/>
+ </form>
+ </div>
+ </div>
+ <br/>
</div>
#parse("/layout/footer.vm")
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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Template/addVhost.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Template/addVhost.vm Wed Jul 5 14:11:29 2006
@@ -19,126 +19,127 @@
#set ($letter = "Add")
#parse("/layout/header.vm")
<div align="center" class="contentbox">
-<br /><br />
+<br/><br/>
#parse("/Core/Project/availtemplates.vm")
<div id="bigright">
<div class="messagebox" align="left">
-#if ($request.getParameter("project"))
+ #if ($request.getParameter("project"))
#set ($projectId = $request.getParameter("project"))
-#end
-#if ($request.getParameter("hostingPoolId"))
+ #end
+ #if ($request.getParameter("hostingPoolId"))
#set ($hostingPoolId = $request.getParameter("hostingPoolId"))
-#end
-#if ($request.getParameter("tcontexts"))
+ #end
+ #if ($request.getParameter("tcontexts"))
#set($numberOfContexts = $math.toInteger($request.getParameter("tcontexts")))
-#else
+ #else
#set($numberOfContexts = 0)
-#end
-<h4> Add a VirtualHost to Project
-#if ($projectId)
-#set ($project = $User.getProject($projectId))
- - $project.getName()</h4>
-#else
+ #end
+ <h4> Add a VirtualHost to Project
+ #if ($projectId)
+ #set ($project = $User.getProject($projectId))
+ - $project.getName()</h4>
+ #else
</h4>
#end
<SCRIPT LANGUAGE=javascript>
-<!--
+ <!--
-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 function
-
-function ToChange(dropdown)
-{
- var myindex = dropdown.selectedIndex;
- var SelValue = dropdown.options[myindex].value;
- var baseURL = "$appRoot/Template/addVhost.vm?project=$projectId&tcontexts=$numberOfContexts&hostingPoolId=" + SelValue;
- top.location.href = baseURL;
+ 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 function
+
+ function ToChange(dropdown)
+ {
+ var myindex = dropdown.selectedIndex;
+ var SelValue = dropdown.options[myindex].value;
+ var baseURL = "$appRoot/Template/addVhost.vm?project=$projectId&tcontexts=$numberOfContexts&hostingPoolId=" + SelValue;
+ top.location.href = baseURL;
- return true;
-}
+ return true;
+ }
-//-->
+ //-->
</SCRIPT>
-
-
<form name="Form" method="post" action='$link.setAction("templating/AddVirtualHostAction")'>
-<input type="hidden" id="methodToCall" name="methodToCall" value="AddVirtualHostToProject" />
-Project Name:
-#if ($projectId)
-<input type="hidden" id="projectId" name="projectId" value="$!{project.getPk()}" /> $!{project.getName()}<br />
-#else
-<input type="text" id="projectName" name="projectName" value="$!{projectName}" /><br />
-#end
-Hosting Pool:
-#set ($hps = $view.getHostingPools())
- <select name=hostingPoolId onchange='ToChange(this);'>
- #if($hostingPoolId)
- <option value="$hostingPoolId">$view.getHostingPool($hostingPoolId).getName()</option>
- #if($hps.remove($view.getHostingPool($hostingPoolId)))
-
- #end
- #else
- <option value="">Select one
- #end
- #foreach ($hp in $hps)
- <option value="$hp.getPk()">$hp.getName()</option>
- #end
- </select><br />
-Server Name: <input type="text" id="vhostName" name="vhostName" value="$!{vhostName}" /><br />
-Entry:
-<textarea id="entry" name="entry" cols="70" rows="7">$!{entry}</textarea><br />
-NameVirtualHost: <input type=checkbox name=nameVirtualHost value=true checked onClick="switchCheckBoxes()"><br />
-Catch All: <input type=checkbox name=catchAll value=true /><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}" /><br />
-DocBase: <input type="text" id="docBase" name="docBase" value="$!{docBase}" /><br />
-#end
-#end
-#if($hostingPoolId)
-<!-- $hostingPoolId -->
-#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()</option>
-#end
-</select><br />
+ <input type="hidden" id="methodToCall" name="methodToCall" value="AddVirtualHostToProject"/>
+ Project Name:
+ #if ($projectId)
+ <input type="hidden" id="projectId" name="projectId" value="$!{project.getPk()}"/> $!{project.getName()}<br/>
+ #else
+ <input type="text" id="projectName" name="projectName" value="$!{projectName}"/><br/>
+ #end
+ Hosting Pool:
+ #set ($hps = $view.getHostingPools())
+ <select name=hostingPoolId onchange='ToChange(this);'>
+ #if($hostingPoolId)
+ <option value="$hostingPoolId">$view.getHostingPool($hostingPoolId).getName()</option>
+ #if($hps.remove($view.getHostingPool($hostingPoolId)))
+
+ #end
+ #else
+ <option value="">Select one
+ #end
+ #foreach ($hp in $hps)
+ <option value="$hp.getPk()">$hp.getName()</option>
+ #end
+ </select><br/>
+ Server Name: <input type="text" id="vhostName" name="vhostName" value="$!{vhostName}"/><br/>
+ Entry:
+ <textarea id="entry" name="entry" cols="70" rows="7">$!{entry}</textarea><br/>
+ NameVirtualHost: <input type=checkbox name=nameVirtualHost value=true checked onClick="switchCheckBoxes()"><br/>
+ Catch All: <input type=checkbox name=catchAll value=true/><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}"/><br/>
+ DocBase: <input type="text" id="docBase" name="docBase" value="$!{docBase}"/><br/>
+ #end
+ #end
+ #if($hostingPoolId)
+ <!-- $hostingPoolId -->
+ #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()</option>
+ #end
+</select>
+<br/>
#end
#end
-<input type="submit" value="submit" />
+<input type="submit" value="submit"/>
</form>
</div>
</div>
-<br />
+<br/>
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Template/addsite.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Template/addsite.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Template/addsite.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Template/addsite.vm Wed Jul 5 14:11:29 2006
@@ -19,92 +19,94 @@
#set ($letter = "Add")
#parse("/layout/header.vm")
<div align="center" class="contentbox">
-<br /><br />
-#parse("/Core/Project/availtemplates.vm")
-#set ($data = $dataList.getPartitions())
-#set ($vobs = $dataList.getVobs())
-<div id="bigright">
-<div class="messagebox" align="left">
-<!-- <script language="javaScript">
-function hideMybutton(){
-var myForm = document.AddForm;
-myForm.mySubmitbutton.value="Please Wait...";
-myForm.mySubmitbutton.disabled="true";
-}
-</script>
--->
-<form name="AddForm" method="post" action='$link.setAction("administration/AddIntranetSiteAction")' onSubmit="hideMybutton();">
-<input type="hidden" name="methodToCall" value="AddIntranetSite" />
-<table>
-<tr>
-<td align=right>Virtual Host Name: </td>
-<td colspan=2><input type="text" name="vhostName" /></td>
-</tr>
-<tr>
-<td align=right>Context Name: </td>
-<td colspan=2><input type="text" name="contextName" /></td>
-</tr>
-<tr>
-<td align=right>DocBase: </td>
-<td colspan=2><input type="text" name="docBase" /></td>
-</tr>
-
-#set($envs = $view.getEnvironments())
-#set ($hps = $view.getHostingPools())
-
-#foreach($env in $envs)
-<tr>
-<td align="right">$env.getName() <input type=checkbox id="environment" name="environment" value="$env.getPk()" /></td>
-<td>
-Hosting Pool:
- <select name="hostingPoolId">
- <option value="">Select one</option>
- #foreach ($hp in $hps)
- <option value="$env.getPk(),$hp.getPk()">$hp.getName()</option>
- #end
- </select>
-</td>
-<td>WPM Required<input type=checkbox id="wpm" name="wpm" value="$env.getName()" />Yes </td>
-</tr>
-
-#end
-
-<tr>
-<td align=right>Metrics <input type=checkbox name=metrics value=yes /></td>
-<td align=center>Migration Site <input type=checkbox name=migration value=yes /></td>
-<td>Dynamic Site <input type=checkbox name=dynamic value=yes /></td>
-</tr>
-
-<tr>
-<td>Data Partition
- <select name=data-partition>
- <option value="">Select one</option>
- #foreach ($dp in $data)
- <option value="$dp.getPartitionName()">$dp.getDataUsed()</option>
- #end
- </select>
-</td>
-<td align=center>Clearcase VOB
- <select name=vob>
- <option value="">Select one</option>
- #foreach ($v in $vobs)
- <option value="$v">$v</option>
- #end
- </select>
-</td>
-</tr>
-
-</table>
-
-
-<input type="submit" value="submit" name="mySubmitbutton" />
-<form>
-
+ <br/><br/>
+ #parse("/Core/Project/availtemplates.vm")
+ #set ($data = $dataList.getPartitions())
+ #set ($vobs = $dataList.getVobs())
+ <div id="bigright">
+ <div class="messagebox" align="left">
+ <!-- <script language="javaScript">
+ function hideMybutton(){
+ var myForm = document.AddForm;
+ myForm.mySubmitbutton.value="Please Wait...";
+ myForm.mySubmitbutton.disabled="true";
+ }
+ </script>
+ -->
+ <form name="AddForm" method="post" action='$link.setAction("administration/AddIntranetSiteAction")'
+ onSubmit="hideMybutton();">
+ <input type="hidden" name="methodToCall" value="AddIntranetSite"/>
+ <table>
+ <tr>
+ <td align=right>Virtual Host Name: </td>
+ <td colspan=2><input type="text" name="vhostName"/></td>
+ </tr>
+ <tr>
+ <td align=right>Context Name: </td>
+ <td colspan=2><input type="text" name="contextName"/></td>
+ </tr>
+ <tr>
+ <td align=right>DocBase: </td>
+ <td colspan=2><input type="text" name="docBase"/></td>
+ </tr>
+
+ #set($envs = $view.getEnvironments())
+ #set ($hps = $view.getHostingPools())
+
+ #foreach($env in $envs)
+ <tr>
+ <td align="right">$env.getName() <input type=checkbox id="environment" name="environment"
+ value="$env.getPk()"/></td>
+ <td>
+ Hosting Pool:
+ <select name="hostingPoolId">
+ <option value="">Select one</option>
+ #foreach ($hp in $hps)
+ <option value="$env.getPk(),$hp.getPk()">$hp.getName()</option>
+ #end
+ </select>
+ </td>
+ <td>WPM Required<input type=checkbox id="wpm" name="wpm" value="$env.getName()"/>Yes </td>
+ </tr>
+
+ #end
+
+ <tr>
+ <td align=right>Metrics <input type=checkbox name=metrics value=yes/></td>
+ <td align=center>Migration Site <input type=checkbox name=migration value=yes/></td>
+ <td>Dynamic Site <input type=checkbox name=dynamic value=yes/></td>
+ </tr>
+
+ <tr>
+ <td>Data Partition
+ <select name=data-partition>
+ <option value="">Select one</option>
+ #foreach ($dp in $data)
+ <option value="$dp.getPartitionName()">$dp.getDataUsed()</option>
+ #end
+ </select>
+ </td>
+ <td align=center>Clearcase VOB
+ <select name=vob>
+ <option value="">Select one</option>
+ #foreach ($v in $vobs)
+ <option value="$v">$v</option>
+ #end
+ </select>
+ </td>
+ </tr>
+
+ </table>
+
+
+ <input type="submit" value="submit" name="mySubmitbutton"/>
+
+ <form>
+
+ </div>
+ </div>
+ <br/>
</div>
-</div>
-<br />
-</div>
-
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Template/deploy.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Template/deploy.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Template/deploy.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Template/deploy.vm Wed Jul 5 14:11:29 2006
@@ -19,41 +19,41 @@
#set ($letter = "Add")
#parse("/layout/header.vm")
<div align="center" class="contentbox">
-<br /><br />
-#parse("/Core/Project/availtemplates.vm")
-#set ($command = $request.getParameter("command"))
-<div id="bigright">
-<div class="messagebox" align="left">
-<!-- <script language="javaScript">
-function hideMybutton(){
-var myForm = document.AddForm;
-myForm.mySubmitbutton.value="Please Wait...";
-myForm.mySubmitbutton.disabled="true";
-}
-</script>
--->
-<form name="GetForm" method="post" action="deploy.vm">
-<input type="hidden" name="methodToCall" value="RemoteCMD">
-<table>
-<tr>
-<td align=right>Command to Run</td>
-<td colspan=2><input type=text size=70 name=command></td>
-</tr>
-#if ($command)
-<tr>
-<td align=right>Result: </td>
-<td colspan=2><textarea cols=75 rows=30 scrollable name=result>$aTool.remoteCMD($command)</textarea></td>
-</tr>
-#end
-</table>
-<input type="submit" value="submit" name="mySubmitbutton">
-<form>
+ <br/><br/>
+ #parse("/Core/Project/availtemplates.vm")
+ #set ($command = $request.getParameter("command"))
+ <div id="bigright">
+ <div class="messagebox" align="left">
+ <!-- <script language="javaScript">
+ function hideMybutton(){
+ var myForm = document.AddForm;
+ myForm.mySubmitbutton.value="Please Wait...";
+ myForm.mySubmitbutton.disabled="true";
+ }
+ </script>
+ -->
+ <form name="GetForm" method="post" action="deploy.vm">
+ <input type="hidden" name="methodToCall" value="RemoteCMD">
+ <table>
+ <tr>
+ <td align=right>Command to Run</td>
+ <td colspan=2><input type=text size=70 name=command></td>
+ </tr>
+ #if ($command)
+ <tr>
+ <td align=right>Result: </td>
+ <td colspan=2><textarea cols=75 rows=30 scrollable name=result>$aTool.remoteCMD($command)</textarea></td>
+ </tr>
+ #end
+ </table>
+ <input type="submit" value="submit" name="mySubmitbutton">
-</div>
-</div>
-<br />
-</div>
+ <form>
+ </div>
+ </div>
+ <br/>
+</div>
#parse("/layout/footer.vm")
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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/add.vm Wed Jul 5 14:11:29 2006
@@ -25,107 +25,107 @@
#end
#set ($projectId = $request.getParameter("projectId"))
<div align="center" class="contentbox">
-<br /><br />
+ <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 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">
-<form name="Form" method="post" action='$link.setAction("administration/ContextAction")'>
-<table>
-<tr>
-<td>
-VirtualHost:
-#if($virtualHost)
-$virtualHost.getName()
-</td>
-<td>
-<input type="hidden" id="vhostId" name="vhostId" value="$!{virtualHost.getPk()}">
-<input type="hidden" id="projectId" name="projectId" value="$!{projectId}">
-</td>
-</tr>
-<tr>
-<td>
-HostingPool:
-</td>
-<td>
-#set ($hps = $virtualHost.getPotentialHostingPools())
- <select name=hpId>
- <option value="">Select one
- #foreach ($hp in $hps)
- <option value="$hp.getPk()">$hp.getName()
- #end
- </select><BR>
-</td>
-</tr>
-#else
-</td>
-<td>
-#set ($vhs = $view.getVirtualHosts())
- <select name=vhostId onchange='OnChange(this);'>
- <option value="">Select one
- #foreach ($vh in $vhs)
- <option value="$appRoot/Tomcat/Entity/add.vm?projectId=$projectId&id=$vh.getPk()">$vh.getName()
- #end
- </select><BR>
-</td>
-</tr>
-#end
-<tr>
-<td>
-Name:
-</td>
-<td>
-<input type="text" id="contextName" name="contextName" value="$!{contextName}">
-</td>
-</tr>
-<tr>
-<td>
-Doc Base:
-</td>
-<td>
-<input type="text" id="docBase" name="docBase" value="$!{docBase}">
-</td>
-</tr>
-<tr>
-<td>
-State:
-</td>
-<td>
-Active
-<input type="hidden" id="stateId" name="stateId" value="8">
-</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>
-</table>
-<input type="hidden" name="methodToCall" value="AddContext">
-<input type="submit" value="submit">
-</form>
+ <div class="messagebox">
+ <form name="Form" method="post" action='$link.setAction("administration/ContextAction")'>
+ <table>
+ <tr>
+ <td>
+ VirtualHost:
+ #if($virtualHost)
+ $virtualHost.getName()
+ </td>
+ <td>
+ <input type="hidden" id="vhostId" name="vhostId" value="$!{virtualHost.getPk()}">
+ <input type="hidden" id="projectId" name="projectId" value="$!{projectId}">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ HostingPool:
+ </td>
+ <td>
+ #set ($hps = $virtualHost.getPotentialHostingPools())
+ <select name=hpId>
+ <option value="">Select one
+ #foreach ($hp in $hps)
+ <option value="$hp.getPk()">$hp.getName()
+ #end
+ </select><BR>
+ </td>
+ </tr>
+ #else
+ </td>
+ <td>
+ #set ($vhs = $view.getVirtualHosts())
+ <select name=vhostId onchange='OnChange(this);'>
+ <option value="">Select one
+ #foreach ($vh in $vhs)
+ <option value="$appRoot/Tomcat/Entity/add.vm?projectId=$projectId&id=$vh.getPk()">$vh.getName()
+ #end
+ </select><BR>
+ </td>
+ </tr>
+ #end
+ <tr>
+ <td>
+ Name:
+ </td>
+ <td>
+ <input type="text" id="contextName" name="contextName" value="$!{contextName}">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Doc Base:
+ </td>
+ <td>
+ <input type="text" id="docBase" name="docBase" value="$!{docBase}">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ State:
+ </td>
+ <td>
+ Active
+ <input type="hidden" id="stateId" name="stateId" value="8">
+ </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>
+ </table>
+ <input type="hidden" name="methodToCall" value="AddContext">
+ <input type="submit" value="submit">
+ </form>
</div>
-<br />
+<br/>
</div>
-<br />
+<br/>
</div>
#parse("/layout/footer.vm")
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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/addExistingToVhost.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/addExistingToVhost.vm Wed Jul 5 14:11:29 2006
@@ -31,50 +31,50 @@
<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}">
-<input type="hidden" id="projectId" name="projectId" value="$!{pid}">
+ <form name="Form" method="post" action='$link.setAction("templating/AddExistingContextVhostAction")'>
+ <input type="hidden" id="vhostid" name="vhostid" value="$!{vid}">
+ <input type="hidden" id="projectId" name="projectId" value="$!{pid}">
-<table>
-<tr>
-<td>
-Project:
-</td>
-<td>
-$!{project.getName()}
-</td>
-</tr>
-<tr>
-<td>
-VirtualHost:
-</td>
-<td>
-$!{vhost.getName()}
-</td>
-</tr>
-<tr>
-<td>
-Context:
-</td>
-<td>
-#set ($contexts = $view.getContexts())
- <select name=contextId >
- <option value="">Select one
- #foreach ($context in $contexts)
- <option value="$context.getPk()">$context.getName() - $!{context.getTomcatPool().getName()}
- #end
- </select><BR>
-</td>
-</tr>
-</table>
-<input type="hidden" name="methodToCall" value="AddContext">
-<input type="submit" value="submit">
-</form>
-</div>
+ <table>
+ <tr>
+ <td>
+ Project:
+ </td>
+ <td>
+ $!{project.getName()}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ VirtualHost:
+ </td>
+ <td>
+ $!{vhost.getName()}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Context:
+ </td>
+ <td>
+ #set ($contexts = $view.getContexts())
+ <select name=contextId>
+ <option value="">Select one
+ #foreach ($context in $contexts)
+ <option value="$context.getPk()">$context.getName() - $!{context.getTomcatPool().getName()}
+ #end
+ </select><BR>
+ </td>
+ </tr>
+ </table>
+ <input type="hidden" name="methodToCall" value="AddContext">
+ <input type="submit" value="submit">
+ </form>
+ </div>
</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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/confirm.vm Wed Jul 5 14:11:29 2006
@@ -19,20 +19,21 @@
#parse("/layout/header.vm")
<div class="contentbox" align="center">
-<br /><br />
-<div class="messagebox" width="75%" align="center">
-#set ($cid = $request.getParameter("c"))
-#set ($pid = $request.getParameter("p"))
-#set ($fid = $request.getParameter("f"))
-#set ($vid = $request.getParameter("v"))
+ <br/><br/>
-#if ($cid && $fid)
- #set ($context = $view.getContext($cid))
- #if($pid)
- #set ($project = $User.getProject($pid))
- #end
- #set ($f = $view.getFunction($fid))
- #if ($context && $f)
+ <div class="messagebox" width="75%" align="center">
+ #set ($cid = $request.getParameter("c"))
+ #set ($pid = $request.getParameter("p"))
+ #set ($fid = $request.getParameter("f"))
+ #set ($vid = $request.getParameter("v"))
+
+ #if ($cid && $fid)
+ #set ($context = $view.getContext($cid))
+ #if($pid)
+ #set ($project = $User.getProject($pid))
+ #end
+ #set ($f = $view.getFunction($fid))
+ #if ($context && $f)
#if ($User.isAllowed($f, $project, $context) || $User.isAllowed($f))
#set($tomcatPool = $context.getTomcatPool())
Please confirm:<BR>
@@ -41,29 +42,29 @@
Action: $f.getName()<BR>
Pool: $!{tomcatPool.getName()}<br>
#if($f.getCommand() == "DeleteContext")
- <form name="Form" method="post" action='$link.setAction("/administration/Context/Delete")'>
- #else
- <form name="Form" method="post" action='$link.setAction("Context/SubmitJobAction")'>
- #end
- <input type="hidden" id="id" name="id" value="$!{cid}">
- #if($vid)
- <input type="hidden" id="vhostId" name="vhostId" value="$!{vid}">
- #end
- #if ($f.getCommand() == "RemoveContextFromVhost")
- Remove from project? <input type="checkbox" name="removeFromProject" id="removeFromProject" value="true"><br>
- #end
- <input type="hidden" id="projectId" name="projectId" value="$!{pid}">
- <input type="hidden" id="poolId" name="poolId" value="$!{tomcatPool.getPk()}">
- <!-- $User.getContextFunctions($project.getPk(), $context) -->
- <input type="hidden" name=methodToCall value="$f.getCommand()">
- <!-- submit outstide -->
- <input type="submit" value="Submit">
- </form>
- #end
- #end
-#end
-</div>
-<BR><BR>
+ <form name="Form" method="post" action='$link.setAction("/administration/Context/Delete")'>
+ #else
+ <form name="Form" method="post" action='$link.setAction("Context/SubmitJobAction")'>
+ #end
+ <input type="hidden" id="id" name="id" value="$!{cid}">
+ #if($vid)
+ <input type="hidden" id="vhostId" name="vhostId" value="$!{vid}">
+ #end
+ #if ($f.getCommand() == "RemoveContextFromVhost")
+ Remove from project? <input type="checkbox" name="removeFromProject" id="removeFromProject" value="true"><br>
+ #end
+ <input type="hidden" id="projectId" name="projectId" value="$!{pid}">
+ <input type="hidden" id="poolId" name="poolId" value="$!{tomcatPool.getPk()}">
+ <!-- $User.getContextFunctions($project.getPk(), $context) -->
+ <input type="hidden" name=methodToCall value="$f.getCommand()">
+ <!-- submit outstide -->
+ <input type="submit" value="Submit">
+ </form>
+ #end
+ #end
+ #end
+ </div>
+ <BR><BR>
</div>
<BR><BR>
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/details.vm Wed Jul 5 14:11:29 2006
@@ -21,64 +21,65 @@
#end
#parse("/layout/header.vm")
<div align="center" class="contentbox">
-<br /><br />
+ <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 class="messagebox">
-
-#set ($id = $request.getParameter("id"))
-#set ($p = $request.getParameter("p"))
-#set ($methodToCall = "UpdateContext")
-#if($id)
-#set ($context = $view.getContext($id))
-
-
-<table>
-<tr>
-<td align="right">Name:</td><td> $!{context.getName()} </td></tr>
-<tr><td align="right">Doc Base:</td> <td>$!{context.getDocBase()} </td></tr>
-<tr><td align="right">State:</td><td>Active </td></tr>
-<tr><td align="right" valign="top">Environment:</td><td>
-#if ($context.getEnv())
+ <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 ($id = $request.getParameter("id"))
+ #set ($p = $request.getParameter("p"))
+ #set ($methodToCall = "UpdateContext")
+ #if($id)
+ #set ($context = $view.getContext($id))
+
+
+ <table>
+ <tr>
+ <td align="right">Name:</td><td> $!{context.getName()} </td></tr>
+ <tr><td align="right">Doc Base:</td> <td>$!{context.getDocBase()} </td></tr>
+ <tr><td align="right">State:</td><td>Active </td></tr>
+ <tr><td align="right" valign="top">Environment:</td><td>
+ #if ($context.getEnv())
$context.getEnv().getName()
-#end
-</td></tr>
-</table>
-#if ($User.isAllowed("UpdateContext") && $methodToCall == "UpdateContext")
-#if($p)
- <a href="$appRoot/Tomcat/Entity/update.vm?id=$id&p=$p">Update this Context</a> <BR><BR>
-#else
- <a href="$appRoot/Tomcat/Entity/update.vm?id=$id">Update this Context</a> <BR><BR>
-#end
-#end
-
-
-#else
-Context:
-#set ($contexts = $view.getContexts())
- <select name=id onchange='OnChange(this);'>
- <option value="">Select one
- #foreach ($context in $contexts)
- <option value="$appRoot/Tomcat/Entity/details.vm?id=$context.getPk()">$context.getName()
- #end
- </select><BR>
-
-
-#end
-</div>
-<br />
-</div>
-<br />
+ #end
+ </td></tr>
+ </table>
+ #if ($User.isAllowed("UpdateContext") && $methodToCall == "UpdateContext")
+ #if($p)
+ <a href="$appRoot/Tomcat/Entity/update.vm?id=$id&p=$p">Update this Context</a> <BR><BR>
+ #else
+ <a href="$appRoot/Tomcat/Entity/update.vm?id=$id">Update this Context</a> <BR><BR>
+ #end
+ #end
+
+
+ #else
+ Context:
+ #set ($contexts = $view.getContexts())
+ <select name=id onchange='OnChange(this);'>
+ <option value="">Select one
+ #foreach ($context in $contexts)
+ <option value="$appRoot/Tomcat/Entity/details.vm?id=$context.getPk()">$context.getName()
+ #end
+ </select><BR>
+
+
+ #end
+ </div>
+ <br/>
+ </div>
+ <br/>
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/menu/global.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/menu/global.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/menu/global.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/menu/global.vm Wed Jul 5 14:11:29 2006
@@ -16,10 +16,10 @@
## $Id$
##
<select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-<option value="$appRoot/Tomcat/Entity/details.vm"> Details </option>
-<option value="$appRoot/Tomcat/Entity/add.vm"> Add </option>
-<option value="$appRoot/Tomcat/Entity/update.vm"> Update </option>
-<option value="$appRoot/Tomcat/Entity/delete.vm"> Delete </option>
+ <option value="" selected>Select Action
+ <option value="$appRoot/Tomcat/Entity/details.vm"> Details </option>
+ <option value="$appRoot/Tomcat/Entity/add.vm"> Add </option>
+ <option value="$appRoot/Tomcat/Entity/update.vm"> Update </option>
+ <option value="$appRoot/Tomcat/Entity/delete.vm"> Delete </option>
</select>
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/update.vm Wed Jul 5 14:11:29 2006
@@ -20,89 +20,90 @@
#parse("/layout/header.vm")
<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>Context</b>
- </td>
- <td align="right">
- #parse("Tomcat/Entity/menu/global.vm")
- </td>
-</tr>
-</table>
-<br />
-
-<div class="messagebox">
-#set ($id = $request.getParameter("id"))
-#set ($projectId = $request.getParameter("p"))
-#set ($methodToCall = "UpdateContext")
-<SCRIPT LANGUAGE=javascript>
-<!--
-function OnChange(dropdown)
-{
- var myindex = dropdown.selectedIndex;
- var SelValue = dropdown.options[myindex].value;
- var baseURL = "$appRoot/Tomcat/Entity/update.vm?id=" + SelValue;
- top.location.href = baseURL;
-
- return true;
-}
-//-->
-</SCRIPT>
-
-#if ($User.isAllowed("UpdateContext") && $methodToCall == "UpdateContext")
-#if($id)
-#set ($context = $view.getContext($id))
-<form name="Form" method="post" action='$link.setAction("administration/ContextAction")'>
-<input type="hidden" id="contextId" name="contextId" value="$!{id}">
-<input type="hidden" id="projectId" name="projectId" value="$!{projectId}">
-<input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
-
-JkMount: <input type="text" id="contextName" name="contextName" value="$!{context.getName()}"><BR>
-DocBase <input type="text" length="60" id="docBase" name="docBase" value="$!{context.getDocBase()}"><br>
-Xml: <textarea cols="60" rows="7" id="appxml" name="appxml" >$!{context.getApplicationXml()}</textarea><BR>
-State: <input type="text" readonly id="state" name="state" value="Active"><BR>
-<input type="hidden" id="stateId" name="stateId" value="8"><BR>
-Current TomcatPool: $!{context.getTomcatPool().getName()}<br>
-If migrating to new TomcatPool, select Pool below!<br>
-#set ($aps = $view.getTomcatPools())
- <select name=poolId>
- <option value="">Select one
- #foreach ($ap in $aps)
- <option value="$ap.getPk()">$ap.getName()
- #end
- </select><BR>
-#set ($envs = $view.getEnvironments())
-<select name=envId>
-#if ($context.getEnv())
-#if ($envs.remove($context.getEnv()))
-
-#end
-#end
- <option value="$!{context.getEnv().getPk()}">$!{context.getEnv().getName()}
- #foreach ($env in $envs)
- <option value="$env.getPk()">$env.getName()
- #end
- </select><BR>
-<input type="submit" value="Update">
-</form>
-#else
-Context:
-#set ($contexts = $view.getContexts())
- <select name=id onchange='OnChange(this);'>
- <option value="">Select one
- #foreach ($context in $contexts)
- <option value="$context.getPk()">$context.getName()
- #end
- </select><BR>
-
-#end
-#end
-</div>
-<br />
-</div>
-<br />
+ <br/><br/>
+
+ <div class="projectbox">
+ <table width="100%" border="0" cellspacing="0" cellpadding="1">
+ <tr class="info" valign="top">
+ <td colspan="2">Infrastructure - <b>Context</b>
+ </td>
+ <td align="right">
+ #parse("Tomcat/Entity/menu/global.vm")
+ </td>
+ </tr>
+ </table>
+ <br/>
+
+ <div class="messagebox">
+ #set ($id = $request.getParameter("id"))
+ #set ($projectId = $request.getParameter("p"))
+ #set ($methodToCall = "UpdateContext")
+ <SCRIPT LANGUAGE=javascript>
+ <!--
+ function OnChange(dropdown)
+ {
+ var myindex = dropdown.selectedIndex;
+ var SelValue = dropdown.options[myindex].value;
+ var baseURL = "$appRoot/Tomcat/Entity/update.vm?id=" + SelValue;
+ top.location.href = baseURL;
+
+ return true;
+ }
+ //-->
+ </SCRIPT>
+
+ #if ($User.isAllowed("UpdateContext") && $methodToCall == "UpdateContext")
+ #if($id)
+ #set ($context = $view.getContext($id))
+ <form name="Form" method="post" action='$link.setAction("administration/ContextAction")'>
+ <input type="hidden" id="contextId" name="contextId" value="$!{id}">
+ <input type="hidden" id="projectId" name="projectId" value="$!{projectId}">
+ <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+
+ JkMount: <input type="text" id="contextName" name="contextName" value="$!{context.getName()}"><BR>
+ DocBase <input type="text" length="60" id="docBase" name="docBase" value="$!{context.getDocBase()}"><br>
+ Xml: <textarea cols="60" rows="7" id="appxml" name="appxml">$!{context.getApplicationXml()}</textarea><BR>
+ State: <input type="text" readonly id="state" name="state" value="Active"><BR>
+ <input type="hidden" id="stateId" name="stateId" value="8"><BR>
+ Current TomcatPool: $!{context.getTomcatPool().getName()}<br>
+ If migrating to new TomcatPool, select Pool below!<br>
+ #set ($aps = $view.getTomcatPools())
+ <select name=poolId>
+ <option value="">Select one
+ #foreach ($ap in $aps)
+ <option value="$ap.getPk()">$ap.getName()
+ #end
+ </select><BR>
+ #set ($envs = $view.getEnvironments())
+ <select name=envId>
+ #if ($context.getEnv())
+ #if ($envs.remove($context.getEnv()))
+
+ #end
+ #end
+ <option value="$!{context.getEnv().getPk()}">$!{context.getEnv().getName()}
+ #foreach ($env in $envs)
+ <option value="$env.getPk()">$env.getName()
+ #end
+ </select><BR>
+ <input type="submit" value="Update">
+ </form>
+ #else
+ Context:
+ #set ($contexts = $view.getContexts())
+ <select name=id onchange='OnChange(this);'>
+ <option value="">Select one
+ #foreach ($context in $contexts)
+ <option value="$context.getPk()">$context.getName()
+ #end
+ </select><BR>
+
+ #end
+ #end
+ </div>
+ <br/>
+ </div>
+ <br/>
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/view.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/view.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/view.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Entity/view.vm Wed Jul 5 14:11:29 2006
@@ -18,58 +18,60 @@
#set ($menu = "/layout/menu/ProjectTop.vm")
#parse("/layout/header.vm")
<div align="center" class="contentbox">
-<br /><br />
+ <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>
-</TR>
-</table>
-<br><div class="messagebox">
-
-#set ($id = $request.getParameter("id"))
-#set ($p = $request.getParameter("p"))
-#set ($methodToCall = "UpdateContext")
-#if($id)
-#set ($context = $view.getContext($id))
-
-
-<table>
-<tr>
-<td align="right">Name:</td><td> $!{context.getName()} </td></tr>
-<tr><td align="right">Doc Base:</td> <td>$!{context.getDocBase()} </td></tr>
-<tr><td align="right">State:</td><td>Active </td></tr>
-<tr><td align="right" valign="top">Environment:</td><td>
-#if ($context.getEnv())
+ <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>
+ </TR>
+ </table>
+ <br>
+
+ <div class="messagebox">
+
+ #set ($id = $request.getParameter("id"))
+ #set ($p = $request.getParameter("p"))
+ #set ($methodToCall = "UpdateContext")
+ #if($id)
+ #set ($context = $view.getContext($id))
+
+
+ <table>
+ <tr>
+ <td align="right">Name:</td><td> $!{context.getName()} </td></tr>
+ <tr><td align="right">Doc Base:</td> <td>$!{context.getDocBase()} </td></tr>
+ <tr><td align="right">State:</td><td>Active </td></tr>
+ <tr><td align="right" valign="top">Environment:</td><td>
+ #if ($context.getEnv())
$context.getEnv().getName()
-#end
-</td></tr>
-</table>
-#if ($User.isAllowed("UpdateContext") && $methodToCall == "UpdateContext")
-#if($p)
- <a href="$appRoot/Tomcat/Entity/update.vm?id=$id&p=$p">Update this Context</a> <BR><BR>
-#else
- <a href="$appRoot/Tomcat/Entity/update.vm?id=$id">Update this Context</a> <BR><BR>
-#end
-#end
-
-
-#else
-Context:
-#set ($contexts = $view.getContexts())
- <select name=id onchange='OnChange(this);'>
- <option value="">Select one
- #foreach ($context in $contexts)
- <option value="$appRoot/Tomcat/Entity/view.vm?id=$context.getPk()">$context.getName()
- #end
- </select><BR>
-
-
-#end
-</div>
-</div>
-#parse("/layout/footer.vm")
+ #end
+ </td></tr>
+ </table>
+ #if ($User.isAllowed("UpdateContext") && $methodToCall == "UpdateContext")
+ #if($p)
+ <a href="$appRoot/Tomcat/Entity/update.vm?id=$id&p=$p">Update this Context</a> <BR><BR>
+ #else
+ <a href="$appRoot/Tomcat/Entity/update.vm?id=$id">Update this Context</a> <BR><BR>
+ #end
+ #end
+
+
+ #else
+ Context:
+ #set ($contexts = $view.getContexts())
+ <select name=id onchange='OnChange(this);'>
+ <option value="">Select one
+ #foreach ($context in $contexts)
+ <option value="$appRoot/Tomcat/Entity/view.vm?id=$context.getPk()">$context.getName()
+ #end
+ </select><BR>
+
+
+ #end
+ </div>
+ </div>
+ #parse("/layout/footer.vm")
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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/add.vm Wed Jul 5 14:11:29 2006
@@ -19,94 +19,96 @@
#set ($pageSelected = "Pool")
#parse("/layout/header.vm")
<div align="center" class="contentbox">
-<br /><br />
+ <br/><br/>
-<div class="projectbox">
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
-<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("workers"))
-#set($numberOfWorkers = $math.toInteger($request.getParameter("workers")))
-#else
-#set($numberOfWorkers = 1)
-#end
+ <div class="projectbox">
+ <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
+ <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("workers"))
+ #set($numberOfWorkers = $math.toInteger($request.getParameter("workers")))
+ #else
+ #set($numberOfWorkers = 1)
+ #end
-<form name="Form" method="post" action='$link.setAction("administration/TomcatPoolAction")'>
-<table>
-<tr>
-<td>
-Name:
-</td>
-<td>
-<input type="text" id="poolName" name="poolName" value="$!{poolName}">
-</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 Tomcat Worker</A>
-</td>
-</tr>
-<tr>
-<td>
-Tomcat Containers:
-</td>
-<td>
-Hardware:
-</td>
-</tr>
-#set($tomcats = $view.getTomcats())
-#set($hardware = $view.getHardwares())
-#foreach($run in [1..$numberOfWorkers])
-<tr>
-<td>
-$run
-<select name=tomcatId>
- #foreach ($tomcat in $tomcats)
- <option value="$tomcat.getPk()">$tomcat.getName()
- #end
- </select>
-</td>
-<td>
-<select name=hardwareId>
- #foreach ($h in $hardware)
- <option value="$h.getPk()">$h.getName()
- #end
- </select>
-</td>
-</tr>
-#end
-<tr>
-<td>
-</table>
-<input type="hidden" name="methodToCall" value="AddTomcatPool">
-<input type="submit" value="submit">
-</form>
-</div>
-<br />
-</div>
-<br />
+ <form name="Form" method="post" action='$link.setAction("administration/TomcatPoolAction")'>
+ <table>
+ <tr>
+ <td>
+ Name:
+ </td>
+ <td>
+ <input type="text" id="poolName" name="poolName" value="$!{poolName}">
+ </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 Tomcat Worker</A>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Tomcat Containers:
+ </td>
+ <td>
+ Hardware:
+ </td>
+ </tr>
+ #set($tomcats = $view.getTomcats())
+ #set($hardware = $view.getHardwares())
+ #foreach($run in [1..$numberOfWorkers])
+ <tr>
+ <td>
+ $run
+ <select name=tomcatId>
+ #foreach ($tomcat in $tomcats)
+ <option value="$tomcat.getPk()">$tomcat.getName()
+ #end
+ </select>
+
+ </td>
+ <td>
+ <select name=hardwareId>
+ #foreach ($h in $hardware)
+ <option value="$h.getPk()">$h.getName()
+ #end
+ </select>
+ </td>
+ </tr>
+ #end
+ <tr>
+ <td>
+ </table>
+ <input type="hidden" name="methodToCall" value="AddTomcatPool">
+ <input type="submit" value="submit">
+ </form>
+ </div>
+ <br/>
+ </div>
+ <br/>
</div>
#parse("/layout/footer.vm")
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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/confirm.vm Wed Jul 5 14:11:29 2006
@@ -17,11 +17,11 @@
##
#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()" >
-$individual.getName()
+ <input type=hidden name="methodToCall" value="$methodToCall">
+ <input type="submit" value="$buttonName"><BR>
+ $methodToCall
+ <input type=hidden name=id value="$individual.getPk()">
+ $individual.getName()
</form>
#end
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/details.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/details.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/details.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/details.vm Wed Jul 5 14:11:29 2006
@@ -29,142 +29,140 @@
<div align="center" class="contentbox">
-<br /><br />
+<br/><br/>
<div class="projectbox">
<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
- <td colspan="2">Infrastructure - <b>Tomcat Pool</b>
- </td>
- <td align="right">
- #parse("/Tomcat/Pool/menu/global.vm")
- </td>
-</tr>
+ <tr class="info" valign="top">
+ <td colspan="2">Infrastructure - <b>Tomcat Pool</b>
+ </td>
+ <td align="right">
+ #parse("/Tomcat/Pool/menu/global.vm")
+ </td>
+ </tr>
</table>
-<br />
+<br/>
#if ($id)
- #set ($tomcatPool = $view.getTomcatPool($id))
+#set ($tomcatPool = $view.getTomcatPool($id))
<table width="95%" border="0" cellspacing="0" cellpadding="1">
<tr height="15" class="info">
- <td align="left" valign="center" colspan=2 >
- Tomcat Pool - <b>$!{tomcatPool.getName()}</b>
- </b>
- </td>
- <td align=right>
- #set($ent = $tomcatPool)
-#parse("/Tomcat/Pool/menu/indiv.vm")
+ <td align="left" valign="center" colspan=2>
+ Tomcat Pool - <b>$!{tomcatPool.getName()}</b>
+ </b>
+ </td>
+ <td align=right>
+ #set($ent = $tomcatPool)
+ #parse("/Tomcat/Pool/menu/indiv.vm")
</tr>
- <tr class="headercolor1">
- <td>Worker Name</td><td>$!{tomcatPool.getWorkerName()}</td><td> </td></tr>
- <tr class="headercolor2">
- <td>Environment</td><td><A href="$appRoot/Core/Environment/details.vm?id=$!{tomcatPool.getEnv().getPk()}">$!{tomcatPool.getEnv().getName()}</a></td><td> </td></tr>
- <tr class="headercolor1">
- <td>Tomcat Workers:</td><td></td><td></td></tr>
- #set ($tomcatWorkers = $tomcatPool.getTomcatWorkers())
- #set ($c=1)
- #foreach ($worker in $tomcatWorkers)
- <tr class="headercolor1">
- <td> </td>
- <td class="bodycolor1$c"><A href="$appRoot/Tomcat/Worker/details.vm?id=$worker.getPk()">$worker.getName()</a></td>
- <td align="right" class="bodycolor1$c">
- #set($ent = $worker)
- #parse("/Tomcat/Worker/menu/indiv.vm")
- </td>
- </tr>
- #if ($c == 1)
- #set($c=2)
- #else
- #set($c=1)
- #end
- #end
+ <tr class="headercolor1">
+ <td>Worker Name</td><td>$!{tomcatPool.getWorkerName()}</td><td></td></tr>
+ <tr class="headercolor2">
+ <td>Environment</td><td><A href="$appRoot/Core/Environment/details.vm?id=$!{tomcatPool.getEnv().getPk()}">$!{tomcatPool.getEnv().getName()}</a>
+ </td><td></td></tr>
+ <tr class="headercolor1">
+ <td>Tomcat Workers:</td><td></td><td></td></tr>
+ #set ($tomcatWorkers = $tomcatPool.getTomcatWorkers())
+ #set ($c=1)
+ #foreach ($worker in $tomcatWorkers)
+ <tr class="headercolor1">
+ <td></td>
+ <td class="bodycolor1$c"><A href="$appRoot/Tomcat/Worker/details.vm?id=$worker.getPk()">$worker.getName()</a></td>
+ <td align="right" class="bodycolor1$c">
+ #set($ent = $worker)
+ #parse("/Tomcat/Worker/menu/indiv.vm")
+ </td>
+ </tr>
+ #if ($c == 1)
+ #set($c=2)
+ #else
+ #set($c=1)
+ #end
+ #end
</table>
#set ($collection = $view.getHostingPools($tomcatPool))
#if( $collection && ! $collection.isEmpty())
-<br />
+<br/>
#parse("/Core/Pool/list.vm")
-#end
-
+#end
#set ($projectContexts = $view.getTomcatContexts($User, $tomcatPool))
#if( $projectContexts && ! $projectContexts.isEmpty())
<br>
- <TABLE WIDTH="95%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
+<TABLE WIDTH="95%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
<tr height="15" class="info">
- <td align="left" valign="center" colspan=4 >
- Tomcat applications
- </b>
- </td>
- </tr>
- <tr class="info">
+ <td align="left" valign="center" colspan=4>
+ Tomcat applications
+ </b>
+ </td>
+</tr>
+<tr class="info">
<th width=25%> Context </th>
<th width=15%> Environment </th>
<th width=30%> Worker </th>
- <th width=30%> </th>
- </tr>
- #set($c = 1)
- #foreach ($context in $projectContexts)
- #set ($count = 1)
- #set ($tomcatPool = $context.getTomcatPool())
- #if (!$context.hasTomcatPool())
- <tr class="headercolor$c">
- <td><A href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}"> $!{context.getName()} </td>
- <td> $!{context.getEnv().getName()} </td>
- <TD> Not assigned to a Pool</TD><TD> </TD></TR>
- #else
- <tr class="headercolor$c">
- <td><A href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}"> $!{context.getName()} </td>
- <td> $!{context.getEnv().getName()} </td>
- #end
- <td>
- #foreach ($tomcatWorker in $tomcatPool.getTomcatWorkers())
- <A href="$appRoot/Tomcat/Worker/$page?id=$!{tomcatWorker.getPk()}">$!{tomcatWorker.getName()} </a><br>
- #end
- </td>
- <td align="right">
- <!-- before macro -->
- <!-- $context -->
- <!-- start macro -->
- #contextDropBoxWOproject($User $context)
- </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
+ <th width=30%></th>
+</tr>
+#set($c = 1)
+#foreach ($context in $projectContexts)
+#set ($count = 1)
+#set ($tomcatPool = $context.getTomcatPool())
+#if (!$context.hasTomcatPool())
+<tr class="headercolor$c">
+ <td><A href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}"> $!{context.getName()}</td>
+ <td> $!{context.getEnv().getName()} </td>
+ <TD> Not assigned to a Pool</TD><TD></TD></TR>
+#else
+<tr class="headercolor$c">
+ <td><A href="$appRoot/Tomcat/Entity/view.vm?id=$!{context.getPk()}"> $!{context.getName()}</td>
+ <td> $!{context.getEnv().getName()} </td>
+ #end
+ <td>
+ #foreach ($tomcatWorker in $tomcatPool.getTomcatWorkers())
+ <A href="$appRoot/Tomcat/Worker/$page?id=$!{tomcatWorker.getPk()}">$!{tomcatWorker.getName()} </a><br>
+ #end
+ </td>
+ <td align="right">
+ <!-- before macro -->
+ <!-- $context -->
+ <!-- start macro -->
+ #contextDropBoxWOproject($User $context)
+ </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
-
-<br />
-
+#end ## of all contexts
+<br/>
#else
<div class="messagebox">
Tomcat Pool:
#set ($aps = $view.getTomcatPools())
- <select name=id onchange='OnChange(this);'>
- <option value="">Select one
- #foreach ($ap in $aps)
- <option value="$appRoot/Tomcat/Pool/details.vm?id=$ap.getPk()">$ap.getName()
- #end
- </select><BR>
+ <select name=id onchange='OnChange(this);'>
+ <option value="">Select one
+ #foreach ($ap in $aps)
+ <option value="$appRoot/Tomcat/Pool/details.vm?id=$ap.getPk()">$ap.getName()
+ #end
+ </select><BR>
</div>
#end
-<br />
+<br/>
</div>
-<br />
+<br/>
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/menu/global.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/menu/global.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/menu/global.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/menu/global.vm Wed Jul 5 14:11:29 2006
@@ -16,35 +16,35 @@
## $Id$
##
<select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-#if($page)
-<option value="$appRoot/Tomcat/Pool/$page"> Details </option>
-#else
-<option value="$appRoot/Tomcat/Pool/details.vm"> Details </option>
-#end
-#if($User.isAllowed("AddTomcatPool"))
-<option value="$appRoot/Tomcat/Pool/add.vm"> Add </option>
-#end
-#if($User.isAllowed("UpdateTomcatPool"))
-<option value="$appRoot/Tomcat/Pool/update.vm"> Update </option>
-#end
-#if($User.isAllowed("DeleteTomcatPool"))
-<option value="$appRoot/Tomcat/Pool/delete.vm"> Delete </option>
-#end
-#if($User.isAllowed("RestartTomcat"))
-<option value="$appRoot/Tomcat/Pool/restarttomcat.vm"> Restart </option>
-#end
-#if($User.isAllowed("StopTomcat"))
-<option value="$appRoot/Tomcat/Pool/stoptomcat.vm"> Stop </option>
-#end
-#if($User.isAllowed("StartTomcat"))
-<option value="$appRoot/Tomcat/Pool/starttomcat.vm"> Start </option>
-#end
-#if($User.isAllowed("ViewTomcatPool"))
-<option value="$appRoot/Tomcat/Pool/viewconf.vm"> View server.xml </option>
-#end
-#if($User.isAllowed("DeployTomcatConfig"))
-<option value="$appRoot/Tomcat/Pool/deployconf.vm"> Deploy Tomcat Config </option>
-#end
+ <option value="" selected>Select Action
+ #if($page)
+ <option value="$appRoot/Tomcat/Pool/$page"> Details </option>
+ #else
+ <option value="$appRoot/Tomcat/Pool/details.vm"> Details </option>
+ #end
+ #if($User.isAllowed("AddTomcatPool"))
+ <option value="$appRoot/Tomcat/Pool/add.vm"> Add </option>
+ #end
+ #if($User.isAllowed("UpdateTomcatPool"))
+ <option value="$appRoot/Tomcat/Pool/update.vm"> Update </option>
+ #end
+ #if($User.isAllowed("DeleteTomcatPool"))
+ <option value="$appRoot/Tomcat/Pool/delete.vm"> Delete </option>
+ #end
+ #if($User.isAllowed("RestartTomcat"))
+ <option value="$appRoot/Tomcat/Pool/restarttomcat.vm"> Restart </option>
+ #end
+ #if($User.isAllowed("StopTomcat"))
+ <option value="$appRoot/Tomcat/Pool/stoptomcat.vm"> Stop </option>
+ #end
+ #if($User.isAllowed("StartTomcat"))
+ <option value="$appRoot/Tomcat/Pool/starttomcat.vm"> Start </option>
+ #end
+ #if($User.isAllowed("ViewTomcatPool"))
+ <option value="$appRoot/Tomcat/Pool/viewconf.vm"> View server.xml </option>
+ #end
+ #if($User.isAllowed("DeployTomcatConfig"))
+ <option value="$appRoot/Tomcat/Pool/deployconf.vm"> Deploy Tomcat Config </option>
+ #end
</select>
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/menu/indiv.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/menu/indiv.vm Wed Jul 5 14:11:29 2006
@@ -16,32 +16,32 @@
## $Id$
##
<select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-#if($page)
-<option value="$appRoot/Tomcat/Pool/$page?id=$!{ent.getPk()}"> Details </option>
-#else
-<option value="$appRoot/Tomcat/Pool/details.vm?id=$!{ent.getPk()}"> Details </option>
-#end
-#if($User.isAllowed("UpdateTomcatPool"))
-<option value="$appRoot/Tomcat/Pool/update.vm?id=$!{ent.getPk()}"> Update </option>
-#end
-#if($User.isAllowed("DeleteTomcatPool"))
-<option value="$appRoot/Tomcat/Pool/delete.vm?id=$!{ent.getPk()}"> Delete </option>
-#end
-#if($User.isAllowed("RestartTomcat"))
-<option value="$appRoot/Tomcat/Pool/restarttomcat.vm?id=$!{ent.getPk()}"> Restart </option>
-#end
-#if($User.isAllowed("StopTomcat"))
-<option value="$appRoot/Tomcat/Pool/stoptomcat.vm?id=$!{ent.getPk()}"> Stop </option>
-#end
-#if($User.isAllowed("StartTomcat"))
-<option value="$appRoot/Tomcat/Pool/starttomcat.vm?id=$!{ent.getPk()}"> Start </option>
-#end
-#if($User.isAllowed("ViewTomcatPool"))
-<option value="$appRoot/Tomcat/Pool/viewconf.vm"> View server.xml </option>
-#end
-#if($User.isAllowed("DeployTomcatConfig"))
-<option value="$appRoot/Tomcat/Pool/deployconf.vm?id=$!{ent.getPk()}"> Deploy Tomcat Config </option>
-#end
+ <option value="" selected>Select Action
+ #if($page)
+ <option value="$appRoot/Tomcat/Pool/$page?id=$!{ent.getPk()}"> Details </option>
+ #else
+ <option value="$appRoot/Tomcat/Pool/details.vm?id=$!{ent.getPk()}"> Details </option>
+ #end
+ #if($User.isAllowed("UpdateTomcatPool"))
+ <option value="$appRoot/Tomcat/Pool/update.vm?id=$!{ent.getPk()}"> Update </option>
+ #end
+ #if($User.isAllowed("DeleteTomcatPool"))
+ <option value="$appRoot/Tomcat/Pool/delete.vm?id=$!{ent.getPk()}"> Delete </option>
+ #end
+ #if($User.isAllowed("RestartTomcat"))
+ <option value="$appRoot/Tomcat/Pool/restarttomcat.vm?id=$!{ent.getPk()}"> Restart </option>
+ #end
+ #if($User.isAllowed("StopTomcat"))
+ <option value="$appRoot/Tomcat/Pool/stoptomcat.vm?id=$!{ent.getPk()}"> Stop </option>
+ #end
+ #if($User.isAllowed("StartTomcat"))
+ <option value="$appRoot/Tomcat/Pool/starttomcat.vm?id=$!{ent.getPk()}"> Start </option>
+ #end
+ #if($User.isAllowed("ViewTomcatPool"))
+ <option value="$appRoot/Tomcat/Pool/viewconf.vm"> View server.xml </option>
+ #end
+ #if($User.isAllowed("DeployTomcatConfig"))
+ <option value="$appRoot/Tomcat/Pool/deployconf.vm?id=$!{ent.getPk()}"> Deploy Tomcat Config </option>
+ #end
</select>
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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/update.vm Wed Jul 5 14:11:29 2006
@@ -19,72 +19,73 @@
#set ($pageSelected = "Pool")
#parse("/layout/header.vm")
<div align="center" class="contentbox">
-<br /><br />
+ <br/><br/>
-<div class="projectbox">
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
-<TR CLASS="info" valign="top">
- <TD colspan=3>Infrastructure - <b>Tomcat Pool</b>
- </TD>
-</TR>
-</table>
-<div class="messagebox">
-#set ($id = $request.getParameter("id"))
-#set ($methodToCall = "UpdateTomcatPool")
-#if($id)
-#set ($tomcatPool = $view.getTomcatPool($id))
+ <div class="projectbox">
+ <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
+ <TR CLASS="info" valign="top">
+ <TD colspan=3>Infrastructure - <b>Tomcat Pool</b>
+ </TD>
+ </TR>
+ </table>
+ <div class="messagebox">
+ #set ($id = $request.getParameter("id"))
+ #set ($methodToCall = "UpdateTomcatPool")
+ #if($id)
+ <br/>
+ #set ($tomcatPool = $view.getTomcatPool($id))
-#if ($User.isAllowed("UpdateTomcatPool") && $methodToCall == "UpdateTomcatPool")
-<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">
-Name: <input type="text" readonly id="workerName" name="workerName" value="$!{tomcatPool.getWorkerName()}"><BR>
-Pool Name: <input type="text" readonly id="poolName" name="poolName" value="$!{tomcatPool.getName()}"><BR>
-Environment:
-#set ($envs = $view.getEnvironments())
-<select name=envId>
-#if ($tomcatPool.getEnv())
-#if ($envs.remove($tomcatPool.getEnv()))
+ #if ($User.isAllowed("UpdateTomcatPool") && $methodToCall == "UpdateTomcatPool")
+ <form name="Form" method="post" action='$link.setAction("administration/TomcatPoolAction")'>
+ <input type="hidden" id="poolId" name="poolId" value="$!{id}">
+ <input type="hidden" id="methodToCall" name="methodToCall" value="$methodToCall">
+ Name: <input type="text" readonly id="workerName" name="workerName" value="$!{tomcatPool.getWorkerName()}"><BR>
+ Pool Name: <input type="text" readonly id="poolName" name="poolName" value="$!{tomcatPool.getName()}"><BR>
+ Environment:
+ #set ($envs = $view.getEnvironments())
+ <select name=envId>
+ #if ($tomcatPool.getEnv())
+ #if ($envs.remove($tomcatPool.getEnv()))
-#end
-#end
- <option value="$tomcatPool.getEnv().getPk()">$tomcatPool.getEnv().getName()
- #foreach ($env in $envs)
- <option value="$env.getPk()">$env.getName()
- #end
- </select><BR>
-Tomcat Workers:
+ #end
+ #end
+ <option value="$tomcatPool.getEnv().getPk()">$tomcatPool.getEnv().getName()
+ #foreach ($env in $envs)
+ <option value="$env.getPk()">$env.getName()
+ #end
+ </select><BR>
+ Tomcat Workers:
-<select name="tomcatIds" size="5" style="width:150px" multiple>
- #set ($tomcatWorkers = $Users.getTomcatWorkers())
- #if ($tomcatPool.getTomcats())
- #foreach ($worker in $tomcatPool.getTomcats())
- <option value="$worker.getPk()" > $worker.getName()
- #end
- #if ($tomcatWorkers.removeAll($tomcatPool.getTomcats()))
- #end
- #end
- #foreach ($worker in $tomcatWorkers)
- <option value="$worker.getPk()" > $worker.getName()
- #end
-</select>
-<BR><BR><input type="submit" value="submit">
-#end
-#else
- Tomcat Pool:
- #set ($aps = $view.getTomcatPools())
- <select name=id onchange='OnChange(this);'>
- <option value="">Select one
- #foreach ($ap in $aps)
- <option value="$appRoot/Tomcat/Pool/update.vm?id=$ap.getPk()">$ap.getName()
- #end
- </select><BR>
-#end
-</form>
-</div>
-<br />
-</div>
- <br />
+ <select name="tomcatIds" size="5" style="width:150px" multiple>
+ #set ($tomcatWorkers = $Users.getTomcatWorkers())
+ #if ($tomcatPool.getTomcats())
+ #foreach ($worker in $tomcatPool.getTomcats())
+ <option value="$worker.getPk()"> $worker.getName()
+ #end
+ #if ($tomcatWorkers.removeAll($tomcatPool.getTomcats()))
+ #end
+ #end
+ #foreach ($worker in $tomcatWorkers)
+ <option value="$worker.getPk()"> $worker.getName()
+ #end
+ </select>
+ <BR><BR><input type="submit" value="submit">
+ #end
+ #else
+ Tomcat Pool:
+ #set ($aps = $view.getTomcatPools())
+ <select name=id onchange='OnChange(this);'>
+ <option value="">Select one
+ #foreach ($ap in $aps)
+ <option value="$appRoot/Tomcat/Pool/update.vm?id=$ap.getPk()">$ap.getName()
+ #end
+ </select><BR>
+ #end
+ </form>
+ </div>
+ <br/>
+ </div>
+ <br/>
</div>
#parse("/layout/footer.vm")
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=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Pool/viewconf.vm Wed Jul 5 14:11:29 2006
@@ -19,37 +19,37 @@
#set ($pageSelected = "Pool")
#parse("/layout/header.vm")
<div align="center" class="contentbox">
-<br /><br />
+ <br/><br/>
-<div class="projectbox">
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
-<TR CLASS="info" valign="top">
- <TD colspan=3>Infrastructure - <b>Tomcat Pool</b>
- </TD>
-</TR>
-</table>
-#if ($request.getParameter("id"))
-#set ($id = $request.getParameter("id"))
-#end
-<div class="messagebox">
-#if ($id)
-#set ($tomcatWorker = $view.getTomcatWorker($id))
-<!-- $tomcatWorker -->
-<!-- buildConfForWeb -->
-<TextArea cols="90" READONLY rows="30">$!{tomcatWorker.buildConfForWeb()}</textarea>
-#else
-Tomcat Worker:
-#set ($tws = $view.getTomcatWorkers())
- <select name=id onchange='OnChange(this);'>
- <option value="">Select one
- #foreach ($tw in $tws)
- <option value="$appRoot/Tomcat/Pool/viewconf.vm?id=$tw.getPk()">$tw.getName()
- #end
- </select><BR>
-#end
-</div>
-<br />
-</div>
-#parse("/layout/footer.vm")
+ <div class="projectbox">
+ <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="1">
+ <TR CLASS="info" valign="top">
+ <TD colspan=3>Infrastructure - <b>Tomcat Pool</b>
+ </TD>
+ </TR>
+ </table>
+ #if ($request.getParameter("id"))
+ #set ($id = $request.getParameter("id"))
+ #end
+ <div class="messagebox">
+ #if ($id)
+ #set ($tomcatWorker = $view.getTomcatWorker($id))
+ <!-- $tomcatWorker -->
+ <!-- buildConfForWeb -->
+ <TextArea cols="90" READONLY rows="30">$!{tomcatWorker.buildConfForWeb()}</textarea>
+ #else
+ Tomcat Worker:
+ #set ($tws = $view.getTomcatWorkers())
+ <select name=id onchange='OnChange(this);'>
+ <option value="">Select one
+ #foreach ($tw in $tws)
+ <option value="$appRoot/Tomcat/Pool/viewconf.vm?id=$tw.getPk()">$tw.getName()
+ #end
+ </select><BR>
+ #end
+ </div>
+ <br/>
+ </div>
+ #parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/menu/global.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/menu/global.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/menu/global.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/menu/global.vm Wed Jul 5 14:11:29 2006
@@ -16,10 +16,10 @@
## $Id$
##
<select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-<option value="$appRoot/Tomcat/Server/details.vm"> Details </option>
-<option value="$appRoot/Tomcat/Server/add.vm"> Add </option>
-<option value="$appRoot/Tomcat/Server/update.vm"> Update </option>
-<option value="$appRoot/Tomcat/Server/delete.vm"> Delete </option>
+ <option value="" selected>Select Action
+ <option value="$appRoot/Tomcat/Server/details.vm"> Details </option>
+ <option value="$appRoot/Tomcat/Server/add.vm"> Add </option>
+ <option value="$appRoot/Tomcat/Server/update.vm"> Update </option>
+ <option value="$appRoot/Tomcat/Server/delete.vm"> Delete </option>
</select>
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/menu/indiv.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/menu/indiv.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/menu/indiv.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Server/menu/indiv.vm Wed Jul 5 14:11:29 2006
@@ -16,9 +16,9 @@
## $Id$
##
<select name=methodToCall onchange='OnChange(this);'>
-<option value="" selected>Select Action
-<option value="$appRoot/Tomcat/Server/details.vm?id=$!{ent.getPk()}"> Details </option>
-<option value="$appRoot/Tomcat/Server/update.vm?id=$!{ent.getPk()}"> Update </option>
-<option value="$appRoot/Tomcat/Server/delete.vm?id=$!{ent.getPk()}"> Delete </option>
+ <option value="" selected>Select Action
+ <option value="$appRoot/Tomcat/Server/details.vm?id=$!{ent.getPk()}"> Details </option>
+ <option value="$appRoot/Tomcat/Server/update.vm?id=$!{ent.getPk()}"> Update </option>
+ <option value="$appRoot/Tomcat/Server/delete.vm?id=$!{ent.getPk()}"> Delete </option>
</select>
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/add.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/add.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/add.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/add.vm Wed Jul 5 14:11:29 2006
@@ -19,63 +19,64 @@
#set ($pageSelected = "Worker")
#parse("/layout/header.vm")
<div align="center" class="contentbox">
-<br /><br />
+ <br/><br/>
-<div class="projectbox">
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-<tr class="info" valign="top">
- <td colspan=3>Infrastructure - <b>TomcatWorker</b>
- </td>
- <td align="right">
- #parse("Tomcat/Worker/menu/global.vm")
- </td>
-</tr>
-</table>
-<br />
-<div class="messagebox">
-<form name="Form" method="post" action='$link.setAction("administration/TomcatWorkerAction")'>
-<table>
-<tr>
-<td>
-State:
-</td>
-<td>
-Active
-<input type="hidden" id="stateId" name="stateId" value="8">
-</td>
-</tr>
-<tr>
-<td>
-Hardware:
-</td>
-<td>
-<select name=hardwareId>
- #foreach ($h in $view.getHardwares())
- <option value="$h.getPk()">$h.getName()
- #end
- </select>
-</td>
-</tr>
-<tr>
-<td>
-Tomcat:
-</td>
-<td>
-<select name=tomcatId>
- #foreach ($tomcat in $view.getTomcats())
- <option value="$tomcat.getPk()">$tomcat.getName()
- #end
- </select>
-</td>
-</tr>
-</table>
-<input type="hidden" name="methodToCall" value="AddTomcatWorker">
-<input type="submit" value="submit">
-</form>
-</div>
-<br />
-</div>
-<br />
+ <div class="projectbox">
+ <table width="100%" border="0" cellspacing="0" cellpadding="1">
+ <tr class="info" valign="top">
+ <td colspan=3>Infrastructure - <b>TomcatWorker</b>
+ </td>
+ <td align="right">
+ #parse("Tomcat/Worker/menu/global.vm")
+ </td>
+ </tr>
+ </table>
+ <br/>
+
+ <div class="messagebox">
+ <form name="Form" method="post" action='$link.setAction("administration/TomcatWorkerAction")'>
+ <table>
+ <tr>
+ <td>
+ State:
+ </td>
+ <td>
+ Active
+ <input type="hidden" id="stateId" name="stateId" value="8">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Hardware:
+ </td>
+ <td>
+ <select name=hardwareId>
+ #foreach ($h in $view.getHardwares())
+ <option value="$h.getPk()">$h.getName()
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ Tomcat:
+ </td>
+ <td>
+ <select name=tomcatId>
+ #foreach ($tomcat in $view.getTomcats())
+ <option value="$tomcat.getPk()">$tomcat.getName()
+ #end
+ </select>
+ </td>
+ </tr>
+ </table>
+ <input type="hidden" name="methodToCall" value="AddTomcatWorker">
+ <input type="submit" value="submit">
+ </form>
+ </div>
+ <br/>
+ </div>
+ <br/>
</div>
#parse("/layout/footer.vm")
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm?rev=419344&r1=419343&r2=419344&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm Wed Jul 5 14:11:29 2006
@@ -17,11 +17,11 @@
##
#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()" >
-$individual.getName()
+ <input type=hidden name="methodToCall" value="$methodToCall">
+ <input type="submit" value="$buttonName"><BR>
+ $methodToCall
+ <input type=hidden name=id value="$individual.getPk()">
+ $individual.getName()
</form>
#end