geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dschnei...@apache.org
Subject [29/51] [abbrv] geode git commit: GEODE-2632: refactor code to use InternalCache and InternalResourceManager
Date Fri, 21 Apr 2017 23:42:25 GMT
GEODE-2632: refactor code to use InternalCache and InternalResourceManager

* add operations to InternalCache interface
* rename getter for InternalResourceManager getInternalResourceManager
* add @Override annotations
* fixup TODO comments
* delete superfluous comments and dead-code
* filed GEODE-2789 and will follow-up with fix for that ticket


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/11560117
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/11560117
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/11560117

Branch: refs/heads/feature/GEODE-2097
Commit: 1156011729834f9e4bcb3329112d622f04656be7
Parents: 43a4de8
Author: Kirk Lund <klund@apache.org>
Authored: Fri Apr 14 12:22:04 2017 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Mon Apr 17 13:45:34 2017 -0700

----------------------------------------------------------------------
 .../cache/partition/PartitionRegionHelper.java  |   4 +-
 .../internal/cache/AbstractLRURegionMap.java    |   2 +-
 .../geode/internal/cache/DistributedRegion.java |   2 +-
 .../geode/internal/cache/GemFireCacheImpl.java  | 251 +++++++++++------
 .../geode/internal/cache/InternalCache.java     | 140 +++++++++-
 .../geode/internal/cache/LocalRegion.java       |  22 +-
 .../internal/cache/PRHARedundancyProvider.java  |   5 +-
 .../geode/internal/cache/PartitionedRegion.java |  10 +-
 .../cache/control/RebalanceOperationImpl.java   |   8 +-
 .../internal/cache/control/ResourceAdvisor.java |   7 +-
 .../cache/execute/MemberFunctionExecutor.java   |   2 +-
 .../execute/MultiRegionFunctionExecutor.java    |   6 +-
 .../PartitionedRegionFunctionExecutor.java      |   4 +-
 .../cache/lru/HeapLRUCapacityController.java    |   4 +-
 .../PartitionedRegionRebalanceOp.java           |   2 +-
 .../internal/cache/xmlcache/CacheCreation.java  | 274 ++++++++++++++++++-
 .../internal/beans/MemberMBeanBridge.java       |   2 +-
 .../management/MemoryThresholdsDUnitTest.java   |  40 +--
 .../MemoryThresholdsOffHeapDUnitTest.java       |  16 +-
 .../management/ResourceManagerDUnitTest.java    |   2 +-
 ...esourceManagerWithQueryMonitorDUnitTest.java |   2 +-
 .../geode/internal/cache/EvictionTestBase.java  |   2 +-
 .../cache/OffHeapEvictionDUnitTest.java         |   5 +-
 .../PartitionedRegionEvictionDUnitTest.java     |   3 +-
 ...rtitionedRegionOffHeapEvictionDUnitTest.java |   2 +-
 .../cache/control/MemoryMonitorJUnitTest.java   |  68 +++--
 .../control/MemoryMonitorOffHeapJUnitTest.java  |  19 +-
 .../control/RebalanceOperationDUnitTest.java    |   8 +-
 .../bean/stats/MemberLevelStatsJUnitTest.java   |   4 +-
 .../geode/cache/lucene/EvictionDUnitTest.java   |   2 +-
 .../apache/geode/cache/util/AutoBalancer.java   |   4 +-
 .../util/AutoBalancerIntegrationJUnitTest.java  |  12 +-
 .../geode/cache/util/AutoBalancerJUnitTest.java |   6 +
 33 files changed, 709 insertions(+), 231 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionHelper.java b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionHelper.java
index 6b52e1c..bf79edb 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRegionHelper.java
@@ -175,7 +175,7 @@ public final class PartitionRegionHelper {
       PartitionedRegion pr = isPartitionedCheck(region);
       GemFireCacheImpl cache = (GemFireCacheImpl) region.getCache();
       return pr.getRedundancyProvider().buildPartitionedRegionInfo(false,
-          cache.getResourceManager().getLoadProbe()); // may return null
+          cache.getInternalResourceManager().getLoadProbe()); // may return null
     } catch (ClassCastException e) {
       // not a PR so return null
     }
