Author: shuber
Date: Wed Oct 17 14:59:36 2007
New Revision: 18899
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18899&repname=
=3Djahia
Log:
Add display of total number of keys in all groups for a cache.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/Cac=
he.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/Cac=
heImplementation.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/clu=
sterservice/ClusterServiceCacheImpl.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/clu=
sterservice/batch/BatchingClusterServiceCacheImpl.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/ehc=
ache/EhCacheImpl.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/jms=
/JMSCacheImpl.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/osc=
ache/OSCacheImpl.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/ref=
erence/ReferenceCacheImpl.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/sim=
ple/SimpleCacheImpl.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/tre=
ecache/TreeCacheImpl.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
tatus.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources.properties&rev=3D18=
899&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties Wed Oct 17 14:59:36 2007
@@ -715,6 +715,7 @@
org.jahia.admin.status.ManageStatus.flushLocks.label =3D Flush content obj=
ect locks
org.jahia.admin.status.ManageStatus.flush.label =3D Flush
org.jahia.admin.status.ManageStatus.freeMemory.label =3D Free Memory
+org.jahia.admin.status.ManageStatus.groupsKeysTotal.label=3DTotal keys in =
all groups
org.jahia.admin.status.ManageStatus.groupSize.label =3D Number of groups
org.jahia.admin.status.ManageStatus.htmlCacheSize.label =3D HTML cache si=
ze
org.jahia.admin.status.ManageStatus.kB.label =3D KB
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_en.properties&rev=
=3D18899&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties Wed Oct 17 14:59:36 2007
@@ -715,6 +715,7 @@
org.jahia.admin.status.ManageStatus.flushLocks.label =3D Flush content obj=
ect locks
org.jahia.admin.status.ManageStatus.flush.label =3D Flush
org.jahia.admin.status.ManageStatus.freeMemory.label =3D Free Memory
+org.jahia.admin.status.ManageStatus.groupsKeysTotal.label=3DTotal keys in =
all groups
org.jahia.admin.status.ManageStatus.groupSize.label=3DNumber of groups
org.jahia.admin.status.ManageStatus.htmlCacheSize.label =3D HTML cache si=
ze
org.jahia.admin.status.ManageStatus.kB.label =3D KB
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_fr.properties&rev=
=3D18899&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties Wed Oct 17 14:59:36 2007
@@ -881,6 +881,7 @@
org.jahia.admin.status.ManageStatus.flushAllCaches.label =3D Purger tous l=
es caches
org.jahia.admin.status.ManageStatus.flushLocks.label =3D Purger les verrou=
s d'objets de contenu
org.jahia.admin.status.ManageStatus.freeMemory.label =3D M=C3=A9moire lib=
re
+org.jahia.admin.status.ManageStatus.groupsKeysTotal.label=3DTotal des cl=
=C3=A9s dans tous les groupes
org.jahia.admin.status.ManageStatus.groupSize.label =3D Nombre de groupes
org.jahia.admin.status.ManageStatus.htmlCacheSize.label =3D Taille du cach=
e HTML
org.jahia.admin.status.ManageStatus.kB.label =3D Ko
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cac=
he/Cache.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/cache/Cache.java&rev=3D18899&repna=
me=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/Cac=
he.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/Cac=
he.java Wed Oct 17 14:59:36 2007
@@ -308,6 +308,15 @@
return cacheImplementation.getGroupsSize();
}
=
+ /**
+ * Get the total number of keys in all the groups of this cache. This =
is
+ * an approximate value as it is not cached.
+ * @return a long representing the number of keys in all the groups.
+ */
+ final public long getGroupsKeysTotal() {
+ return cacheImplementation.getGroupsKeysTotal();
+ }
+
=
/** <p>Returns the maximum size allowed for the cache.</p>
*
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cac=
he/CacheImplementation.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/cache/CacheImplementation.java&rev=
=3D18899&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/Cac=
heImplementation.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/Cac=
heImplementation.java Wed Oct 17 14:59:36 2007
@@ -48,6 +48,13 @@
*/
public long getGroupsSize();
=
+ /**
+ * Get the total number of keys in all the groups of this cache. This =
is
+ * an approximate value as it is not cached.
+ * @return a long representing the number of keys in all the groups.
+ */ =
+ public long getGroupsKeysTotal();
+
void flushAll(boolean propagate);
=
void flushGroup(String groupName);
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cac=
he/clusterservice/ClusterServiceCacheImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/cache/clusterservice/ClusterServic=
eCacheImpl.java&rev=3D18899&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/clu=
sterservice/ClusterServiceCacheImpl.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/clu=
sterservice/ClusterServiceCacheImpl.java Wed Oct 17 14:59:36 2007
@@ -159,4 +159,8 @@
return underlyingCacheImplementation.getGroupsSize();
}
=
+ public long getGroupsKeysTotal() {
+ return underlyingCacheImplementation.getGroupsKeysTotal();
+ }
+ =
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cac=
he/clusterservice/batch/BatchingClusterServiceCacheImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/cache/clusterservice/batch/Batchin=
gClusterServiceCacheImpl.java&rev=3D18899&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/clu=
sterservice/batch/BatchingClusterServiceCacheImpl.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/clu=
sterservice/batch/BatchingClusterServiceCacheImpl.java Wed Oct 17 14:59:36 =
2007
@@ -157,5 +157,9 @@
public long getGroupsSize() {
return underlyingCacheImplementation.getGroupsSize();
}
- =
+
+ public long getGroupsKeysTotal() {
+ return underlyingCacheImplementation.getGroupsKeysTotal();
+ }
+
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cac=
he/ehcache/EhCacheImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/cache/ehcache/EhCacheImpl.java&rev=
=3D18899&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/ehc=
ache/EhCacheImpl.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/ehc=
ache/EhCacheImpl.java Wed Oct 17 14:59:36 2007
@@ -10,6 +10,7 @@
import java.util.Set;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.Map;
=
/**
* Created by IntelliJ IDEA.
@@ -74,6 +75,18 @@
return ehCacheGroups.getSize();
}
=
+ public long getGroupsKeysTotal() {
+ long totalSize =3D 0;
+ Iterator groupIterator =3D ehCacheGroups.getKeysWithExpiryCheck().=
iterator();
+ while (groupIterator.hasNext()) {
+ Object key =3D groupIterator.next();
+ Element keySetElement =3D ehCacheGroups.get(key);
+ Set keySet =3D (Set) keySetElement.getValue();
+ totalSize +=3D keySet.size(); =
+ }
+ return totalSize;
+ }
+
public void flushAll(boolean propagate) {
ehCache.removeAll();
ehCacheGroups.removeAll();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cac=
he/jms/JMSCacheImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/cache/jms/JMSCacheImpl.java&rev=3D=
18899&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/jms=
/JMSCacheImpl.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/jms=
/JMSCacheImpl.java Wed Oct 17 14:59:36 2007
@@ -235,13 +235,21 @@
}
=
/**
- * Not supported.
+ * Not supported by this cache implementation.
* @return
*/
public long getGroupsSize() {
return -1;
}
=
+ /**
+ * Not supported by this cache implementation.
+ * @return
+ */
+ public long getGroupsKeysTotal() {
+ return -1;
+ }
+
public void flushAll(boolean propagate) {
synchronized (this) {
// clears the cache
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cac=
he/oscache/OSCacheImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/cache/oscache/OSCacheImpl.java&rev=
=3D18899&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/osc=
ache/OSCacheImpl.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/osc=
ache/OSCacheImpl.java Wed Oct 17 14:59:36 2007
@@ -93,13 +93,21 @@
}
=
/**
- * Not supported.
+ * Not supported by this cache implementation.
* @return
*/
public long getGroupsSize() {
return -1;
}
=
+ /**
+ * Not supported by this cache implementation.
+ * @return
+ */
+ public long getGroupsKeysTotal() {
+ return -1;
+ }
+
public void flushAll(boolean propagate) {
cache.flushGroup(name);
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cac=
he/reference/ReferenceCacheImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/cache/reference/ReferenceCacheImpl=
.java&rev=3D18899&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/ref=
erence/ReferenceCacheImpl.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/ref=
erence/ReferenceCacheImpl.java Wed Oct 17 14:59:36 2007
@@ -177,6 +177,17 @@
return groups.size();
}
=
+ public long getGroupsKeysTotal() {
+ long totalSize =3D 0;
+ Iterator groupIterator =3D groups.entrySet().iterator();
+ while (groupIterator.hasNext()) {
+ Map.Entry curEntry =3D (Map.Entry) groupIterator.next();
+ Set keySet =3D (Set) curEntry.getValue();
+ totalSize +=3D keySet.size();
+ }
+ return totalSize;
+ }
+
public void flushAll(boolean propagate) {
try {
writeLock.acquire();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cac=
he/simple/SimpleCacheImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/cache/simple/SimpleCacheImpl.java&=
rev=3D18899&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/sim=
ple/SimpleCacheImpl.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/sim=
ple/SimpleCacheImpl.java Wed Oct 17 14:59:36 2007
@@ -121,6 +121,17 @@
return groups.size();
}
=
+ public long getGroupsKeysTotal() {
+ long totalSize =3D 0;
+ Iterator groupIterator =3D groups.entrySet().iterator();
+ while (groupIterator.hasNext()) {
+ Map.Entry curEntry =3D (Map.Entry) groupIterator.next();
+ Set keySet =3D (Set) curEntry.getValue();
+ totalSize +=3D keySet.size(); =
+ }
+ return totalSize;
+ }
+
public void flushAll(boolean propagate) {
Collection c =3D new ArrayList(lruEntries.values());
synchronized(cache) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cac=
he/treecache/TreeCacheImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/cache/treecache/TreeCacheImpl.java=
&rev=3D18899&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/tre=
ecache/TreeCacheImpl.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/cache/tre=
ecache/TreeCacheImpl.java Wed Oct 17 14:59:36 2007
@@ -17,10 +17,7 @@
*/
package org.jahia.services.cache.treecache;
=
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
=
import org.apache.log4j.Logger;
import org.jahia.services.cache.CacheEntry;
@@ -329,6 +326,14 @@
return size;
}
=
+ /**
+ * Not yet implemented for JBossCache.
+ * @return
+ */
+ public long getGroupsKeysTotal() {
+ return -1;
+ }
+
public long getCacheLimit() {
int cacheLimit =3D -1;
/*
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/status.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/status.jsp&rev=3D18899&rep=
name=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
tatus.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
tatus.jsp Wed Oct 17 14:59:36 2007
@@ -204,14 +204,18 @@
} else {
%><jahia:adminResourceBundle resourceName=3D"org.jahia.admin.e=
ntrie.label"/><%
} %>
+
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.admin=
.status.ManageStatus.groupSize.label"/> :
+ <%=3DcurCache.getGroupsSize()%>
+
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.admin=
.status.ManageStatus.groupsKeysTotal.label"/> :
+ <%=3DcurCache.getGroupsKeysTotal()%>
<br>
<jahia:adminResourceBundle resourceName=3D"org.jahia.admin=
.status.ManageStatus.successfulHits.label"/> :
<%=3DcurCache.getSuccessHits()%> / <%=3DcurCache.getTotalH=
its()%>
<jahia:adminResourceBundle resourceName=3D"org.jahia.admin=
.status.ManageStatus.totalHits.label"/>,
<jahia:adminResourceBundle resourceName=3D"org.jahia.admin=
.status.ManageStatus.efficiency.label"/> :
<%=3DefficiencyStr%> %
- <jahia:adminResourceBundle resourceName=3D"org.jahia.admin=
.status.ManageStatus.groupSize.label"/> :
- <%=3DcurCache.getGroupsSize()%>
</td>
<td>
<input type=3D"submit" name=3D"flush_<%=3DcurCache.getName=
()%>" value=3D"<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.s=
tatus.ManageStatus.flush.label"/>">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
