svn commit: r1049046 - in /ofbiz/branches/release10.04: ./ framework/webtools/webapp/webtools/service/threads.ftl

Author: jleroux
Date: Tue Dec 14 11:12:57 2010
New Revision: 1049046

URL: http://svn.apache.org/viewvc?rev=1049046&view=rev
Log:
"Applied fix from trunk for revision: 1049031"
------------------------------------------------------------------------
r1049031 | jleroux | 2010-12-14 11:53:46 +0100 (mar., 14 déc. 2010) | 1 line

Test on Java 5 is not needed anymore in trunk, R10.04 and R9.04 as at least Java 5 is needed (and even Java 6 for the trunk)
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/framework/webtools/webapp/webtools/service/threads.ftl

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 14 11:12:57 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031

Modified: ofbiz/branches/release10.04/framework/webtools/webapp/webtools/service/threads.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/webtools/webapp/webtools/service/threads.ftl?rev=1049046&r1=1049045&r2=1049046&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/webtools/webapp/webtools/service/threads.ftl (original)
+++ ofbiz/branches/release10.04/framework/webtools/webapp/webtools/service/threads.ftl Tue Dec 14 11:12:57 2010
@@ -16,8 +16,6 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<#assign javaVer = Static["java.lang.System"].getProperty("java.vm.version")/>
-<#assign isJava5 = javaVer.startsWith("1.5")/>
 <#if parameters.maxElements?has_content><#assign maxElements = parameters.maxElements?number/><#else><#assign maxElements = 10/></#if>
 
 <div class="screenlet">
@@ -59,7 +57,6 @@ under the License.
   <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 />
     <table class="basic-table hover-bar" cellspacing="0">
       <tr class="header-row">
@@ -73,20 +70,18 @@ under the License.
       <#assign alt_row = false>
       <#list allThreadList as javaThread>
       <#if javaThread?exists>
-        <#if isJava5><#assign stackTraceArray = javaThread.getStackTrace()/></#if>
+        <#assign stackTraceArray = javaThread.getStackTrace()/>
         <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
           <td valign="top">${(javaThread.getThreadGroup().getName())?if_exists}</td>
-          <td valign="top"><#if isJava5>${javaThread.getId()?string}</#if></td>
+          <td valign="top">${javaThread.getId()?string}</td>
           <td valign="top">
             <b>${javaThread.getName()?if_exists}</b>
-            <#if isJava5>
-              <#list 1..maxElements as stackIdx>
-                <#assign stackElement = stackTraceArray[stackIdx]?if_exists/>
-                <#if (stackElement.toString())?has_content><div>${stackElement.toString()}</div></#if>
-              </#list>
-            </#if>
+            <#list 1..maxElements as stackIdx>
+              <#assign stackElement = stackTraceArray[stackIdx]?if_exists/>
+              <#if (stackElement.toString())?has_content><div>${stackElement.toString()}</div></#if>
+            </#list>
           </td>
-          <td valign="top"><#if isJava5>${javaThread.getState().name()?if_exists}</#if>&nbsp;</td>
+          <td valign="top">${javaThread.getState().name()?if_exists}&nbsp;</td>
           <td valign="top">${javaThread.getPriority()}</td>
           <td valign="top">${javaThread.isDaemon()?string}<#-- /${javaThread.isAlive()?string}/${javaThread.isInterrupted()?string} --></td>
         </tr>