svn commit: r1669989 - in /jackrabbit/oak/trunk: oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/ oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/ oak-core/src/main/java/org/apache/jackrabbit/oak/management/

[chetanm]

Author: chetanm
Date: Mon Mar 30 04:58:06 2015
New Revision: 1669989

URL: http://svn.apache.org/r1669989
Log:
OAK-2692 - Add description annotation to 
RepositoryManagementMBean#startDataStoreGC

-- Changed AnnotatedStandardMBean to use a different support constructor to 
avoid handling on NotCompliantMBeanException
-- Added Name and Description annotation

Modified:
    
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBean.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java

Modified: 
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBean.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBean.java?rev=1669989&r1=1669988&r2=1669989&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBean.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/jmx/AnnotatedStandardMBean.java
 Mon Mar 30 04:58:06 2015
@@ -23,7 +23,6 @@ import javax.management.MBeanAttributeIn
 import javax.management.MBeanInfo;
 import javax.management.MBeanOperationInfo;
 import javax.management.MBeanParameterInfo;
-import javax.management.NotCompliantMBeanException;
 import javax.management.StandardMBean;
 
 /**
@@ -42,14 +41,12 @@ public class AnnotatedStandardMBean exte
      *
      * @see {@link javax.management.StandardMBean#StandardMBean(Object, Class)}
      */
-    public <T> AnnotatedStandardMBean(T implementation, Class<T> 
mbeanInterface)
-            throws NotCompliantMBeanException {
-        super(implementation, mbeanInterface);
+    public <T> AnnotatedStandardMBean(T implementation, Class<T> 
mbeanInterface){
+        super(implementation, mbeanInterface, false);
     }
 
-    protected AnnotatedStandardMBean(Class<?> mbeanInterface)
-            throws NotCompliantMBeanException {
-        super(mbeanInterface);
+    protected AnnotatedStandardMBean(Class<?> mbeanInterface){
+        super(mbeanInterface, false);
     }
 
     @Override

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java?rev=1669989&r1=1669988&r2=1669989&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java
 Mon Mar 30 04:58:06 2015
@@ -23,6 +23,9 @@ import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import javax.management.openmbean.CompositeData;
 
+import org.apache.jackrabbit.oak.commons.jmx.Description;
+import org.apache.jackrabbit.oak.commons.jmx.Name;
+
 /**
  * This interface exposes repository management operations and the status
  * of such operations. This interface only provides high level functionality
@@ -134,7 +137,11 @@ public interface RepositoryManagementMBe
      * @return  the status of the operation right after it was initiated
      */
     @Nonnull
-    CompositeData startDataStoreGC(boolean markOnly);
+    CompositeData startDataStoreGC(@Name("markOnly")
+            @Description("Set to true to only mark references and not sweep in 
the mark and sweep operation. " +
+                    "This mode is to be used when the underlying BlobStore is 
shared between multiple " +
+                    "different repositories. For all other cases set it to 
false to perform full garbage collection")
+                                   boolean markOnly);
 
     /**
      * Data store garbage collection status

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java?rev=1669989&r1=1669988&r2=1669989&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java
 Mon Mar 30 04:58:06 2015
@@ -33,6 +33,7 @@ import javax.management.openmbean.Compos
 
 import com.google.common.base.Function;
 import org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean;
+import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean;
 import org.apache.jackrabbit.oak.plugins.backup.FileStoreBackupRestoreMBean;
 import org.apache.jackrabbit.oak.plugins.blob.BlobGCMBean;
 import 
org.apache.jackrabbit.oak.plugins.index.property.jmx.PropertyIndexAsyncReindexMBean;
@@ -47,10 +48,11 @@ import org.apache.jackrabbit.oak.spi.whi
  * garbage collections ({@link BlobGCMBean}) and revision store garbage
  * collections ({@link RevisionGCMBean}).
  */
-public class RepositoryManager implements RepositoryManagementMBean {
+public class RepositoryManager extends AnnotatedStandardMBean implements 
RepositoryManagementMBean {
     private final Whiteboard whiteboard;
 
     public RepositoryManager(@Nonnull Whiteboard whiteboard) {
+        super(RepositoryManagementMBean.class);
         this.whiteboard = checkNotNull(whiteboard);
     }