@@ -192,7 +192,7 @@ public final class PartitionRegionHelper {
     for (Iterator<PartitionedRegion> iter = prSet.iterator(); iter.hasNext();) {
       PartitionedRegion pr = iter.next();
       PartitionRegionInfo prDetails = pr.getRedundancyProvider()
-          .buildPartitionedRegionInfo(internal, cache.getResourceManager().getLoadProbe());
+          .buildPartitionedRegionInfo(internal, cache.getInternalResourceManager().getLoadProbe());
       if (prDetails != null) {
         prDetailsSet.add(prDetails);
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java
index 4d5bb87..a0e360f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java
@@ -572,7 +572,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
 
   private boolean mustEvict() {
     LocalRegion owner = _getOwner();
-    InternalResourceManager resourceManager = owner.getCache().getResourceManager();
+    InternalResourceManager resourceManager = owner.getCache().getInternalResourceManager();
     boolean offheap = owner.getAttributes().getOffHeap();
     return resourceManager.getMemoryMonitor(offheap).getState().isEviction() && this.sizeInVM() > 0;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
index 926f36d..68fdbeb 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
@@ -1193,7 +1193,7 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA
     // remote members
     if (!isInternalRegion()) {
       if (!this.isDestroyed) {
-        cache.getResourceManager().addResourceListener(ResourceType.MEMORY, this);
+        cache.getInternalResourceManager().addResourceListener(ResourceType.MEMORY, this);
       }
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index 59aeac4..8691814 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -67,6 +67,7 @@ import org.apache.geode.cache.client.PoolManager;
 import org.apache.geode.cache.client.internal.ClientMetadataService;
 import org.apache.geode.cache.client.internal.ClientRegionFactoryImpl;
 import org.apache.geode.cache.client.internal.PoolImpl;
+import org.apache.geode.cache.control.ResourceManager;
 import org.apache.geode.cache.execute.FunctionService;
 import org.apache.geode.cache.query.QueryService;
 import org.apache.geode.cache.query.internal.DefaultQuery;
@@ -228,10 +229,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.naming.Context;
 
-// @todo somebody Come up with more reasonable values for {@link #DEFAULT_LOCK_TIMEOUT}, etc.
+// TODO: somebody Come up with more reasonable values for {@link #DEFAULT_LOCK_TIMEOUT}, etc.
 /**
  * GemFire's implementation of a distributed {@link org.apache.geode.cache.Cache}.
- *
  */
 @SuppressWarnings("deprecation")
 public class GemFireCacheImpl
@@ -671,10 +671,6 @@ public class GemFireCacheImpl
     sb.append("; copyOnRead = " + this.copyOnRead);
     sb.append("; lockLease = " + this.lockLease);
     sb.append("; lockTimeout = " + this.lockTimeout);
-    // sb.append("; rootRegions = (" + this.rootRegions + ")");
-    // sb.append("; cacheServers = (" + this.cacheServers + ")");
-    // sb.append("; regionAttributes = (" + this.listRegionAttributes());
-    // sb.append("; gatewayHub = " + gatewayHub);
     if (this.creationStack != null) {
       sb.append("\nCreation context:\n");
       OutputStream os = new OutputStream() {
@@ -690,8 +686,6 @@ public class GemFireCacheImpl
     return sb.toString();
   }
 
-  // ////////////////////// Constructors /////////////////////////
-
   /** Map of Futures used to track Regions that are being reinitialized */
   private final ConcurrentMap reinitializingRegions = new ConcurrentHashMap();
 
@@ -892,8 +886,10 @@ public class GemFireCacheImpl
         final ThreadGroup group =
             LoggingThreadGroup.createThreadGroup("Message Event Threads", logger);
         ThreadFactory tf = new ThreadFactory() {
+          @Override
           public Thread newThread(final Runnable command) {
             final Runnable r = new Runnable() {
+              @Override
               public void run() {
                 ConnectionTable.threadWantsSharedResources();
                 command.run();
@@ -919,13 +915,14 @@ public class GemFireCacheImpl
       resourceManager = InternalResourceManager.createResourceManager(this);
       this.serialNumber = DistributionAdvisor.createSerialNumber();
 
-      getResourceManager().addResourceListener(ResourceType.HEAP_MEMORY, getHeapEvictor());
+      getInternalResourceManager().addResourceListener(ResourceType.HEAP_MEMORY, getHeapEvictor());
 
       /*
        * Only bother creating an off-heap evictor if we have off-heap memory enabled.
        */
       if (null != getOffHeapStore()) {
-        getResourceManager().addResourceListener(ResourceType.OFFHEAP_MEMORY, getOffHeapEvictor());
+        getInternalResourceManager().addResourceListener(ResourceType.OFFHEAP_MEMORY,
+            getOffHeapEvictor());
       }
 
       recordedEventSweeper = EventTracker.startTrackerServices(this);
@@ -1137,6 +1134,7 @@ public class GemFireCacheImpl
    * @return true if cache is created using a ClientCacheFactory
    * @see #hasPool()
    */
+  @Override
   public boolean isClient() {
     return this.isClient;
   }
@@ -1165,6 +1163,7 @@ public class GemFireCacheImpl
   /**
    * May return null (even on a client).
    */
+  @Override
   public Pool getDefaultPool() {
     return this.defaultPool;
   }
@@ -1348,6 +1347,7 @@ public class GemFireCacheImpl
   }
 
 
+  @Override
   public URL getCacheXmlURL() {
     if (this.getMyId().getVmKind() == DistributionManager.LOCATOR_DM_TYPE) {
       return null;
@@ -1520,6 +1520,7 @@ public class GemFireCacheImpl
    *
    * @since GemFire prPersistSprint2
    */
+  @Override
   public DiskStoreFactory createDiskStoreFactory() {
     return new DiskStoreFactoryImpl(this);
   }
@@ -1600,16 +1601,19 @@ public class GemFireCacheImpl
 
   private final Stopper stopper = new Stopper();
 
+  @Override
   public CancelCriterion getCancelCriterion() {
     return stopper;
   }
 
   /** return true if the cache was closed due to being shunned by other members */
+  @Override
   public boolean forcedDisconnect() {
     return this.forcedDisconnect || this.system.forcedDisconnect();
   }
 
   /** return a CacheClosedException with the given reason */
+  @Override
   public CacheClosedException getCacheClosedException(String reason, Throwable cause) {
     CacheClosedException result;
     if (cause != null) {
@@ -1639,6 +1643,7 @@ public class GemFireCacheImpl
    *
    * @since GemFire 5.7
    */
+  @Override
   public boolean keepDurableSubscriptionsAlive() {
     return this.keepAlive;
   }
@@ -1653,7 +1658,7 @@ public class GemFireCacheImpl
    *
    * @see SystemFailure#loadEmergencyClasses()
    */
-  static public void loadEmergencyClasses() {
+  public static void loadEmergencyClasses() {
     if (emergencyClassesLoaded)
       return;
     emergencyClassesLoaded = true;
@@ -1668,7 +1673,7 @@ public class GemFireCacheImpl
    *
    * @see SystemFailure#emergencyClose()
    */
-  static public void emergencyClose() {
+  public static void emergencyClose() {
     final boolean DEBUG = SystemFailure.TRACE_CLOSE;
 
     GemFireCacheImpl inst = GemFireCacheImpl.instance;
@@ -1735,6 +1740,7 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public boolean isCacheAtShutdownAll() {
     return isShutDownAll.get();
   }
@@ -1792,6 +1798,7 @@ public class GemFireCacheImpl
           ExecutorService es = getShutdownAllExecutorService(prTrees.size());
           for (final Map<String, PartitionedRegion> prSubMap : prTrees.values()) {
             es.execute(new Runnable() {
+              @Override
               public void run() {
                 ConnectionTable.threadWantsSharedResources();
                 shutdownSubTreeGracefully(prSubMap);
@@ -1824,6 +1831,7 @@ public class GemFireCacheImpl
     ThreadFactory thrFactory = new ThreadFactory() {
       private final AtomicInteger threadCount = new AtomicInteger(1);
 
+      @Override
       public Thread newThread(Runnable r) {
         Thread t = new Thread(thrGrp, r, "ShutdownAll-" + threadCount.getAndIncrement());
         t.setDaemon(true);
@@ -1979,6 +1987,7 @@ public class GemFireCacheImpl
     return persistMap;
   }
 
+  @Override
   public void close() {
     close(false);
   }
@@ -1987,6 +1996,7 @@ public class GemFireCacheImpl
     close(reason, null, keepalive, keepDS);
   }
 
+  @Override
   public void close(boolean keepalive) {
     close("Normal disconnect", null, keepalive, false);
   }
@@ -2001,7 +2011,8 @@ public class GemFireCacheImpl
    *
    * @return the PartitionedRegion distributed lock service
    */
-  protected DistributedLockService getPartitionedRegionLockService() {
+  @Override
+  public DistributedLockService getPartitionedRegionLockService() {
     synchronized (this.prLockServiceLock) {
       stopper.checkCancelInProgress(null);
       if (this.prLockService == null) {
@@ -2095,10 +2106,12 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public PersistentMemberManager getPersistentMemberManager() {
     return persistentMemberManager;
   }
 
+  @Override
   public ClientMetadataService getClientMetadataService() {
     synchronized (this.clientMetaDatServiceLock) {
       stopper.checkCancelInProgress(null);
@@ -2470,11 +2483,13 @@ public class GemFireCacheImpl
   }
 
   // see Cache.isReconnecting()
+  @Override
   public boolean isReconnecting() {
     return this.system.isReconnecting();
   }
 
   // see Cache.waitUntilReconnected(long, TimeUnit)
+  @Override
   public boolean waitUntilReconnected(long time, TimeUnit units) throws InterruptedException {
     boolean systemReconnected = this.system.waitUntilReconnected(time, units);
     if (!systemReconnected) {
@@ -2487,12 +2502,12 @@ public class GemFireCacheImpl
     return true;
   }
 
-  // see Cache.stopReconnecting()
+  @Override
   public void stopReconnecting() {
     this.system.stopReconnecting();
   }
 
-  // see Cache.getReconnectedCache()
+  @Override
   public Cache getReconnectedCache() {
     GemFireCacheImpl c = GemFireCacheImpl.getInstance();
     if (c == null) {
@@ -2633,6 +2648,7 @@ public class GemFireCacheImpl
 
   public static String DEFAULT_DS_NAME = DiskStoreFactory.DEFAULT_DISK_STORE_NAME;
 
+  @Override
   public DiskStoreImpl getOrCreateDefaultDiskStore() {
     DiskStoreImpl result = (DiskStoreImpl) findDiskStore(null);
     if (result == null) {
@@ -2651,6 +2667,7 @@ public class GemFireCacheImpl
    *
    * @since GemFire prPersistSprint2
    */
+  @Override
   public DiskStore findDiskStore(String name) {
     if (name == null) {
       name = DEFAULT_DS_NAME;
@@ -2663,14 +2680,12 @@ public class GemFireCacheImpl
    *
    * @since GemFire prPersistSprint2
    */
+  @Override
   public Collection<DiskStoreImpl> listDiskStores() {
     return Collections.unmodifiableCollection(this.diskStores.values());
   }
 
-  public Collection<DiskStoreImpl> listDiskStoresIncludingDefault() {
-    return Collections.unmodifiableCollection(listDiskStores());
-  }
-
+  @Override
   public Collection<DiskStoreImpl> listDiskStoresIncludingRegionOwned() {
     HashSet<DiskStoreImpl> allDiskStores = new HashSet<DiskStoreImpl>();
     allDiskStores.addAll(this.diskStores.values());
@@ -2697,17 +2712,6 @@ public class GemFireCacheImpl
     return false;
   }
 
-  /*
-   * private static class DiskStoreFuture extends FutureTask { private DiskStoreTask task;
-   * 
-   * public DiskStoreFuture(DiskStoreTask r) { super(r, null); this.task = r; }
-   * 
-   * @Override public boolean cancel(boolean mayInterruptIfRunning) { boolean result =
-   * super.cancel(mayInterruptIfRunning); if (result) { task.taskCancelled(); } return result; }
-   * 
-   * }
-   */
-
   private void stopDiskStoreTaskPool() {
     synchronized (this.diskStoreTaskSync) {
       this.diskStoreTaskSync.set(true);
@@ -2853,6 +2857,7 @@ public class GemFireCacheImpl
 
   }
 
+  @Override
   public InternalDistributedSystem getDistributedSystem() {
     return this.system;
   }
@@ -2862,33 +2867,22 @@ public class GemFireCacheImpl
    *
    * @since GemFire 5.0
    */
+  @Override
   public InternalDistributedMember getMyId() {
     return this.system.getDistributedMember();
   }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see org.apache.geode.cache.Cache#getMembers()
-   */
+  @Override
   public Set<DistributedMember> getMembers() {
     return Collections.unmodifiableSet(this.dm.getOtherNormalDistributionManagerIds());
   }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see org.apache.geode.cache.Cache#getAdminMembers()
-   */
+  @Override
   public Set<DistributedMember> getAdminMembers() {
     return this.dm.getAdminMemberSet();
   }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see org.apache.geode.cache.Cache#getMembers(org.apache.geode.cache.Region)
-   */
+  @Override
   public Set<DistributedMember> getMembers(Region r) {
     if (r instanceof DistributedRegion) {
       DistributedRegion d = (DistributedRegion) r;
@@ -2901,11 +2895,7 @@ public class GemFireCacheImpl
     }
   }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see org.apache.geode.cache.client.ClientCache#getCurrentServers()
-   */
+  @Override
   public Set<InetSocketAddress> getCurrentServers() {
     Map<String, Pool> pools = PoolManager.getAll();
     Set result = null;
@@ -2926,18 +2916,22 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public LogWriter getLogger() {
     return this.system.getLogWriter();
   }
 
+  @Override
   public LogWriter getSecurityLogger() {
     return this.system.getSecurityLogWriter();
   }
 
+  @Override
   public LogWriterI18n getLoggerI18n() {
     return this.system.getInternalLogWriter();
   }
 
+  @Override
   public LogWriterI18n getSecurityLoggerI18n() {
     return this.system.getSecurityInternalLogWriter();
   }
@@ -2959,10 +2953,12 @@ public class GemFireCacheImpl
     return this.recordedEventSweeper;
   }
 
+  @Override
   public CachePerfStats getCachePerfStats() {
     return this.cachePerfStats;
   }
 
+  @Override
   public String getName() {
     return this.system.getName();
   }
@@ -3029,6 +3025,7 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public Region createVMRegion(String name, RegionAttributes attrs)
       throws RegionExistsException, TimeoutException {
     return createRegion(name, attrs);
@@ -3172,6 +3169,7 @@ public class GemFireCacheImpl
     return pool;
   }
 
+  @Override
   public Region createRegion(String name, RegionAttributes attrs)
       throws RegionExistsException, TimeoutException {
     if (isClient()) {
@@ -3199,6 +3197,7 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public <K, V> Region<K, V> createVMRegion(String name, RegionAttributes<K, V> p_attrs,
       InternalRegionArguments internalRegionArgs)
       throws RegionExistsException, TimeoutException, IOException, ClassNotFoundException {
@@ -3359,6 +3358,7 @@ public class GemFireCacheImpl
     return rgn;
   }
 
+  @Override
   public RegionAttributes invokeRegionBefore(LocalRegion parent, String name,
       RegionAttributes attrs, InternalRegionArguments internalRegionArgs) {
     for (RegionListener listener : regionListeners) {
@@ -3367,12 +3367,14 @@ public class GemFireCacheImpl
     return attrs;
   }
 
+  @Override
   public void invokeRegionAfter(LocalRegion region) {
     for (RegionListener listener : regionListeners) {
       listener.afterCreate(region);
     }
   }
 
+  @Override
   public final Region getRegion(String path) {
     return getRegion(path, false);
   }
@@ -3422,7 +3424,8 @@ public class GemFireCacheImpl
     return result;
   }
 
-  void setRegionByPath(String path, LocalRegion r) {
+  @Override
+  public void setRegionByPath(String path, LocalRegion r) {
     if (r == null) {
       this.pathToRegion.remove(path);
     } else {
@@ -3448,6 +3451,7 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public LocalRegion getRegionByPath(String path) {
     validatePath(path); // fix for bug 34892
 
@@ -3490,6 +3494,7 @@ public class GemFireCacheImpl
   /**
    * @param returnDestroyedRegion if true, okay to return a destroyed region
    */
+  @Override
   public Region getRegion(String path, boolean returnDestroyedRegion) {
     stopper.checkCancelInProgress(null);
     {
@@ -3600,6 +3605,7 @@ public class GemFireCacheImpl
     return result;
   }
 
+  @Override
   public Set rootRegions() {
     return rootRegions(false);
   }
@@ -3640,6 +3646,7 @@ public class GemFireCacheImpl
    *
    * @since GemFire 5.7
    */
+  @Override
   public void cleanupForClient(CacheClientNotifier ccn, ClientProxyMembershipID client) {
     try {
       if (isClosed())
@@ -3657,14 +3664,17 @@ public class GemFireCacheImpl
     return this.isInitialized;
   }
 
+  @Override
   public boolean isClosed() {
     return this.isClosing;
   }
 
+  @Override
   public int getLockTimeout() {
     return this.lockTimeout;
   }
 
+  @Override
   public void setLockTimeout(int seconds) {
     if (isClient()) {
       throw new UnsupportedOperationException("operation is not supported on a client cache");
@@ -3673,10 +3683,12 @@ public class GemFireCacheImpl
     this.lockTimeout = seconds;
   }
 
+  @Override
   public int getLockLease() {
     return this.lockLease;
   }
 
+  @Override
   public void setLockLease(int seconds) {
     if (isClient()) {
       throw new UnsupportedOperationException("operation is not supported on a client cache");
@@ -3685,10 +3697,12 @@ public class GemFireCacheImpl
     this.lockLease = seconds;
   }
 
+  @Override
   public int getSearchTimeout() {
     return this.searchTimeout;
   }
 
+  @Override
   public void setSearchTimeout(int seconds) {
     if (isClient()) {
       throw new UnsupportedOperationException("operation is not supported on a client cache");
@@ -3697,10 +3711,12 @@ public class GemFireCacheImpl
     this.searchTimeout = seconds;
   }
 
+  @Override
   public int getMessageSyncInterval() {
     return HARegionQueue.getMessageSyncInterval();
   }
 
+  @Override
   public void setMessageSyncInterval(int seconds) {
     if (isClient()) {
       throw new UnsupportedOperationException("operation is not supported on a client cache");
@@ -3719,7 +3735,8 @@ public class GemFireCacheImpl
    * reinitializing or this thread is interrupted. If a reinitializing region is found, then this
    * method blocks until reinitialization is complete and then returns the region.
    */
-  LocalRegion getReinitializingRegion(String fullPath) {
+  @Override
+  public LocalRegion getReinitializingRegion(String fullPath) {
     Future future = (Future) this.reinitializingRegions.get(fullPath);
     if (future == null) {
       return null;
@@ -3749,7 +3766,8 @@ public class GemFireCacheImpl
    *
    * @throws IllegalStateException if there is already a region by that name registered.
    */
-  void regionReinitializing(String fullPath) {
+  @Override
+  public void regionReinitializing(String fullPath) {
     Object old = this.reinitializingRegions.putIfAbsent(fullPath, new FutureResult(this.stopper));
     if (old != null) {
       throw new IllegalStateException(
@@ -3763,7 +3781,8 @@ public class GemFireCacheImpl
    *
    * @throws IllegalStateException if there is no region by that name registered as reinitializing.
    */
-  void regionReinitialized(Region region) {
+  @Override
+  public void regionReinitialized(Region region) {
     String regionName = region.getFullPath();
     FutureResult future = (FutureResult) this.reinitializingRegions.get(regionName);
     if (future == null) {
@@ -3780,23 +3799,18 @@ public class GemFireCacheImpl
    *
    * @throws IllegalStateException if cannot find reinitializing region registered by that name.
    */
-  void unregisterReinitializingRegion(String fullPath) {
-    /* Object previous = */this.reinitializingRegions.remove(fullPath);
-    // if (previous == null) {
-    // throw new IllegalStateException("Could not find a reinitializing region
-    // named " +
-    // fullPath);
-    // }
+  @Override
+  public void unregisterReinitializingRegion(String fullPath) {
+    this.reinitializingRegions.remove(fullPath);
   }
 
-  // /////////////////////////////////////////////////////////////
-
   /**
    * Returns true if get should give a copy; false if a reference.
    *
    * @since GemFire 4.0
    */
-  final boolean isCopyOnRead() {
+  @Override
+  public boolean isCopyOnRead() {
     return this.copyOnRead;
   }
 
@@ -3805,6 +3819,7 @@ public class GemFireCacheImpl
    *
    * @since GemFire 4.0
    */
+  @Override
   public void setCopyOnRead(boolean copyOnRead) {
     this.copyOnRead = copyOnRead;
   }
@@ -3814,7 +3829,8 @@ public class GemFireCacheImpl
    *
    * @since GemFire 4.0
    */
-  final public boolean getCopyOnRead() {
+  @Override
+  public boolean getCopyOnRead() {
     return this.copyOnRead;
   }
 
@@ -3824,7 +3840,8 @@ public class GemFireCacheImpl
    * @param rootRgn the region to be removed
    * @return true if root region was removed, false if not found
    */
-  boolean removeRoot(LocalRegion rootRgn) {
+  @Override
+  public boolean removeRoot(LocalRegion rootRgn) {
     synchronized (this.rootRegions) {
       String rgnName = rootRgn.getName();
       LocalRegion found = (LocalRegion) this.rootRegions.get(rgnName);
@@ -3893,6 +3910,7 @@ public class GemFireCacheImpl
   }
 
   @SuppressWarnings("unchecked")
+  @Override
   public <T extends CacheService> T getService(Class<T> clazz) {
     return (T) services.get(clazz);
   }
@@ -3905,6 +3923,7 @@ public class GemFireCacheImpl
    *
    * @since GemFire 4.0
    */
+  @Override
   public CacheTransactionManager getCacheTransactionManager() {
     return this.txMgr;
   }
@@ -3925,6 +3944,7 @@ public class GemFireCacheImpl
    *
    * @return the timer, lazily created
    */
+  @Override
   public SystemTimer getCCPTimer() {
     synchronized (ccpTimerMutex) {
       if (ccpTimer != null) {
@@ -3952,6 +3972,7 @@ public class GemFireCacheImpl
    * Does a periodic purge of the CCPTimer to prevent a large number of cancelled tasks from
    * building up in it. See GEODE-2485.
    */
+  @Override
   public void purgeCCPTimer() {
     synchronized (ccpTimerMutex) {
       if (ccpTimer != null) {
@@ -3974,11 +3995,13 @@ public class GemFireCacheImpl
    *
    * @return the scheduler, lazily created
    */
+  @Override
   public ExpirationScheduler getExpirationScheduler() {
     return this.expirationScheduler;
   }
 
-  TXManagerImpl getTXMgr() {
+  @Override
+  public TXManagerImpl getTXMgr() {
     return this.txMgr;
   }
 
@@ -3988,10 +4011,12 @@ public class GemFireCacheImpl
    *
    * @since GemFire 3.5
    */
-  Executor getEventThreadPool() {
+  @Override
+  public Executor getEventThreadPool() {
     return this.eventThreadPool;
   }
 
+  @Override
   public CacheServer addCacheServer() {
     return addCacheServer(false);
   }
@@ -4105,6 +4130,7 @@ public class GemFireCacheImpl
    * 
    * @return List List of GatewaySender objects
    */
+  @Override
   public Set<GatewaySender> getGatewaySenders() {
     Set<GatewaySender> tempSet = new HashSet<GatewaySender>();
     for (GatewaySender sender : allGatewaySenders) {
@@ -4120,10 +4146,12 @@ public class GemFireCacheImpl
    * 
    * @return List List of GatewaySender objects
    */
+  @Override
   public Set<GatewaySender> getAllGatewaySenders() {
     return this.allGatewaySenders;
   }
 
+  @Override
   public GatewaySender getGatewaySender(String Id) {
     for (GatewaySender sender : this.allGatewaySenders) {
       if (sender.getId().equals(Id)) {
@@ -4133,14 +4161,17 @@ public class GemFireCacheImpl
     return null;
   }
 
+  @Override
   public Set<GatewayReceiver> getGatewayReceivers() {
     return this.allGatewayReceivers;
   }
 
+  @Override
   public Set<AsyncEventQueue> getAsyncEventQueues() {
     return this.allVisibleAsyncEventQueues;
   }
 
+  @Override
   public AsyncEventQueue getAsyncEventQueue(String id) {
     for (AsyncEventQueue asyncEventQueue : this.allAsyncEventQueues) {
       if (asyncEventQueue.getId().equals(id)) {
@@ -4167,6 +4198,7 @@ public class GemFireCacheImpl
   }
 
   /* Cache API - get the conflict resolver for WAN */
+  @Override
   public GatewayConflictResolver getGatewayConflictResolver() {
     synchronized (this.allGatewayHubsLock) {
       return this.gatewayConflictResolver;
@@ -4174,12 +4206,14 @@ public class GemFireCacheImpl
   }
 
   /* Cache API - set the conflict resolver for WAN */
+  @Override
   public void setGatewayConflictResolver(GatewayConflictResolver resolver) {
     synchronized (this.allGatewayHubsLock) {
       this.gatewayConflictResolver = resolver;
     }
   }
 
+  @Override
   public List<CacheServer> getCacheServers() {
     List cacheServersWithoutReceiver = null;
     if (!allCacheServers.isEmpty()) {
@@ -4326,7 +4360,8 @@ public class GemFireCacheImpl
    * @param r the partitioned region
    * @return true if the region should deliver all of its events to this cache
    */
-  protected boolean requiresNotificationFromPR(PartitionedRegion r) {
+  @Override
+  public boolean requiresNotificationFromPR(PartitionedRegion r) {
     boolean hasSerialSenders = hasSerialSenders(r);
     boolean result = hasSerialSenders;
     if (!result) {
@@ -4369,6 +4404,7 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public void setIsServer(boolean isServer) {
     if (isClient()) {
       throw new UnsupportedOperationException("operation is not supported on a client cache");
@@ -4378,6 +4414,7 @@ public class GemFireCacheImpl
     this.isServer = isServer;
   }
 
+  @Override
   public boolean isServer() {
     if (isClient()) {
       return false;
@@ -4391,6 +4428,7 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public QueryService getQueryService() {
     if (isClient()) {
       Pool p = getDefaultPool();
@@ -4405,6 +4443,7 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public QueryService getLocalQueryService() {
     return new DefaultQueryService(this);
   }
@@ -4413,10 +4452,8 @@ public class GemFireCacheImpl
    * @return Context jndi context associated with the Cache.
    * @since GemFire 4.0
    */
+  @Override
   public Context getJNDIContext() {
-    // if (isClient()) {
-    // throw new UnsupportedOperationException("operation is not supported on a client cache");
-    // }
     return JNDIInvoker.getJNDIContext();
   }
 
@@ -4424,16 +4461,15 @@ public class GemFireCacheImpl
    * @return JTA TransactionManager associated with the Cache.
    * @since GemFire 4.0
    */
+  @Override
   public javax.transaction.TransactionManager getJTATransactionManager() {
-    // if (isClient()) {
-    // throw new UnsupportedOperationException("operation is not supported on a client cache");
-    // }
     return JNDIInvoker.getTransactionManager();
   }
 
   /**
    * return the cq/interest information for a given region name, creating one if it doesn't exist
    */
+  @Override
   public FilterProfile getFilterProfile(String regionName) {
     LocalRegion r = (LocalRegion) getRegion(regionName, true);
     if (r != null) {
@@ -4442,10 +4478,12 @@ public class GemFireCacheImpl
     return null;
   }
 
+  @Override
   public RegionAttributes getRegionAttributes(String id) {
     return (RegionAttributes) this.namedRegionAttributes.get(id);
   }
 
+  @Override
   public void setRegionAttributes(String id, RegionAttributes attrs) {
     if (attrs == null) {
       this.namedRegionAttributes.remove(id);
@@ -4454,6 +4492,7 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public Map listRegionAttributes() {
     return Collections.unmodifiableMap(this.namedRegionAttributes);
   }
@@ -4468,6 +4507,7 @@ public class GemFireCacheImpl
     return (GemFireCacheImpl) xmlCache.get();
   }
 
+  @Override
   public void loadCacheXml(InputStream stream)
       throws TimeoutException, CacheWriterException, GatewayException, RegionExistsException {
     // make this cache available to callbacks being initialized during xml create
@@ -4513,17 +4553,25 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public void readyForEvents() {
     PoolManagerImpl.readyForEvents(this.system, false);
   }
 
   private List<File> backupFiles = Collections.emptyList();
 
-  public InternalResourceManager getResourceManager() {
-    return getResourceManager(true);
+  @Override
+  public ResourceManager getResourceManager() {
+    return getInternalResourceManager(true);
+  }
+
+  @Override
+  public InternalResourceManager getInternalResourceManager() {
+    return getInternalResourceManager(true);
   }
 
-  public InternalResourceManager getResourceManager(boolean checkCancellationInProgress) {
+  @Override
+  public InternalResourceManager getInternalResourceManager(boolean checkCancellationInProgress) {
     if (checkCancellationInProgress) {
       stopper.checkCancelInProgress(null);
     }
@@ -4534,6 +4582,7 @@ public class GemFireCacheImpl
     this.backupFiles = backups;
   }
 
+  @Override
   public List<File> getBackupFiles() {
     return Collections.unmodifiableList(this.backupFiles);
   }
@@ -4548,6 +4597,7 @@ public class GemFireCacheImpl
     return manager;
   }
 
+  @Override
   public void clearBackupManager() {
     this.backupManager.set(null);
   }
@@ -4556,8 +4606,6 @@ public class GemFireCacheImpl
     return this.backupManager.get();
   }
 
-  // //////////////////// Inner Classes //////////////////////
-
   // TODO make this a simple int guarded by riWaiters and get rid of the double-check
   private final AtomicInteger registerInterestsInProgress = new AtomicInteger();
 
@@ -4569,6 +4617,7 @@ public class GemFireCacheImpl
   /**
    * update stats for completion of a registerInterest operation
    */
+  @Override
   public void registerInterestCompleted() {
     // Don't do a cancellation check, it's just a moot point, that's all
     // GemFireCache.this.getCancelCriterion().checkCancelInProgress(null);
@@ -4598,6 +4647,7 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public void registerInterestStarted() {
     // Don't do a cancellation check, it's just a moot point, that's all
     // GemFireCache.this.getCancelCriterion().checkCancelInProgress(null);
@@ -4608,9 +4658,6 @@ public class GemFireCacheImpl
   }
 
   /**
-   * update stats for initiation of a registerInterest operation
-   */
-  /**
    * Blocks until no register interests are in progress.
    */
   public void waitForRegisterInterestsInProgress() {
@@ -4811,6 +4858,7 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public TXManagerImpl getTxManager() {
     return this.txMgr;
   }
@@ -4818,6 +4866,7 @@ public class GemFireCacheImpl
   /**
    * @since GemFire 6.5
    */
+  @Override
   public <K, V> RegionFactory<K, V> createRegionFactory(RegionShortcut atts) {
     if (isClient()) {
       throw new UnsupportedOperationException("operation is not supported on a client cache");
@@ -4829,6 +4878,7 @@ public class GemFireCacheImpl
   /**
    * @since GemFire 6.5
    */
+  @Override
   public <K, V> RegionFactory<K, V> createRegionFactory() {
     if (isClient()) {
       throw new UnsupportedOperationException("operation is not supported on a client cache");
@@ -4839,6 +4889,7 @@ public class GemFireCacheImpl
   /**
    * @since GemFire 6.5
    */
+  @Override
   public <K, V> RegionFactory<K, V> createRegionFactory(String regionAttributesId) {
     if (isClient()) {
       throw new UnsupportedOperationException("operation is not supported on a client cache");
@@ -4849,6 +4900,7 @@ public class GemFireCacheImpl
   /**
    * @since GemFire 6.5
    */
+  @Override
   public <K, V> RegionFactory<K, V> createRegionFactory(RegionAttributes<K, V> regionAttributes) {
     if (isClient()) {
       throw new UnsupportedOperationException("operation is not supported on a client cache");
@@ -4859,10 +4911,12 @@ public class GemFireCacheImpl
   /**
    * @since GemFire 6.5
    */
+  @Override
   public <K, V> ClientRegionFactory<K, V> createClientRegionFactory(ClientRegionShortcut atts) {
     return new ClientRegionFactoryImpl<K, V>(this, atts);
   }
 
+  @Override
   public <K, V> ClientRegionFactory<K, V> createClientRegionFactory(String refid) {
     return new ClientRegionFactoryImpl<K, V>(this, refid);
   }
@@ -4870,6 +4924,7 @@ public class GemFireCacheImpl
   /**
    * @since GemFire 6.5
    */
+  @Override
   public QueryService getQueryService(String poolName) {
     Pool p = PoolManager.find(poolName);
     if (p == null) {
@@ -4879,6 +4934,7 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public RegionService createAuthenticatedView(Properties properties) {
     Pool pool = getDefaultPool();
     if (pool == null) {
@@ -4887,6 +4943,7 @@ public class GemFireCacheImpl
     return createAuthenticatedCacheView(pool, properties);
   }
 
+  @Override
   public RegionService createAuthenticatedView(Properties properties, String poolName) {
     Pool pool = PoolManager.find(poolName);
     if (pool == null) {
@@ -5193,10 +5250,12 @@ public class GemFireCacheImpl
     }
   }
 
+  @Override
   public void beginDestroy(String path, DistributedRegion region) {
     this.regionsInDestroy.putIfAbsent(path, region);
   }
 
+  @Override
   public void endDestroy(String path, DistributedRegion region) {
     this.regionsInDestroy.remove(path, region);
   }
@@ -5205,30 +5264,37 @@ public class GemFireCacheImpl
     return this.regionsInDestroy.get(path);
   }
 
+  @Override
   public TombstoneService getTombstoneService() {
     return this.tombstoneService;
   }
 
+  @Override
   public TypeRegistry getPdxRegistry() {
     return this.pdxRegistry;
   }
 
+  @Override
   public boolean getPdxReadSerialized() {
     return this.cacheConfig.pdxReadSerialized;
   }
 
+  @Override
   public PdxSerializer getPdxSerializer() {
     return this.cacheConfig.pdxSerializer;
   }
 
+  @Override
   public String getPdxDiskStore() {
     return this.cacheConfig.pdxDiskStore;
   }
 
+  @Override
   public boolean getPdxPersistent() {
     return this.cacheConfig.pdxPersistent;
   }
 
+  @Override
   public boolean getPdxIgnoreUnreadFields() {
     return this.cacheConfig.pdxIgnoreUnreadFields;
   }
@@ -5250,51 +5316,63 @@ public class GemFireCacheImpl
     return this.cacheConfig;
   }
 
+  @Override
   public DM getDistributionManager() {
     return this.dm;
   }
 
 
+  @Override
   public GatewaySenderFactory createGatewaySenderFactory() {
     return WANServiceProvider.createGatewaySenderFactory(this);
   }
 
+  @Override
   public GatewayReceiverFactory createGatewayReceiverFactory() {
     return WANServiceProvider.createGatewayReceiverFactory(this);
   }
 
+  @Override
   public AsyncEventQueueFactory createAsyncEventQueueFactory() {
     return new AsyncEventQueueFactoryImpl(this);
   }
 
+  @Override
   public DistributionAdvisor getDistributionAdvisor() {
     return getResourceAdvisor();
   }
 
+  @Override
   public ResourceAdvisor getResourceAdvisor() {
     return resourceAdvisor;
   }
 
+  @Override
   public Profile getProfile() {
     return resourceAdvisor.createProfile();
   }
 
+  @Override
   public DistributionAdvisee getParentAdvisee() {
     return null;
   }
 
+  @Override
   public InternalDistributedSystem getSystem() {
     return this.system;
   }
 
+  @Override
   public String getFullPath() {
     return "ResourceManager";
   }
 
+  @Override
   public void fillInProfile(Profile profile) {
     resourceManager.fillInProfile(profile);
   }
 
+  @Override
   public int getSerialNumber() {
     return this.serialNumber;
   }
@@ -5378,10 +5456,12 @@ public class GemFireCacheImpl
    */
   private TemporaryResultSetFactory resultSetFactory;
 
+  @Override
   public Declarable getInitializer() {
     return this.initializer;
   }
 
+  @Override
   public Properties getInitializerProps() {
     return this.initializerProps;
   }
@@ -5391,6 +5471,7 @@ public class GemFireCacheImpl
     this.initializerProps = initializerProps;
   }
 
+  @Override
   public PdxInstanceFactory createPdxInstanceFactory(String className) {
     return PdxInstanceFactoryImpl.newCreator(className, true);
   }
@@ -5399,6 +5480,7 @@ public class GemFireCacheImpl
     return PdxInstanceFactoryImpl.newCreator(className, b);
   }
 
+  @Override
   public PdxInstance createPdxEnum(String className, String enumName, int enumOrdinal) {
     return PdxInstanceFactoryImpl.createPdxEnum(className, enumName, enumOrdinal, this);
   }
@@ -5407,6 +5489,7 @@ public class GemFireCacheImpl
     return this.jmxAdvisor;
   }
 
+  @Override
   public CacheSnapshotService getSnapshotService() {
     return new CacheSnapshotServiceImpl(this);
   }
@@ -5422,6 +5505,7 @@ public class GemFireCacheImpl
     return this.resultSetFactory;
   }
 
+  @Override
   public MemoryAllocator getOffHeapStore() {
     return this.getSystem().getOffHeapStore();
   }
@@ -5443,6 +5527,7 @@ public class GemFireCacheImpl
     return clientFunctionTimeout;
   }
 
+  @Override
   public CqService getCqService() {
     return this.cqService;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
index bcb3814..ee80014 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
@@ -15,32 +15,156 @@
 
 package org.apache.geode.internal.cache;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
 import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Executor;
+
+import javax.transaction.TransactionManager;
 
 import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.RegionExistsException;
+import org.apache.geode.cache.TimeoutException;
+import org.apache.geode.cache.client.internal.ClientMetadataService;
+import org.apache.geode.cache.query.QueryService;
 import org.apache.geode.cache.query.internal.cq.CqService;
+import org.apache.geode.cache.wan.GatewaySender;
+import org.apache.geode.distributed.DistributedLockService;
 import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.internal.SystemTimer;
+import org.apache.geode.internal.cache.control.InternalResourceManager;
+import org.apache.geode.internal.cache.control.ResourceAdvisor;
 import org.apache.geode.internal.cache.extension.Extensible;
+import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
+import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
+import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.internal.offheap.MemoryAllocator;
+import org.apache.geode.pdx.internal.TypeRegistry;
 
 /**
  * The InternalCache interface is contract for implementing classes for defining internal cache
  * operations that should not be part of the "public" API of the implementing class.
- * </p>
- * 
+ *
  * @see org.apache.geode.cache.Cache
  * @since GemFire 7.0
  */
 public interface InternalCache extends Cache, Extensible<Cache> {
 
-  public DistributedMember getMyId();
+  DistributedMember getMyId();
+
+  Collection<DiskStoreImpl> listDiskStores();
+
+  Collection<DiskStoreImpl> listDiskStoresIncludingRegionOwned();
+
+  CqService getCqService();
+
+  <T extends CacheService> T getService(Class<T> clazz);
+
+  SystemTimer getCCPTimer();
+
+  void cleanupForClient(CacheClientNotifier ccn, ClientProxyMembershipID client);
+
+  void purgeCCPTimer();
+
+  FilterProfile getFilterProfile(String regionName);
+
+  Region getRegion(String path, boolean returnDestroyedRegion);
+
+  MemoryAllocator getOffHeapStore();
+
+  <K, V> Region<K, V> createVMRegion(String name, RegionAttributes<K, V> p_attrs,
+      InternalRegionArguments internalRegionArgs)
+      throws RegionExistsException, TimeoutException, IOException, ClassNotFoundException;
+
+  DistributedLockService getPartitionedRegionLockService();
+
+  PersistentMemberManager getPersistentMemberManager();
+
+  Set<GatewaySender> getAllGatewaySenders();
+
+  CachePerfStats getCachePerfStats();
+
+  DM getDistributionManager();
+
+  void regionReinitialized(Region region);
+
+  void setRegionByPath(String path, LocalRegion r);
+
+  InternalResourceManager getInternalResourceManager();
+
+  ResourceAdvisor getResourceAdvisor();
+
+  boolean isCacheAtShutdownAll();
+
+  boolean requiresNotificationFromPR(PartitionedRegion r);
+
+  RegionAttributes invokeRegionBefore(LocalRegion parent, String name, RegionAttributes attrs,
+      InternalRegionArguments internalRegionArgs);
+
+  void invokeRegionAfter(LocalRegion region);
+
+  TXManagerImpl getTXMgr();
+
+  boolean forcedDisconnect();
+
+  InternalResourceManager getInternalResourceManager(boolean checkCancellationInProgress);
+
+  boolean isCopyOnRead();
+
+  TombstoneService getTombstoneService();
+
+  QueryService getLocalQueryService();
+
+  void registerInterestStarted();
+
+  void registerInterestCompleted();
+
+  void regionReinitializing(String fullPath);
+
+  void unregisterReinitializingRegion(String fullPath);
+
+  boolean removeRoot(LocalRegion rootRgn);
+
+  Executor getEventThreadPool();
+
+  LocalRegion getReinitializingRegion(String fullPath);
+
+  boolean keepDurableSubscriptionsAlive();
+
+  CacheClosedException getCacheClosedException(String reason, Throwable cause);
+
+  TypeRegistry getPdxRegistry();
+
+  DiskStoreImpl getOrCreateDefaultDiskStore();
+
+  ExpirationScheduler getExpirationScheduler();
+
+  TransactionManager getJTATransactionManager();
+
+  TXManagerImpl getTxManager();
+
+  void beginDestroy(String path, DistributedRegion region);
+
+  void endDestroy(String path, DistributedRegion region);
+
+  ClientMetadataService getClientMetadataService();
+
+  long cacheTimeMillis();
 
-  public Collection<DiskStoreImpl> listDiskStores();
+  void clearBackupManager();
 
-  public Collection<DiskStoreImpl> listDiskStoresIncludingDefault();
+  URL getCacheXmlURL();
 
-  public Collection<DiskStoreImpl> listDiskStoresIncludingRegionOwned();
+  List<File> getBackupFiles();
 
-  public CqService getCqService();
+  LocalRegion getRegionByPath(String path);
 
-  public <T extends CacheService> T getService(Class<T> clazz);
+  boolean isClient();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 4b1786f..55ee6a8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -963,16 +963,16 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
         // register the region with resource manager to get memory events
         if (!newRegion.isInternalRegion()) {
           if (!newRegion.isDestroyed) {
-            cache.getResourceManager().addResourceListener(ResourceType.MEMORY, newRegion);
+            cache.getInternalResourceManager().addResourceListener(ResourceType.MEMORY, newRegion);
 
             if (!newRegion.getOffHeap()) {
               newRegion.initialCriticalMembers(
-                  cache.getResourceManager().getHeapMonitor().getState().isCritical(),
+                  cache.getInternalResourceManager().getHeapMonitor().getState().isCritical(),
                   cache.getResourceAdvisor().adviseCritialMembers());
             } else {
-              newRegion.initialCriticalMembers(
-                  cache.getResourceManager().getHeapMonitor().getState().isCritical()
-                      || cache.getResourceManager().getOffHeapMonitor().getState().isCritical(),
+              newRegion.initialCriticalMembers(cache.getInternalResourceManager().getHeapMonitor()
+                  .getState().isCritical()
+                  || cache.getInternalResourceManager().getOffHeapMonitor().getState().isCritical(),
                   cache.getResourceAdvisor().adviseCritialMembers());
             }
 
@@ -999,7 +999,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
         if (!success) {
           this.cache.setRegionByPath(newRegion.getFullPath(), null);
           initializationFailed(newRegion);
-          cache.getResourceManager(false).removeResourceListener(newRegion);
+          cache.getInternalResourceManager(false).removeResourceListener(newRegion);
         }
       }
 
@@ -2348,7 +2348,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
       // Subclasses may have already called this method, but this is
       // acceptable because addResourceListener won't add it twice
       if (!this.isDestroyed) {
-        cache.getResourceManager().addResourceListener(ResourceType.MEMORY, this);
+        cache.getInternalResourceManager().addResourceListener(ResourceType.MEMORY, this);
       }
     }
 
@@ -2633,7 +2633,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
     if (!isInternalRegion()) {
       getCachePerfStats().incRegions(-1);
     }
-    cache.getResourceManager(false).removeResourceListener(this);
+    cache.getInternalResourceManager(false).removeResourceListener(this);
     if (getMembershipAttributes().hasRequiredRoles()) {
       if (!isInternalRegion()) {
         getCachePerfStats().incReliableRegions(-1);
@@ -2734,7 +2734,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
 
       this.isDestroyed = true;
       // after isDestroyed is set to true call removeResourceListener to fix bug 49555
-      this.cache.getResourceManager(false).removeResourceListener(this);
+      this.cache.getInternalResourceManager(false).removeResourceListener(this);
       closeEntries();
       if (logger.isDebugEnabled()) {
         logger.debug("recursiveDestroyRegion: Region Destroyed: {}", getFullPath());
@@ -6581,7 +6581,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
       float evictionPercentage = DEFAULT_HEAPLRU_EVICTION_HEAP_PERCENTAGE;
       // This is new to 6.5. If a heap lru region is created
       // we make sure that the eviction percentage is enabled.
-      InternalResourceManager rm = this.cache.getResourceManager();
+      InternalResourceManager rm = this.cache.getInternalResourceManager();
       if (!getOffHeap()) {
         if (!rm.getHeapMonitor().hasEvictionThreshold()) {
           float criticalPercentage = rm.getCriticalHeapPercentage();
@@ -7342,7 +7342,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
     // mark as destroyed fixes 49555.
     this.isDestroyed = true;
     // after isDestroyed is set to true call removeResourceListener to fix bug 49555
-    this.cache.getResourceManager(false).removeResourceListener(this);
+    this.cache.getInternalResourceManager(false).removeResourceListener(this);
     closeEntries(); // fixes bug 41333
     this.destroyedSubregionSerialNumbers = collectSubregionSerialNumbers();
     try {

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java
index 258a82e..d2f44e8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java
@@ -126,7 +126,8 @@ public class PRHARedundancyProvider {
    */
   public PRHARedundancyProvider(final PartitionedRegion region) {
     this.prRegion = region;
-    final InternalResourceManager resourceManager = region.getGemFireCache().getResourceManager();
+    final InternalResourceManager resourceManager =
+        region.getGemFireCache().getInternalResourceManager();
     recoveryExecutor = new OneTaskOnlyExecutor(resourceManager.getExecutor(),
         new OneTaskOnlyExecutor.ConflatedTaskListener() {
           public void taskDropped() {
@@ -1800,7 +1801,7 @@ public class PRHARedundancyProvider {
         && ColocationHelper.isColocationComplete(this.prRegion)) {
       Runnable task = new CreateMissingBucketsTask(this);
       final InternalResourceManager resourceManager =
-          this.prRegion.getGemFireCache().getResourceManager();
+          this.prRegion.getGemFireCache().getInternalResourceManager();
       resourceManager.getExecutor().execute(task);
     }
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 614de4d..8db8969 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -910,7 +910,7 @@ public class PartitionedRegion extends LocalRegion
 
     if (!this.isDestroyed && !this.isLocallyDestroyed) {
       // Register at this point so that other members are known
-      this.cache.getResourceManager().addResourceListener(ResourceType.MEMORY, this);
+      this.cache.getInternalResourceManager().addResourceListener(ResourceType.MEMORY, this);
     }
 
     // Create OQL indexes before starting GII.
@@ -3722,7 +3722,7 @@ public class PartitionedRegion extends LocalRegion
 
     Set<InternalDistributedMember> dest = memberToBuckets.keySet();
     if (function.optimizeForWrite()
-        && cache.getResourceManager().getHeapMonitor().containsHeapCriticalMembers(dest)
+        && cache.getInternalResourceManager().getHeapMonitor().containsHeapCriticalMembers(dest)
         && !MemoryThresholds.isLowMemoryExceptionDisabled()) {
       Set<InternalDistributedMember> hcm = cache.getResourceAdvisor().adviseCritialMembers();
       Set<DistributedMember> sm = SetUtils.intersection(hcm, dest);
@@ -5653,7 +5653,7 @@ public class PartitionedRegion extends LocalRegion
     // destroy region message.
     this.redundancyProvider.waitForPersistentBucketRecovery();
     this.cache.removePartitionedRegion(this);
-    this.cache.getResourceManager(false).removeResourceListener(this);
+    this.cache.getInternalResourceManager(false).removeResourceListener(this);
     this.redundancyProvider.shutdown(); // see bug 41094
     int serials[] = getRegionAdvisor().getBucketSerials();
     RegionEventImpl event = new RegionEventImpl(this, Operation.REGION_CLOSE, null, false,
@@ -7779,7 +7779,7 @@ public class PartitionedRegion extends LocalRegion
     } finally {
       this.getRegionAdvisor().close();
       getPrStats().close();
-      this.cache.getResourceManager(false).removeResourceListener(this);
+      this.cache.getInternalResourceManager(false).removeResourceListener(this);
       this.locallyDestroyingThread = null;
       if (logger.isDebugEnabled()) {
         logger.debug("destroyPartitionedRegionLocally: Ending destroy for PR = {}", this);
@@ -7815,7 +7815,7 @@ public class PartitionedRegion extends LocalRegion
     this.redundancyProvider.waitForPersistentBucketRecovery();
     // fix #39196 OOME caused by leak in GemFireCache.partitionedRegions
     this.cache.removePartitionedRegion(this);
-    this.cache.getResourceManager(false).removeResourceListener(this);
+    this.cache.getInternalResourceManager(false).removeResourceListener(this);
 
     final Operation op = event.getOperation();
     stopMissingColocatedRegionLogger();

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/control/RebalanceOperationImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/RebalanceOperationImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/RebalanceOperationImpl.java
index 42622d5..cd9eab3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/RebalanceOperationImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/RebalanceOperationImpl.java
@@ -60,7 +60,7 @@ public class RebalanceOperationImpl implements RebalanceOperation {
   }
 
   public void start() {
-    final InternalResourceManager manager = this.cache.getResourceManager();
+    final InternalResourceManager manager = this.cache.getInternalResourceManager();
     synchronized (this.futureLock) {
       manager.addInProgressRebalance(this);
       this.scheduleRebalance();
@@ -68,7 +68,7 @@ public class RebalanceOperationImpl implements RebalanceOperation {
   }
 
   private void scheduleRebalance() {
-    ResourceManagerStats stats = cache.getResourceManager().getStats();
+    ResourceManagerStats stats = cache.getInternalResourceManager().getStats();
 
     long start = stats.startRebalance();
     try {
@@ -111,7 +111,7 @@ public class RebalanceOperationImpl implements RebalanceOperation {
 
   private Future<RebalanceResults> submitRebalanceTask(
       final PartitionedRegionRebalanceOp rebalanceOp, final long rebalanceStartTime) {
-    final InternalResourceManager manager = this.cache.getResourceManager();
+    final InternalResourceManager manager = this.cache.getInternalResourceManager();
     ScheduledExecutorService ex = manager.getExecutor();
 
     synchronized (futureLock) {
@@ -173,7 +173,7 @@ public class RebalanceOperationImpl implements RebalanceOperation {
         }
       }
       if (pendingTasks == 0) {
-        cache.getResourceManager().removeInProgressRebalance(this);
+        cache.getInternalResourceManager().removeInProgressRebalance(this);
       }
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java
index f79a729..0151f00 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceAdvisor.java
@@ -26,7 +26,6 @@ import java.util.Set;
 import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.CancelException;
-import org.apache.geode.DataSerializer;
 import org.apache.geode.SystemFailure;
 import org.apache.geode.cache.control.ResourceManager;
 import org.apache.geode.distributed.internal.DM;
@@ -36,9 +35,7 @@ import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.HighPriorityDistributionMessage;
 import org.apache.geode.distributed.internal.ReplyException;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.DSCODE;
 import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.UpdateAttributesProcessor;
 import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceType;
@@ -98,7 +95,7 @@ public class ResourceAdvisor extends DistributionAdvisor {
       try {
         final GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
         if (cache != null && !cache.isClosed()) {
-          final ResourceAdvisor ra = cache.getResourceManager().getResourceAdvisor();
+          final ResourceAdvisor ra = cache.getInternalResourceManager().getResourceAdvisor();
           if (this.profiles != null) {
             // Early reply to avoid waiting for the following putProfile call
             // to fire (remote) listeners so that the origin member can proceed with
@@ -238,7 +235,7 @@ public class ResourceAdvisor extends DistributionAdvisor {
   }
 
   private InternalResourceManager getResourceManager() {
-    return ((GemFireCacheImpl) getAdvisee()).getResourceManager(false);
+    return ((GemFireCacheImpl) getAdvisee()).getInternalResourceManager(false);
   }
 
   @SuppressWarnings("synthetic-access")

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java
index 1952c2a..6bb00fb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutor.java
@@ -182,7 +182,7 @@ public class MemberFunctionExecutor extends AbstractExecution {
       }
     }
     if (function.optimizeForWrite() && cache != null
-        && cache.getResourceManager().getHeapMonitor().containsHeapCriticalMembers(dest)
+        && cache.getInternalResourceManager().getHeapMonitor().containsHeapCriticalMembers(dest)
         && !MemoryThresholds.isLowMemoryExceptionDisabled()) {
       Set<InternalDistributedMember> hcm = cache.getResourceAdvisor().adviseCritialMembers();
       Set<DistributedMember> sm = SetUtils.intersection(hcm, dest);

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java
index 16baf46..c4c3a1a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionExecutor.java
@@ -207,7 +207,7 @@ public class MultiRegionFunctionExecutor extends AbstractExecution {
     }
     final GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
     if (function.optimizeForWrite() && cache != null
-        && cache.getResourceManager().getHeapMonitor().containsHeapCriticalMembers(dest)
+        && cache.getInternalResourceManager().getHeapMonitor().containsHeapCriticalMembers(dest)
         && !MemoryThresholds.isLowMemoryExceptionDisabled()) {
       Set<InternalDistributedMember> hcm = cache.getResourceAdvisor().adviseCritialMembers();
       Set<DistributedMember> sm = SetUtils.intersection(hcm, dest);
@@ -384,8 +384,8 @@ public class MultiRegionFunctionExecutor extends AbstractExecution {
         }
       }
     }
-    if (function.optimizeForWrite()
-        && cache.getResourceManager().getHeapMonitor().containsHeapCriticalMembers(targetMembers)
+    if (function.optimizeForWrite() && cache.getInternalResourceManager().getHeapMonitor()
+        .containsHeapCriticalMembers(targetMembers)
         && !MemoryThresholds.isLowMemoryExceptionDisabled()) {
       Set<InternalDistributedMember> hcm = cache.getResourceAdvisor().adviseCritialMembers();
       Set<DistributedMember> sm = SetUtils.intersection(hcm, targetMembers);

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java
index 1f65569..6e0840a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionExecutor.java
@@ -355,8 +355,8 @@ public class PartitionedRegionFunctionExecutor extends AbstractExecution {
         }
       }
     }
-    if (function.optimizeForWrite()
-        && cache.getResourceManager().getHeapMonitor().containsHeapCriticalMembers(targetMembers)
+    if (function.optimizeForWrite() && cache.getInternalResourceManager().getHeapMonitor()
+        .containsHeapCriticalMembers(targetMembers)
         && !MemoryThresholds.isLowMemoryExceptionDisabled()) {
       Set<InternalDistributedMember> hcm = cache.getResourceAdvisor().adviseCritialMembers();
       Set<DistributedMember> sm = SetUtils.intersection(hcm, targetMembers);

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUCapacityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUCapacityController.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUCapacityController.java
index cc2cd7e..2fd42f5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUCapacityController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/HeapLRUCapacityController.java
@@ -269,7 +269,7 @@ public class HeapLRUCapacityController extends LRUAlgorithm {
        */
       public boolean mustEvict(LRUStatistics stats, Region region, int delta) {
         final GemFireCacheImpl cache = (GemFireCacheImpl) region.getRegionService();
-        InternalResourceManager resourceManager = cache.getResourceManager();
+        InternalResourceManager resourceManager = cache.getInternalResourceManager();
         boolean offheap = region.getAttributes().getOffHeap();
         final boolean monitorStateIsEviction =
             resourceManager.getMemoryMonitor(offheap).getState().isEviction();
@@ -283,7 +283,7 @@ public class HeapLRUCapacityController extends LRUAlgorithm {
       @Override
       public boolean lruLimitExceeded(LRUStatistics lruStatistics, DiskRegionView drv) {
         InternalResourceManager resourceManager =
-            drv.getDiskStore().getCache().getResourceManager();
+            drv.getDiskStore().getCache().getInternalResourceManager();
         return resourceManager.getMemoryMonitor(drv.getOffHeap()).getState().isEviction();
       }
     };

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java
index 51be10f..38f9b45 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java
@@ -388,7 +388,7 @@ public class PartitionedRegionRebalanceOp {
   }
 
   private Map<PartitionedRegion, InternalPRInfo> fetchDetails(GemFireCacheImpl cache) {
-    LoadProbe probe = cache.getResourceManager().getLoadProbe();
+    LoadProbe probe = cache.getInternalResourceManager().getLoadProbe();
     Map<PartitionedRegion, InternalPRInfo> detailsMap =
         new LinkedHashMap<PartitionedRegion, InternalPRInfo>(colocatedRegions.size());
     for (PartitionedRegion colocatedRegion : colocatedRegions) {

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
index a0810d9..b0b7d1b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
@@ -17,6 +17,7 @@ package org.apache.geode.internal.cache.xmlcache;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -31,15 +32,18 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
+import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 
 import javax.naming.Context;
+import javax.transaction.TransactionManager;
 
 import org.apache.geode.CancelCriterion;
 import org.apache.geode.GemFireIOException;
 import org.apache.geode.LogWriter;
 import org.apache.geode.cache.AttributesFactory;
 import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheClosedException;
 import org.apache.geode.cache.CacheTransactionManager;
 import org.apache.geode.cache.CacheWriterException;
 import org.apache.geode.cache.Declarable;
@@ -59,6 +63,7 @@ import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueFactoryImpl;
 import org.apache.geode.cache.client.Pool;
 import org.apache.geode.cache.client.PoolFactory;
 import org.apache.geode.cache.client.PoolManager;
+import org.apache.geode.cache.client.internal.ClientMetadataService;
 import org.apache.geode.cache.client.internal.PoolImpl;
 import org.apache.geode.cache.execute.FunctionService;
 import org.apache.geode.cache.query.CqAttributes;
@@ -85,24 +90,42 @@ import org.apache.geode.cache.wan.GatewayReceiverFactory;
 import org.apache.geode.cache.wan.GatewaySender;
 import org.apache.geode.cache.wan.GatewaySenderFactory;
 import org.apache.geode.cache.wan.GatewayTransportFilter;
+import org.apache.geode.distributed.DistributedLockService;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.i18n.LogWriterI18n;
 import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.SystemTimer;
+import org.apache.geode.internal.cache.CachePerfStats;
 import org.apache.geode.internal.cache.CacheServerImpl;
 import org.apache.geode.internal.cache.CacheConfig;
 import org.apache.geode.internal.cache.CacheServerLauncher;
 import org.apache.geode.internal.cache.CacheService;
 import org.apache.geode.internal.cache.DiskStoreFactoryImpl;
 import org.apache.geode.internal.cache.DiskStoreImpl;
+import org.apache.geode.internal.cache.DistributedRegion;
+import org.apache.geode.internal.cache.ExpirationScheduler;
+import org.apache.geode.internal.cache.FilterProfile;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.InternalRegionArguments;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.PoolFactoryImpl;
 import org.apache.geode.internal.cache.PoolManagerImpl;
+import org.apache.geode.internal.cache.TXManagerImpl;
+import org.apache.geode.internal.cache.TombstoneService;
+import org.apache.geode.internal.cache.control.InternalResourceManager;
+import org.apache.geode.internal.cache.control.ResourceAdvisor;
 import org.apache.geode.internal.cache.extension.Extensible;
 import org.apache.geode.internal.cache.extension.ExtensionPoint;
 import org.apache.geode.internal.cache.extension.SimpleExtensionPoint;
 import org.apache.geode.internal.cache.ha.HARegionQueue;
+import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
+import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
+import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
 import org.apache.geode.internal.cache.wan.WANServiceProvider;
 import org.apache.geode.internal.cache.wan.InternalGatewaySenderFactory;
@@ -111,6 +134,7 @@ import org.apache.geode.internal.jndi.JNDIInvoker;
 import org.apache.geode.internal.logging.InternalLogWriter;
 import org.apache.geode.internal.logging.LocalLogWriter;
 import org.apache.geode.internal.logging.LogWriterFactory;
+import org.apache.geode.internal.offheap.MemoryAllocator;
 import org.apache.geode.pdx.PdxInstance;
 import org.apache.geode.pdx.PdxInstanceFactory;
 import org.apache.geode.pdx.PdxSerializer;
@@ -1262,6 +1286,16 @@ public class CacheCreation implements InternalCache {
     return Collections.unmodifiableList(this.backups);
   }
 
+  @Override
+  public LocalRegion getRegionByPath(final String path) {
+    return null;
+  }
+
+  @Override
+  public boolean isClient() {
+    return false;
+  }
+
   public GatewaySenderFactory createGatewaySenderFactory() {
     return WANServiceProvider.createGatewaySenderFactory(this);
   }
@@ -1414,11 +1448,6 @@ public class CacheCreation implements InternalCache {
   }
 
   @Override
-  public Collection<DiskStoreImpl> listDiskStoresIncludingDefault() {
-    return null;
-  }
-
-  @Override
   public Collection<DiskStoreImpl> listDiskStoresIncludingRegionOwned() {
     return null;
   }
@@ -1657,4 +1686,239 @@ public class CacheCreation implements InternalCache {
   public <T extends CacheService> T getService(Class<T> clazz) {
     throw new UnsupportedOperationException();
   }
+
+  @Override
+  public SystemTimer getCCPTimer() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public void cleanupForClient(final CacheClientNotifier ccn,
+      final ClientProxyMembershipID client) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public void purgeCCPTimer() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public FilterProfile getFilterProfile(final String regionName) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public Region getRegion(final String path, final boolean returnDestroyedRegion) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public MemoryAllocator getOffHeapStore() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public <K, V> Region<K, V> createVMRegion(final String name, final RegionAttributes<K, V> p_attrs,
+      final InternalRegionArguments internalRegionArgs)
+      throws RegionExistsException, TimeoutException, IOException, ClassNotFoundException {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public DistributedLockService getPartitionedRegionLockService() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public PersistentMemberManager getPersistentMemberManager() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public Set<GatewaySender> getAllGatewaySenders() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public CachePerfStats getCachePerfStats() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public DM getDistributionManager() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public void regionReinitialized(final Region region) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public void setRegionByPath(final String path, final LocalRegion r) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public InternalResourceManager getInternalResourceManager() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public ResourceAdvisor getResourceAdvisor() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public boolean isCacheAtShutdownAll() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public boolean requiresNotificationFromPR(final PartitionedRegion r) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public RegionAttributes invokeRegionBefore(final LocalRegion parent, final String name,
+      final RegionAttributes attrs, final InternalRegionArguments internalRegionArgs) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public void invokeRegionAfter(final LocalRegion region) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public TXManagerImpl getTXMgr() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public boolean forcedDisconnect() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public InternalResourceManager getInternalResourceManager(
+      final boolean checkCancellationInProgress) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public boolean isCopyOnRead() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public TombstoneService getTombstoneService() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public QueryService getLocalQueryService() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public void registerInterestStarted() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public void registerInterestCompleted() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public void regionReinitializing(final String fullPath) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public void unregisterReinitializingRegion(final String fullPath) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public boolean removeRoot(final LocalRegion rootRgn) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public Executor getEventThreadPool() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public LocalRegion getReinitializingRegion(final String fullPath) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public boolean keepDurableSubscriptionsAlive() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public CacheClosedException getCacheClosedException(final String reason, final Throwable cause) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public TypeRegistry getPdxRegistry() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public DiskStoreImpl getOrCreateDefaultDiskStore() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public ExpirationScheduler getExpirationScheduler() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public TransactionManager getJTATransactionManager() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public TXManagerImpl getTxManager() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public void beginDestroy(final String path, final DistributedRegion region) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public void endDestroy(final String path, final DistributedRegion region) {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public ClientMetadataService getClientMetadataService() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public long cacheTimeMillis() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public void clearBackupManager() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
+
+  @Override
+  public URL getCacheXmlURL() {
+    throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/11560117/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
index d7bf9d0..1559aad 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
@@ -391,7 +391,7 @@ public class MemberMBeanBridge {
     QueryDataFunction qDataFunction = new QueryDataFunction();
     FunctionService.registerFunction(qDataFunction);
 
-    this.resourceManagerStats = cache.getResourceManager().getStats();
+    this.resourceManagerStats = cache.getInternalResourceManager().getStats();
   }
 
 


Mime
View raw message