Author: jacopoc
Date: Wed Nov 1 00:11:24 2006
New Revision: 469812
URL: http://svn.apache.org/viewvc?view=rev&rev=469812
Log:
Formatting fixes: tabs to spaces.
Modified:
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
incubator/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml
Modified:
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh?view=diff&rev=469812&r1=469811&r2=469812
==============================================================================
---
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh
(original)
+++
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/editUtilCache.bsh
Wed Nov 1 00:11:24 2006
@@ -22,11 +22,11 @@
context.put("cacheName", cacheName);
if (cacheName != null) {
- UtilCache utilCache =
(UtilCache)UtilCache.utilCacheTable.get(cacheName);
+ UtilCache utilCache = (UtilCache)UtilCache.utilCacheTable.get(cacheName);
if (utilCache != null) {
- Map cache = new HashMap();
-
- cache.put("cacheName", utilCache.getName());
+ Map cache = new HashMap();
+
+ cache.put("cacheName", utilCache.getName());
cache.put("cacheSize", UtilFormatOut.formatQuantity(utilCache.size()));
cache.put("hitCount",
UtilFormatOut.formatQuantity(utilCache.getHitCount()));
cache.put("missCountTot",
UtilFormatOut.formatQuantity(utilCache.getMissCountTotal()));
Modified:
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh?view=diff&rev=469812&r1=469811&r2=469812
==============================================================================
---
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh
(original)
+++
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCache.bsh
Wed Nov 1 00:11:24 2006
@@ -36,12 +36,12 @@
TreeSet names = new TreeSet(UtilCache.utilCacheTable.keySet());
Iterator nameIter = names.iterator();
if(nameIter != null && nameIter.hasNext()) {
- while(nameIter.hasNext()) {
- String cacheName = (String)nameIter.next();
- UtilCache utilCache =
(UtilCache)UtilCache.utilCacheTable.get(cacheName);
- Map cache = new HashMap();
-
- cache.put("cacheName", utilCache.getName());
+ while(nameIter.hasNext()) {
+ String cacheName = (String)nameIter.next();
+ UtilCache utilCache =
(UtilCache)UtilCache.utilCacheTable.get(cacheName);
+ Map cache = new HashMap();
+
+ cache.put("cacheName", utilCache.getName());
cache.put("cacheSize", UtilFormatOut.formatQuantity(utilCache.size()));
cache.put("hitCount",
UtilFormatOut.formatQuantity(utilCache.getHitCount()));
cache.put("missCountTot",
UtilFormatOut.formatQuantity(utilCache.getMissCountTotal()));
@@ -55,7 +55,7 @@
cache.put("useSoftReference", (new
Boolean(utilCache.getUseSoftReference())).toString());
cache.put("useFileSystemStore", (new
Boolean(utilCache.getUseFileSystemStore())).toString());
- cacheList.add(cache);
- }
+ cacheList.add(cache);
+ }
}
context.put("cacheList", cacheList);
Modified:
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh?view=diff&rev=469812&r1=469811&r2=469812
==============================================================================
---
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh
(original)
+++
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/cache/findUtilCacheElements.bsh
Wed Nov 1 00:11:24 2006
@@ -35,15 +35,15 @@
List cacheElementsList = new ArrayList();
if (cacheName != null) {
- UtilCache utilCache =
(UtilCache)UtilCache.utilCacheTable.get(cacheName);
+ UtilCache utilCache = (UtilCache)UtilCache.utilCacheTable.get(cacheName);
if (utilCache != null) {
- Iterator iter = utilCache.cacheLineTable.keySet().iterator();
+ Iterator iter = utilCache.cacheLineTable.keySet().iterator();
if(iter != null && iter.hasNext()) {
- int keyNum = 0;
- while(iter.hasNext()) {
- Map cacheElement = new HashMap();
- Object key = iter.next();
- CacheLine line = (CacheLine)
utilCache.cacheLineTable.get(key);
+ int keyNum = 0;
+ while(iter.hasNext()) {
+ Map cacheElement = new HashMap();
+ Object key = iter.next();
+ CacheLine line = (CacheLine) utilCache.cacheLineTable.get(key);
String expireTime = "";
if(line != null && line.loadTime > 0) {
expireTime = (new Date(line.loadTime +
utilCache.getExpireTime())).toString();
@@ -52,10 +52,10 @@
totalSize += lineSize;
cacheElement.put("elementKey", key);
- cacheElement.put("expireTime", expireTime);
- cacheElement.put("lineSize",
UtilFormatOut.formatQuantity(lineSize));
- cacheElement.put("keyNum", keyNum);
-
+ cacheElement.put("expireTime", expireTime);
+ cacheElement.put("lineSize",
UtilFormatOut.formatQuantity(lineSize));
+ cacheElement.put("keyNum", keyNum);
+
cacheElementsList.add(cacheElement);
keyNum++;
Modified:
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl?view=diff&rev=469812&r1=469811&r2=469812
==============================================================================
---
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl
(original)
+++
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl
Wed Nov 1 00:11:24 2006
@@ -19,101 +19,101 @@
<div class="tabletext"><b>${uiLabelMap.WebtoolsCacheName}:</b>
${cacheName?if_exists}</div>
<div> </div>
<div width="100%">
- <a
href="<@ofbizUrl>EditUtilCacheClear?UTIL_CACHE_NAME=${cacheName?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.WebtoolsClearThisCache}</a>
+ <a
href="<@ofbizUrl>EditUtilCacheClear?UTIL_CACHE_NAME=${cacheName?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.WebtoolsClearThisCache}</a>
<a href="<@ofbizUrl>FindUtilCache</@ofbizUrl>"
class="buttontext">${uiLabelMap.WebtoolsBackToCacheMaintenance}</a>
</div>
<div> </div>
<#if cache?has_content>
- <form method="POST"
action='<@ofbizUrl>EditUtilCacheUpdate?UTIL_CACHE_NAME=${cacheName?if_exists}</@ofbizUrl>'>
- <table cellpadding="2" cellspacing="0" border="1" width="50%"
class="boxoutside">
- <tr class='viewManyTR1'>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsCacheName}</div></td>
- <td colspan="2"><div
class="tableheadtext">${cache.cacheName?if_exists}</div></td>
- </tr>
- <tr class='viewManyTR2'>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsSize}</div></td>
- <td colspan="2"><div
class="tableheadtext">${cache.cacheSize?if_exists}</div></td>
- </tr>
- <tr class='viewManyTR1'>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsHits}</div></td>
- <td colspan="2"><div
class="tableheadtext">${cache.hitCount?if_exists}</div></td>
- </tr>
- <tr class='viewManyTR2'>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsMissesTotal}</div></td>
- <td colspan="2"><div
class="tableheadtext">${cache.missCountTot?if_exists}</div></td>
- </tr>
- <tr class='viewManyTR1'>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsMissesNotFound}</div></td>
- <td colspan="2"><div
class="tableheadtext">${cache.missCountNotFound?if_exists}</div></td>
- </tr>
- <tr class='viewManyTR2'>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsMissesExpire}</div></td>
- <td colspan="2"><div
class="tableheadtext">${cache.missCountExpired?if_exists}</div></td>
- </tr>
- <tr class='viewManyTR1'>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsMissesSoftReference}</div></td>
- <td colspan="2"><div
class="tableheadtext">${cache.missCountSoftRef?if_exists}</div></td>
- </tr>
- <tr class='viewManyTR2'>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsRemovesHit}</div></td>
- <td colspan="2"><div
class="tableheadtext">${cache.removeHitCount?if_exists}</div></td>
- </tr>
- <tr class='viewManyTR1'>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsRemovesMisses}</div></td>
- <td colspan="2"><div
class="tableheadtext">${cache.removeMissCount?if_exists}</div></td>
- </tr>
- <tr class='viewManyTR2'>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsMaxSize}</div></td>
- <td><div
class="tableheadtext">${cache.maxSize?if_exists}</div></td>
- <td><input type="text" class='inputBox'
size="15" maxlength="15" name="UTIL_CACHE_MAX_SIZE"
value="${cache.maxSize?if_exists}"></td>
- </tr>
- <tr class='viewManyTR1'>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsExpireTime}</div></td>
- <td><div
class="tableheadtext">${cache.expireTime?if_exists}
(${cache.hrs?if_exists}:${cache.mins?if_exists}:${cache.secs?if_exists})</div></td>
- <td><input type="text" class='inputBox'
size="15" maxlength="15" name="UTIL_CACHE_EXPIRE_TIME"
value="${cache.expireTime?if_exists}"></td>
- </tr>
- <tr class='viewManyTR2'>
- <#if cache.useSoftReference?exists &&
cache.useSoftReference == "true">
- <#assign selectedTrue = "selected">
- <#assign selectedFalse = "">
- <#assign valueSoftRef =
"${uiLabelMap.CommonTrue}">
- <#else>
- <#assign selectedTrue = "">
- <#assign selectedFalse = "selected">
- <#assign valueSoftRef =
"${uiLabelMap.CommonFalse}">
- </#if>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsUseSoftRef}</div></td>
- <td><div
class="tableheadtext">${valueSoftRef}</div></td>
- <td>
- <select
name="UTIL_CACHE_USE_SOFT_REFERENCE" class="selectBox">
- <option value="true"
${selectedTrue}>${uiLabelMap.CommonTrue}</option>
- <option value="false"
${selectedFalse}>${uiLabelMap.CommonFalse}</option>
- </select>
- </td>
- </tr>
- <tr class='viewManyTR1'>
- <#if cache.useFileSystemStore?exists &&
cache.useFileSystemStore == "true">
- <#assign valueFileSys =
"${uiLabelMap.CommonTrue}">
- <#else>
- <#assign valueFileSys =
"${uiLabelMap.CommonFalse}">
- </#if>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsUseFileStore}</div></td>
- <td colspan="2"><div
class="tableheadtext">${valueFileSys}</div></td>
- </tr>
- <tr>
- <td colspan="3" align="center">
- <input type="submit"
value="${uiLabelMap.CommonUpdate}">
- </td>
- </tr>
- </table>
- </form>
+ <form method="POST"
action='<@ofbizUrl>EditUtilCacheUpdate?UTIL_CACHE_NAME=${cacheName?if_exists}</@ofbizUrl>'>
+ <table cellpadding="2" cellspacing="0" border="1" width="50%"
class="boxoutside">
+ <tr class='viewManyTR1'>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsCacheName}</div></td>
+ <td colspan="2"><div
class="tableheadtext">${cache.cacheName?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR2'>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsSize}</div></td>
+ <td colspan="2"><div
class="tableheadtext">${cache.cacheSize?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR1'>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsHits}</div></td>
+ <td colspan="2"><div
class="tableheadtext">${cache.hitCount?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR2'>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsMissesTotal}</div></td>
+ <td colspan="2"><div
class="tableheadtext">${cache.missCountTot?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR1'>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsMissesNotFound}</div></td>
+ <td colspan="2"><div
class="tableheadtext">${cache.missCountNotFound?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR2'>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsMissesExpire}</div></td>
+ <td colspan="2"><div
class="tableheadtext">${cache.missCountExpired?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR1'>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsMissesSoftReference}</div></td>
+ <td colspan="2"><div
class="tableheadtext">${cache.missCountSoftRef?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR2'>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsRemovesHit}</div></td>
+ <td colspan="2"><div
class="tableheadtext">${cache.removeHitCount?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR1'>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsRemovesMisses}</div></td>
+ <td colspan="2"><div
class="tableheadtext">${cache.removeMissCount?if_exists}</div></td>
+ </tr>
+ <tr class='viewManyTR2'>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsMaxSize}</div></td>
+ <td><div
class="tableheadtext">${cache.maxSize?if_exists}</div></td>
+ <td><input type="text" class='inputBox' size="15"
maxlength="15" name="UTIL_CACHE_MAX_SIZE"
value="${cache.maxSize?if_exists}"></td>
+ </tr>
+ <tr class='viewManyTR1'>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsExpireTime}</div></td>
+ <td><div class="tableheadtext">${cache.expireTime?if_exists}
(${cache.hrs?if_exists}:${cache.mins?if_exists}:${cache.secs?if_exists})</div></td>
+ <td><input type="text" class='inputBox' size="15"
maxlength="15" name="UTIL_CACHE_EXPIRE_TIME"
value="${cache.expireTime?if_exists}"></td>
+ </tr>
+ <tr class='viewManyTR2'>
+ <#if cache.useSoftReference?exists && cache.useSoftReference
== "true">
+ <#assign selectedTrue = "selected">
+ <#assign selectedFalse = "">
+ <#assign valueSoftRef = "${uiLabelMap.CommonTrue}">
+ <#else>
+ <#assign selectedTrue = "">
+ <#assign selectedFalse = "selected">
+ <#assign valueSoftRef = "${uiLabelMap.CommonFalse}">
+ </#if>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsUseSoftRef}</div></td>
+ <td><div class="tableheadtext">${valueSoftRef}</div></td>
+ <td>
+ <select name="UTIL_CACHE_USE_SOFT_REFERENCE"
class="selectBox">
+ <option value="true"
${selectedTrue}>${uiLabelMap.CommonTrue}</option>
+ <option value="false"
${selectedFalse}>${uiLabelMap.CommonFalse}</option>
+ </select>
+ </td>
+ </tr>
+ <tr class='viewManyTR1'>
+ <#if cache.useFileSystemStore?exists &&
cache.useFileSystemStore == "true">
+ <#assign valueFileSys = "${uiLabelMap.CommonTrue}">
+ <#else>
+ <#assign valueFileSys = "${uiLabelMap.CommonFalse}">
+ </#if>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsUseFileStore}</div></td>
+ <td colspan="2"><div
class="tableheadtext">${valueFileSys}</div></td>
+ </tr>
+ <tr>
+ <td colspan="3" align="center">
+ <input type="submit" value="${uiLabelMap.CommonUpdate}">
+ </td>
+ </tr>
+ </table>
+ </form>
<#else>
- <div width="100%">
- ${uiLabelMap.WebtoolsNoUtilCacheSpecified}
- </div>
+ <div width="100%">
+ ${uiLabelMap.WebtoolsNoUtilCacheSpecified}
+ </div>
</#if>
<div> </div>
<div width="100%">
- <a
href="<@ofbizUrl>EditUtilCacheClear?UTIL_CACHE_NAME=${cacheName?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.WebtoolsClearThisCache}</a>
+ <a
href="<@ofbizUrl>EditUtilCacheClear?UTIL_CACHE_NAME=${cacheName?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.WebtoolsClearThisCache}</a>
<a href="<@ofbizUrl>FindUtilCache</@ofbizUrl>"
class="buttontext">${uiLabelMap.WebtoolsBackToCacheMaintenance}</a>
</div>
Modified:
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl?view=diff&rev=469812&r1=469811&r2=469812
==============================================================================
---
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
(original)
+++
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
Wed Nov 1 00:11:24 2006
@@ -24,56 +24,56 @@
<div class="tabletext"><u><b>${uiLabelMap.WebtoolsMemory}:</b></u>
[<b>${uiLabelMap.WebtoolsTotalMemory}:</b> ${memory}]
[<b>${uiLabelMap.WebtoolsFreeMemory}:</b> ${freeMemory}]
[<b>${uiLabelMap.WebtoolsUsedMemory}:</b> ${usedMemory}]
[<b>${uiLabelMap.WebtoolsMaxMemory}:</b> ${maxMemory}]</span></div>
<div> </div>
<#if cacheList?has_content>
- <#assign rowClass='viewManyTR1'>
- <table cellpadding="2" cellspacing="0" border="1" width="100%"
class="boxoutside">
- <tr>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsCacheName}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.WebtoolsSize}</div></td>
- <td><div class="tableheadtext">${uiLabelMap.WebtoolsHits}</div></td>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsMisses}</div></td>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsRemoves}</div></td>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsMaxSize}</div></td>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsExpireTime}</div></td>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsUseSoftRef}</div></td>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsUseFileStore}</div></td>
- <td colspan="3"><div
class="tableheadtext">${uiLabelMap.WebtoolsAdministration}</div></td>
- </tr>
- <#list cacheList as cache>
- <tr class='${rowClass}'>
- <td><div class="tabletext">${cache.cacheName?if_exists}</div></td>
- <td><div class="tabletext">${cache.cacheSize?if_exists}</div></td>
- <td><div class="tabletext">${cache.hitCount?if_exists}</div></td>
- <td><div
class="tabletext">${cache.missCountTot?if_exists}/${cache.missCountNotFound?if_exists}/${cache.missCountExpired?if_exists}/${cache.missCountSoftRef?if_exists}</div></td>
- <td><div
class="tabletext">${cache.removeHitCount?if_exists}/${cache.removeMissCount?if_exists}</div></td>
- <td><div class="tabletext">${cache.maxSize?if_exists}</div></td>
- <td><div class="tabletext">${cache.expireTime?if_exists}</div></td>
- <td><div
class="tabletext">${cache.useSoftReference?if_exists}</div></td>
- <td><div
class="tabletext">${cache.useFileSystemStore?if_exists}</div></td>
- <td align="center" valign=middle>
- <a
href="<@ofbizUrl>FindUtilCacheElements?UTIL_CACHE_NAME=${cache.cacheName?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.WebtoolsElements}</a>
- </td>
- <td align="center" valign=middle>
- <#if hasUtilCacheEdit>
- <a
href="<@ofbizUrl>EditUtilCache?UTIL_CACHE_NAME=${cache.cacheName?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonEdit}</a>
- </#if>
- </td>
- <td align="center" valign=middle>
- <#if hasUtilCacheEdit>
- <a
href="<@ofbizUrl>FindUtilCacheClear?UTIL_CACHE_NAME=${cache.cacheName?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonClear}</a>
- </#if>
- </td>
- </tr>
- <#if rowClass=='viewManyTR1'>
- <#assign rowClass='viewManyTR2'>
- <#else>
- <#assign rowClass='viewManyTR1'>
- </#if>
- </#list>
- </table>
+ <#assign rowClass='viewManyTR1'>
+ <table cellpadding="2" cellspacing="0" border="1" width="100%"
class="boxoutside">
+ <tr>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsCacheName}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsSize}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsHits}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsMisses}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsRemoves}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.WebtoolsMaxSize}</div></td>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsExpireTime}</div></td>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsUseSoftRef}</div></td>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsUseFileStore}</div></td>
+ <td colspan="3"><div
class="tableheadtext">${uiLabelMap.WebtoolsAdministration}</div></td>
+ </tr>
+ <#list cacheList as cache>
+ <tr class='${rowClass}'>
+ <td><div class="tabletext">${cache.cacheName?if_exists}</div></td>
+ <td><div class="tabletext">${cache.cacheSize?if_exists}</div></td>
+ <td><div class="tabletext">${cache.hitCount?if_exists}</div></td>
+ <td><div
class="tabletext">${cache.missCountTot?if_exists}/${cache.missCountNotFound?if_exists}/${cache.missCountExpired?if_exists}/${cache.missCountSoftRef?if_exists}</div></td>
+ <td><div
class="tabletext">${cache.removeHitCount?if_exists}/${cache.removeMissCount?if_exists}</div></td>
+ <td><div class="tabletext">${cache.maxSize?if_exists}</div></td>
+ <td><div class="tabletext">${cache.expireTime?if_exists}</div></td>
+ <td><div
class="tabletext">${cache.useSoftReference?if_exists}</div></td>
+ <td><div
class="tabletext">${cache.useFileSystemStore?if_exists}</div></td>
+ <td align="center" valign=middle>
+ <a
href="<@ofbizUrl>FindUtilCacheElements?UTIL_CACHE_NAME=${cache.cacheName?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.WebtoolsElements}</a>
+ </td>
+ <td align="center" valign=middle>
+ <#if hasUtilCacheEdit>
+ <a
href="<@ofbizUrl>EditUtilCache?UTIL_CACHE_NAME=${cache.cacheName?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonEdit}</a>
+ </#if>
+ </td>
+ <td align="center" valign=middle>
+ <#if hasUtilCacheEdit>
+ <a
href="<@ofbizUrl>FindUtilCacheClear?UTIL_CACHE_NAME=${cache.cacheName?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonClear}</a>
+ </#if>
+ </td>
+ </tr>
+ <#if rowClass=='viewManyTR1'>
+ <#assign rowClass='viewManyTR2'>
+ <#else>
+ <#assign rowClass='viewManyTR1'>
+ </#if>
+ </#list>
+ </table>
<#else>
- <div width="100%">
- ${uiLabelMap.WebtoolsNoUtilCacheFound}
- </div>
+ <div width="100%">
+ ${uiLabelMap.WebtoolsNoUtilCacheFound}
+ </div>
</#if>
<div width="100%">
<a href="<@ofbizUrl>FindUtilCache</@ofbizUrl>"
class="buttontext">${uiLabelMap.WebtoolsReloadCacheList}</a>
Modified:
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl?view=diff&rev=469812&r1=469811&r2=469812
==============================================================================
---
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
(original)
+++
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
Wed Nov 1 00:11:24 2006
@@ -23,42 +23,42 @@
</div>
<div> </div>
<#if cacheName?has_content>
- <#if cacheElementsList?has_content>
- <#assign rowClass='viewManyTR1'>
- <table cellpadding="2" cellspacing="0" border="1" width="50%"
class="boxoutside">
- <tr>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsCacheElementKey}</div></td>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsExpireTime}</div></td>
- <td><div
class="tableheadtext">${uiLabelMap.WebtoolsBytes}</div></td>
- <td><div class="tableheadtext"> </div></td>
- </tr>
- <#list cacheElementsList as cacheElement>
- <tr class='${rowClass}'>
- <td><div
class="tabletext">${cacheElement.elementKey?if_exists}</div></td>
- <td><div
class="tabletext">${cacheElement.expireTime?if_exists}</div></td>
- <td><div
class="tabletext">${cacheElement.lineSize?if_exists}</div></td>
- <td align="center" valign=middle>
- <#if hasUtilCacheEdit>
- <a
href="<@ofbizUrl>FindUtilCacheElementsRemoveElement?UTIL_CACHE_NAME=${cacheName?if_exists}&UTIL_CACHE_ELEMENT_NUMBER=${cacheElement.keyNum?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonRemove}</a>
- </#if>
- </td>
- </tr>
- <#if rowClass=='viewManyTR1'>
- <#assign rowClass='viewManyTR2'>
- <#else>
- <#assign rowClass='viewManyTR1'>
- </#if>
- </#list>
- </table>
- <#else>
- <div width="100%">
- ${uiLabelMap.WebtoolsNoUtilCacheElementsFound}
- </div>
- </#if>
+ <#if cacheElementsList?has_content>
+ <#assign rowClass='viewManyTR1'>
+ <table cellpadding="2" cellspacing="0" border="1" width="50%"
class="boxoutside">
+ <tr>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsCacheElementKey}</div></td>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsExpireTime}</div></td>
+ <td><div
class="tableheadtext">${uiLabelMap.WebtoolsBytes}</div></td>
+ <td><div class="tableheadtext"> </div></td>
+ </tr>
+ <#list cacheElementsList as cacheElement>
+ <tr class='${rowClass}'>
+ <td><div
class="tabletext">${cacheElement.elementKey?if_exists}</div></td>
+ <td><div
class="tabletext">${cacheElement.expireTime?if_exists}</div></td>
+ <td><div
class="tabletext">${cacheElement.lineSize?if_exists}</div></td>
+ <td align="center" valign=middle>
+ <#if hasUtilCacheEdit>
+ <a
href="<@ofbizUrl>FindUtilCacheElementsRemoveElement?UTIL_CACHE_NAME=${cacheName?if_exists}&UTIL_CACHE_ELEMENT_NUMBER=${cacheElement.keyNum?if_exists}</@ofbizUrl>"
class="buttontext">${uiLabelMap.CommonRemove}</a>
+ </#if>
+ </td>
+ </tr>
+ <#if rowClass=='viewManyTR1'>
+ <#assign rowClass='viewManyTR2'>
+ <#else>
+ <#assign rowClass='viewManyTR1'>
+ </#if>
+ </#list>
+ </table>
+ <#else>
+ <div width="100%">
+ ${uiLabelMap.WebtoolsNoUtilCacheElementsFound}
+ </div>
+ </#if>
<#else>
- <div width="100%">
- ${uiLabelMap.WebtoolsNoUtilCacheSpecified}
- </div>
+ <div width="100%">
+ ${uiLabelMap.WebtoolsNoUtilCacheSpecified}
+ </div>
</#if>
<div> </div>
<div class="tabletext">${uiLabelMap.WebtoolsSizeTotal}: ${totalSize}
${uiLabelMap.WebtoolsBytes}</div>
Modified: incubator/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml?view=diff&rev=469812&r1=469811&r2=469812
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml (original)
+++ incubator/ofbiz/trunk/framework/webtools/widget/CacheScreens.xml Wed Nov 1
00:11:24 2006
@@ -26,23 +26,23 @@
</actions>
<widgets>
<decorator-screen name="CommonWebtoolsDecorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <!-- do check for UTIL_CACHE, _VIEW permission -->
- <condition>
- <if-has-permission permission="UTIL_CACHE" action="_VIEW"/>
- </condition>
- <widgets>
- <platform-specific>
- <html><html-template
location="component://webtools/webapp/webtools/cache/findUtilCache.ftl"/></html>
- </platform-specific>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label
style="head3">${uiLabelMap.WebtoolsPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <!-- do check for UTIL_CACHE, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="UTIL_CACHE" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <platform-specific>
+ <html><html-template
location="component://webtools/webapp/webtools/cache/findUtilCache.ftl"/></html>
+ </platform-specific>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label
style="head3">${uiLabelMap.WebtoolsPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
</decorator-screen>
</widgets>
</section>
@@ -56,23 +56,23 @@
</actions>
<widgets>
<decorator-screen name="CommonWebtoolsDecorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <!-- do check for UTIL_CACHE, _VIEW permission -->
- <condition>
- <if-has-permission permission="UTIL_CACHE" action="_VIEW"/>
- </condition>
- <widgets>
- <platform-specific>
- <html><html-template
location="component://webtools/webapp/webtools/cache/findUtilCacheElements.ftl"/></html>
- </platform-specific>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label
style="head3">${uiLabelMap.WebtoolsPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <!-- do check for UTIL_CACHE, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="UTIL_CACHE" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <platform-specific>
+ <html><html-template
location="component://webtools/webapp/webtools/cache/findUtilCacheElements.ftl"/></html>
+ </platform-specific>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label
style="head3">${uiLabelMap.WebtoolsPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
</decorator-screen>
</widgets>
</section>
@@ -86,23 +86,23 @@
</actions>
<widgets>
<decorator-screen name="CommonWebtoolsDecorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <!-- do check for UTIL_CACHE, _EDIT permission -->
- <condition>
- <if-has-permission permission="UTIL_CACHE" action="_EDIT"/>
- </condition>
- <widgets>
- <platform-specific>
- <html><html-template
location="component://webtools/webapp/webtools/cache/editUtilCache.ftl"/></html>
- </platform-specific>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label
style="head3">${uiLabelMap.WebtoolsPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <!-- do check for UTIL_CACHE, _EDIT permission -->
+ <condition>
+ <if-has-permission permission="UTIL_CACHE" action="_EDIT"/>
+ </condition>
+ <widgets>
+ <platform-specific>
+ <html><html-template
location="component://webtools/webapp/webtools/cache/editUtilCache.ftl"/></html>
+ </platform-specific>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label
style="head3">${uiLabelMap.WebtoolsPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
</decorator-screen>
</widgets>
</section>
