svn commit: r1374625 - in /ofbiz/trunk/framework/webtools: config/WebtoolsUiLabels.xml widget/ServiceForms.xml

[ad...@apache.org]

Author: adrianc
Date: Sat Aug 18 18:06:44 2012
New Revision: 1374625

URL: http://svn.apache.org/viewvc?rev=1374625&view=rev
Log:
Updated Web Tools Thread List screen to reflect changes in the Job Scheduler.

Modified:
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/framework/webtools/widget/ServiceForms.xml

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=1374625&r1=1374624&r2=1374625&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Sat Aug 18 18:06:44 2012
@@ -4181,7 +4181,7 @@
     </property>
     <property key="WebtoolsServiceEngineThreads">
         <value xml:lang="de">Dienste-Engine Threads</value>
-        <value xml:lang="en">Service Engine Threads</value>
+        <value xml:lang="en">Job Queue Service Threads</value>
         <value xml:lang="fr">Threads du Service Engine</value>
         <value xml:lang="it">Threads dell' Engine Servizi</value>
         <value xml:lang="pt">Threads do Engine de serviços</value>

Modified: ofbiz/trunk/framework/webtools/widget/ServiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceForms.xml?rev=1374625&r1=1374624&r2=1374625&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceForms.xml Sat Aug 18 18:06:44 2012
@@ -96,7 +96,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="statusId" title="${uiLabelMap.CommonStatus}" sort-field="true"><display-entity entity-name="StatusItem" description="${description}"/></field>
-        <field name="cancelDateTime" title="${uiLabelMap.CommonEndDateTime}" sort-field="true"><display/></field>
+        <field name="finishDateTime" title="${uiLabelMap.CommonEndDateTime}" sort-field="true"><display/></field>
         <field name="cancelButton" title=" " use-when="startDateTime==null&amp;&amp;finishDateTime==null&amp;&amp;cancelDateTime==null" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${uiLabelMap.WebtoolsCancelJob}" target="cancelJob">
                 <parameter param-name="jobId"/>
@@ -111,9 +111,6 @@ under the License.
         <field name="value"><display/></field>
     </form>
     <form name="PoolState" type="single" default-map-name="poolState">
-        <field name="pollerName"><display/></field>
-        <field name="pollerThreadName"><display/></field>
-        <field name="invokerThreadNameFormat"><display/></field>
         <field name="keepAliveTimeInSeconds"><display/></field>
         <field name="numberOfCoreInvokerThreads"><display/></field>
         <field name="currentNumberOfInvokerThreads"><display/></field>
@@ -127,7 +124,7 @@ under the License.
         <field name="id" title="${uiLabelMap.WebtoolsThread}"><display description="${threadId} ${threadName}"/></field>
         <field name="name" title="${uiLabelMap.WebtoolsJob}"><display default-value="${uiLabelMap.CommonNone}"/></field>
         <field name="serviceName" title="${uiLabelMap.WebtoolsService}"><display default-value="${uiLabelMap.CommonNone}"/></field>
-        <field name="time"><display/></field>
+        <field name="time" title="${uiLabelMap.CommonStartDateTime}"><display/></field>
         <field name="runTime" title="${uiLabelMap.CommonTime} (ms)"><display/></field>
     </form>
     <form name="ListServices" type="list" list-name="services" paginate-target="ServiceLog" separate-columns="true"