Posted by
buscob on
URL: http://ofbiz.116.s1.nabble.com/svn-commit-r992447-in-ofbiz-trunk-framework-webtools-webapp-webtools-service-threads-ftl-widget-Servl-tp2526196.html
Author: buscob
Date: Fri Sep 3 20:05:55 2010
New Revision: 992447
URL:
http://svn.apache.org/viewvc?rev=992447&view=revLog:
Converted part of thread list screen from FTL to form widgets
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl
ofbiz/trunk/framework/webtools/widget/ServiceForms.xml
ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
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=992447&r1=992446&r2=992447&view=diff==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl Fri Sep 3 20:05:55 2010
@@ -20,44 +20,6 @@ under the License.
<#assign isJava5 = javaVer.startsWith("1.5")/>
<#if parameters.maxElements?has_content><#assign maxElements = parameters.maxElements?number/><#else><#assign maxElements = 10/></#if>
-<div class="screenlet">
- <div class="screenlet-title-bar">
- <h3>${uiLabelMap.WebtoolsServiceEngineThreads}</h3>
- </div>
- <div class="screenlet-body">
- <table class="basic-table hover-bar" cellspacing="0">
- <tr class="header-row">
- <td>${uiLabelMap.WebtoolsThread}</td>
- <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>
- <#assign alt_row = false>
- <#list threads as thread>
- <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
- <td>${thread.threadId?if_exists} ${thread.threadName?if_exists}</td>
- <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>
- <#-- toggle the row color -->
- <#assign alt_row = !alt_row>
- </#list>
- </table>
- </div>
-</div>
-<div class="screenlet">
- <div class="screenlet-title-bar">
- <h3>${uiLabelMap.WebtoolsGeneralJavaThreads}</h3>
- </div>
- <div class="screenlet-body">
- <br />
<p>${uiLabelMap.WebtoolsThisThread}<b> ${Static["java.lang.Thread"].currentThread().getName()} (${Static["java.lang.Thread"].currentThread().getId()})</b></p>
<p>${uiLabelMap.WebtoolsJavaVersionIs5} <#if isJava5> ${uiLabelMap.CommonYes}<#else>${uiLabelMap.CommonNo}</#if></p>
<br />
@@ -95,5 +57,3 @@ under the License.
<#assign alt_row = !alt_row>
</#list>
</table>
- </div>
-</div>
\ No newline at end of file
Modified: ofbiz/trunk/framework/webtools/widget/ServiceForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceForms.xml?rev=992447&r1=992446&r2=992447&view=diff==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceForms.xml Fri Sep 3 20:05:55 2010
@@ -99,4 +99,14 @@ under the License.
</hyperlink>
</field>
</form>
+ <form name="ListJavaThread" type="list" list-name="threads" paginate-target="threadList" separate-columns="true"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+ <field name="threadId" title="${uiLabelMap.WebtoolsThread}"><display description="${threadId} ${threadName}"/></field>
+ <field name="status" title="${uiLabelMap.CommonStatus}"><display/></field>
+ <field name="jobName" title="${uiLabelMap.WebtoolsJob}"><display default-value="${uiLabelMap.CommonNone}"/></field>
+ <field name="serviceName" title="${uiLabelMap.WebtoolsService}"><display default-value="${uiLabelMap.CommonNone}"/></field>
+ <field name="usage" title="${uiLabelMap.WebtoolsUsage}"><display/></field>
+ <field name="ttl" title="${uiLabelMap.WebtoolsTTL} (ms)"><display/></field>
+ <field name="runTime" title="${uiLabelMap.CommonTime} (ms)"><display/></field>
+ </form>
</forms>
Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=992447&r1=992446&r2=992447&view=diff==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Fri Sep 3 20:05:55 2010
@@ -84,9 +84,14 @@ under the License.
<widgets>
<decorator-screen name="CommonServiceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://webtools/webapp/webtools/service/threads.ftl"/></html>
- </platform-specific>
+ <screenlet title="${uiLabelMap.WebtoolsServiceEngineThreads}">
+ <include-form name="ListJavaThread" location="component://webtools/widget/ServiceForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.WebtoolsGeneralJavaThreads}">
+ <platform-specific>
+ <html><html-template location="component://webtools/webapp/webtools/service/threads.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>