From 107c878d82aef64a0be0e67a701fc9ddd1f43780 Thu, 23 Apr 2015 13:12:55 +0300
From: Robert Munteanu <rombert@apache.org>
Date: Thu, 23 Apr 2015 13:12:36 +0300
Subject: [PATCH] OAK-2805 - oak-run: register JMX beans 


diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
index af51216..1e10e5c 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.oak.fixture;
 
 import java.io.File;
+import java.lang.management.ManagementFactory;
 
 import javax.sql.DataSource;
 
@@ -34,6 +35,7 @@
 import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
 import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
 import org.apache.jackrabbit.oak.spi.blob.BlobStore;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
 
 public abstract class OakFixture {
 
@@ -87,7 +89,7 @@
             @Override
             public Oak getOak(int clusterId) throws Exception {
                 Oak oak;
-                oak = new Oak(new MemoryNodeStore());
+                oak = newOak(new MemoryNodeStore());
                 return oak;
             }
 
@@ -96,7 +98,7 @@
                 Oak[] cluster = new Oak[n];
                 for (int i = 0; i < cluster.length; i++) {
                     Oak oak;
-                    oak = new Oak(new MemoryNodeStore());
+                    oak = newOak(new MemoryNodeStore());
                     cluster[i] = oak;
                 }
                 return cluster;
@@ -161,7 +163,7 @@
                         setLogging(false);
                 setupBlobStore(mkBuilder);
                 DocumentMK dmk = mkBuilder.open();
-                return new Oak(dmk.getNodeStore());
+                return newOak(dmk.getNodeStore());
             }
 
             @Override
@@ -178,7 +180,7 @@
                             setLogging(false);
                     setupBlobStore(mkBuilder);
                     kernels[i] = mkBuilder.open();
-                    cluster[i] = new Oak(kernels[i].getNodeStore());
+                    cluster[i] = newOak(kernels[i].getNodeStore());
                 }
                 return cluster;
             }
@@ -243,7 +245,7 @@
                     mkBuilder.setBlobStore(blobStore);
                 }
                 DocumentMK dmk = mkBuilder.open();
-                return new Oak(dmk.getNodeStore());
+                return newOak(dmk.getNodeStore());
             }
 
             @Override
@@ -260,7 +262,7 @@
                         mkBuilder.setBlobStore(blobStore);
                     }
                     kernels[i] = mkBuilder.open();
-                    cluster[i] = new Oak(kernels[i].getNodeStore());
+                    cluster[i] = newOak(kernels[i].getNodeStore());
                 }
                 return cluster;
             }
@@ -311,7 +313,7 @@
         @Override
         public Oak getOak(int clusterId) throws Exception {
             FileStore fs = new FileStore(base, maxFileSizeMB, cacheSizeMB, memoryMapping);
-            return new Oak(new SegmentNodeStore(fs));
+            return newOak(new SegmentNodeStore(fs));
         }
 
         @Override
@@ -333,7 +335,7 @@
                         new File(base, unique),
                         EmptyNodeState.EMPTY_NODE,
                         maxFileSizeMB, cacheSizeMB, memoryMapping);
-                cluster[i] = new Oak(new SegmentNodeStore(stores[i]));
+                cluster[i] = newOak(new SegmentNodeStore(stores[i]));
             }
             return cluster;
         }
@@ -357,5 +359,9 @@
             return stores;
         }
     }
+    
+    private static Oak newOak(NodeStore nodeStore) {
+    	return new Oak(nodeStore).with(ManagementFactory.getPlatformMBeanServer());
+    }    
 
 }
\ No newline at end of file