You are viewing a plain text version of this content. The canonical link for it is here.
Posted to lokahi-commits@incubator.apache.org by to...@apache.org on 2006/07/10 18:14:49 UTC
svn commit: r420600 - in /incubator/lokahi/lokahi/trunk: conf/
src/java/org/apache/lokahi/core/agent/task/
src/java/org/apache/lokahi/core/api/alert/
src/java/org/apache/lokahi/tomcat/api/entity/ src/www/Core/Server/
Author: toback
Date: Mon Jul 10 11:14:48 2006
New Revision: 420600
URL: http://svn.apache.org/viewvc?rev=420600&view=rev
Log:
Fix to ensure context functions are translated properly.
Modified:
incubator/lokahi/lokahi/trunk/conf/function.xml
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/PutFileTask.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertModel.java
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContextModel.java
incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm
Modified: incubator/lokahi/lokahi/trunk/conf/function.xml
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/conf/function.xml?rev=420600&r1=420599&r2=420600&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/conf/function.xml (original)
+++ incubator/lokahi/lokahi/trunk/conf/function.xml Mon Jul 10 11:14:48 2006
@@ -31,7 +31,7 @@
<function id="82" name="List Context" command="ListContext"/>
<function id="84" name="List Sessions" command="SessionsOfContext"/>
<function id="85" name="Status of Context" command="StatusOfContext"/>
-
+<!--
<function id="127" name="Reload Context" command="ReloadContext6"/>
<function id="128" name="Stop Context" command="StopContext6"/>
<function id="129" name="Start Context" command="StartContext6"/>
@@ -41,7 +41,7 @@
<function id="133" name="List Context" command="ListContext6"/>
<function id="134" name="List Sessions" command="SessionsOfContext6"/>
<function id="135" name="Status of Context" command="StatusOfContext6"/>
-
+-->
<function id="121" name="Update Alert" command="UpdateAlert"/>
<function id="125" name="Delete VirtualHost" command="DeleteVirtualHost"/>
<function id="48" name="Add HostingPool" command="AddHostingPool"/>
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/PutFileTask.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/PutFileTask.java?rev=420600&r1=420599&r2=420600&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/PutFileTask.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/PutFileTask.java Mon Jul 10 11:14:48 2006
@@ -40,7 +40,7 @@
public String getResult() throws TMCTaskException, ExecutionException, InterruptedException {
if (!task.get()) throw new TMCTaskException("Error in deploying file");
- return "File was sucessful";
+ return "File deployed sucessfully";
}
}
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertModel.java?rev=420600&r1=420599&r2=420600&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/api/alert/AlertModel.java Mon Jul 10 11:14:48 2006
@@ -67,7 +67,7 @@
logger.debug("f=" + f);
}
if (u.isAllowed(f) && "UpdateAlert".equals(f.getCommand())) {
- if (fi.getPk() > 1 && fi.getName() != null && !"".equals(fi.getName())) {
+ if (fi.getPk() >= 1 && fi.getName() != null && !"".equals(fi.getName())) {
AlertDAO.update(fi);
} else {
throw new TMCIllegalArgumentException("Alert can not be null");
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContextModel.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContextModel.java?rev=420600&r1=420599&r2=420600&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContextModel.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/tomcat/api/entity/TomcatContextModel.java Mon Jul 10 11:14:48 2006
@@ -412,7 +412,7 @@
jobPool = JobPool.store(jobPool);
}
if (jobPool != null && tw != null && options != null && !"".equals(options) && f != null) {
- if (tw.getType() == 6) f = Function.getFunction(f.getCommand() + "6");
+// if (tw.getType() == 6) f = Function.getFunction(f.getCommand() + "6");
Job j = new Job(-1, s, options, tw.getHardware(), f, jobPool);
if (Job.store(j) != null) {
}
Modified: incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm?rev=420600&r1=420599&r2=420600&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Core/Server/search.vm Mon Jul 10 11:14:48 2006
@@ -34,12 +34,6 @@
</select></td>
</tr>
</table>
- ##<td colspan="2" align="right"><a class="info" href="$appRoot/Core/Server/list.vm">View Hardware</a> <a
- class="info" href="$appRoot/Apache/Server/list.vm">View Apache</a> <a class="info"
- href="$appRoot/Tomcat/Server/list.vm">View
- Tomcat</a></td>
- ##</tr>
- ##</table>
<br />
#if ($name && $type != "")
<div class="messagebox" width="75%" align="center">