[exo-jcr-commits] exo-jcr SVN: r4389 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr: impl/dataflow/persistent/infinispan and 1 other directories.

[do-not-reply at jboss.org]

Author: nfilotto
Date: 2011-05-18 10:12:54 -0400 (Wed, 18 May 2011)
New Revision: 4389

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/WorkspaceStorageCache.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
Log:
EXOJCR-1351: Allow to manage the JCR Cache from JMX
getSize, isEnabled and clean are now available through JMX

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/WorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/WorkspaceStorageCache.java	2011-05-18 05:08:48 UTC (rev 4388)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/WorkspaceStorageCache.java	2011-05-18 14:12:54 UTC (rev 4389)
@@ -18,6 +18,10 @@
  */
 package org.exoplatform.services.jcr.dataflow.persistent;
 
+import org.exoplatform.management.annotations.Managed;
+import org.exoplatform.management.annotations.ManagedDescription;
+import org.exoplatform.management.jmx.annotations.NameTemplate;
+import org.exoplatform.management.jmx.annotations.Property;
 import org.exoplatform.services.jcr.datamodel.ItemData;
 import org.exoplatform.services.jcr.datamodel.ItemType;
 import org.exoplatform.services.jcr.datamodel.NodeData;
@@ -34,6 +38,8 @@
  * @author <a href="mailto:geaz at users.sourceforge.net">Gennady Azarenkov</a>
  * @version $Id: WorkspaceStorageCache.java 13869 2008-05-05 08:40:10Z pnedonosko $
  */
+ at Managed
+ at NameTemplate(@Property(key = "service", value = "Cache"))
 public interface WorkspaceStorageCache extends MandatoryItemsPersistenceListener
 {
 
@@ -172,6 +178,8 @@
     * 
     * @return enabled status flag, if true then cache is enabled
     */
+   @Managed
+   @ManagedDescription("Indicates whether the cache is enabled or not")   
    boolean isEnabled();
 
    /**
@@ -179,6 +187,8 @@
     * 
     * @return long value
     */
+   @Managed
+   @ManagedDescription("Indicates the total amount of items into the cache")   
    long getSize();
 
    /**

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java	2011-05-18 05:08:48 UTC (rev 4388)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java	2011-05-18 14:12:54 UTC (rev 4389)
@@ -20,6 +20,8 @@
 
 import org.exoplatform.commons.utils.SecurityHelper;
 import org.exoplatform.container.configuration.ConfigurationManager;
+import org.exoplatform.management.annotations.Managed;
+import org.exoplatform.management.annotations.ManagedDescription;
 import org.exoplatform.services.jcr.access.AccessControlList;
 import org.exoplatform.services.jcr.config.CacheEntry;
 import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
@@ -1179,6 +1181,8 @@
    /**
     * {@inheritDoc}
     */
+   @Managed
+   @ManagedDescription("Remove all the existing items from the cache")   
    public void clean() throws BackupException
    {
       if (cache.getStatus() == ComponentStatus.RUNNING)

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java	2011-05-18 05:08:48 UTC (rev 4388)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java	2011-05-18 14:12:54 UTC (rev 4389)
@@ -19,6 +19,8 @@
 package org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache;
 
 import org.exoplatform.container.configuration.ConfigurationManager;
+import org.exoplatform.management.annotations.Managed;
+import org.exoplatform.management.annotations.ManagedDescription;
 import org.exoplatform.services.jcr.access.AccessControlList;
 import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
 import org.exoplatform.services.jcr.config.WorkspaceEntry;
@@ -52,8 +54,8 @@
 import org.jboss.cache.CacheStatus;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Node;
+import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.config.EvictionRegionConfig;
-import org.jboss.cache.config.Configuration.CacheMode;
 import org.jboss.cache.eviction.ExpirationAlgorithmConfig;
 import org.picocontainer.Startable;
 
@@ -1581,6 +1583,8 @@
    /**
     * {@inheritDoc}
     */
+   @Managed
+   @ManagedDescription("Remove all the existing items from the cache")   
    public void clean() throws BackupException
    {
       cleanCache();