You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/12/19 01:38:00 UTC
svn commit: r605372 - in /ofbiz/trunk/framework/webtools:
config/WebtoolsUiLabels.properties
webapp/webtools/WEB-INF/actions/service/threads.bsh
webapp/webtools/service/jobs.ftl webapp/webtools/service/threads.ftl
Author: jaz
Date: Tue Dec 18 16:37:58 2007
New Revision: 605372
URL: http://svn.apache.org/viewvc?rev=605372&view=rev
Log:
updated thread list to show ttl and # of jobs processed per thread
Modified:
ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/threads.bsh
ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl
Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties?rev=605372&r1=605371&r2=605372&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties Tue Dec 18 16:37:58 2007
@@ -404,8 +404,10 @@
WebtoolsToFindAll=To find ALL of Entity
WebtoolsTotalEntities=Total Entities
WebtoolsTotalMemory=TOTAL
+WebtoolsTTL=TTL
WebtoolsUnCheckAll=Un-Check All
WebtoolsUpdateCharacterSetAndCollate=Update character-set and collate (based on settings on datasource in entityengine.xml)
+WebtoolsUsage=Usage
WebtoolsUsedMemory=USED
WebtoolsUseFileStore=Use File Store ?
WebtoolsUseSoftRef=Use Soft Ref ?
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/threads.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/threads.bsh?rev=605372&r1=605371&r2=605372&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/threads.bsh (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/threads.bsh Tue Dec 18 16:37:58 2007
@@ -50,7 +50,8 @@
case -1: status = uiLabelMap.get("WebtoolsStatusShuttingDown"); break;
default: status = uiLabelMap.get("WebtoolsStatusInvalid"); break;
}
- threads.add(UtilMisc.toMap("serviceName", job.get("serviceName"), "threadName", job.get("threadName"), "threadId", job.get("threadId"), "jobName", job.get("jobName"), "status", status));
+ job.put("status", status);
+ threads.add(job);
}
}
context.put("threads", threads);
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl?rev=605372&r1=605371&r2=605372&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl Tue Dec 18 16:37:58 2007
@@ -51,7 +51,7 @@
</#if>
</td>
<td class="button-col">
- <#if (job.statusId?has_content && job.statusId == 'SERVICE_RUNNING')>
+ <#if (job.statusId?has_content && (job.statusId == 'SERVICE_RUNNING' || job.statusId == 'SERVICE_QUEUED'))>
<a href="<@o...@ofbizUrl>">${uiLabelMap.WebtoolsResetJob}</a>
<#elseif (!job.statusId?has_content || job.statusId == 'SERVICE_PENDING')>
<a href="<@o...@ofbizUrl>">${uiLabelMap.WebtoolsCancelJob}</a>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl?rev=605372&r1=605371&r2=605372&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl Tue Dec 18 16:37:58 2007
@@ -30,6 +30,8 @@
<td>${uiLabelMap.CommonStatus}</td>
<td>${uiLabelMap.WebtoolsJob}</td>
<td>${uiLabelMap.WebtoolsService}</td>
+ <td>${uiLabelMap.WebtoolsUsage}</td>
+ <td>${uiLabelMap.WebtoolsTTL} (ms)</td>
<td>${uiLabelMap.CommonTime} (ms)</td>
</tr>
<#list threads as thread>
@@ -38,6 +40,8 @@
<td>${thread.status?if_exists}</td>
<td>${thread.jobName?default("[${uiLabelMap.CommonNone}]")}</td>
<td>${thread.serviceName?default("[${uiLabelMap.CommonNone}]")}</td>
+ <td>${thread.usage?if_exists}</td>
+ <td>${thread.ttl?if_exists}</td>
<td>${thread.runTime?if_exists}</td>
</tr>
</#list>