svn commit: r1049031 - /ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl

[jleroux]

Author: jleroux
Date: Tue Dec 14 10:53:46 2010
New Revision: 1049031

URL: http://svn.apache.org/viewvc?rev=1049031&view=rev
Log:
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/trunk/framework/webtools/webapp/webtools/service/threads.ftl

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=1049031&r1=1049030&r2=1049031&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl 
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl Tue Dec 
14 10:53:46 2010
@@ -16,12 +16,9 @@ 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>
 
     <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">
@@ -35,20 +32,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>