geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject [27/38] incubator-geode git commit: GEODE-243: remove deprecated Bridge feature
Date Thu, 15 Oct 2015 21:35:50 GMT
GEODE-243: remove deprecated Bridge feature

All the public classes and most of the internal ones
have been removed. The cache xsd also has its bridge
elements removed.
The deprecated admin package did not have its bridge
apis removed since the entire admin package is going
to be removed as a seperate project.
The external javadocs have also been updated to no
longer use the term "bridge".
Localized strings were changed to no longer use "bridge".
Internal code and test code continues to have some
bridge references. Additional cleanup will be done
in the future.


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

Branch: refs/heads/feature/GEODE-77
Commit: 2eb4e17500a8faad994d80c08a149b1ee9baaa3e
Parents: 7111906
Author: Darrel Schneider <dschneider@pivotal.io>
Authored: Thu Aug 27 11:02:27 2015 -0700
Committer: Darrel Schneider <dschneider@pivotal.io>
Committed: Tue Oct 6 10:47:10 2015 -0700

----------------------------------------------------------------------
 .../gemfire/admin/GemFireMemberStatus.java      |   13 +-
 .../gemfire/admin/SystemMemberBridgeServer.java |    5 +-
 .../gemfire/admin/SystemMemberCache.java        |   27 -
 .../DistributedSystemHealthMonitor.java         |    2 +-
 .../admin/internal/SystemMemberCacheImpl.java   |   17 +-
 .../jmx/internal/SystemMemberCacheJmxImpl.java  |   13 -
 .../gemfire/cache/AttributesFactory.java        |   31 -
 .../java/com/gemstone/gemfire/cache/Cache.java  |   27 -
 .../gemfire/cache/DynamicRegionFactory.java     |  121 +-
 .../gemfire/cache/client/PoolFactory.java       |   10 +-
 .../cache/client/internal/AbstractOp.java       |    2 +-
 .../cache/client/internal/BridgePoolImpl.java   |  479 -----
 .../internal/BridgeServerLoadMessage.java       |   99 --
 .../client/internal/CacheServerLoadMessage.java |   99 ++
 .../cache/client/internal/DestroyOp.java        |    5 -
 .../client/internal/EndpointManagerImpl.java    |    8 +-
 .../internal/ExplicitConnectionSourceImpl.java  |   85 +-
 .../gemfire/cache/client/internal/GetOp.java    |    5 -
 .../gemfire/cache/client/internal/PoolImpl.java |   14 +-
 .../gemfire/cache/client/internal/PutOp.java    |    5 -
 .../cache/client/internal/QueueManagerImpl.java |   14 +-
 .../cache/client/internal/QueueStateImpl.java   |    6 +-
 .../internal/RegisterDataSerializersOp.java     |    8 +-
 .../internal/RegisterInstantiatorsOp.java       |    8 +-
 .../client/internal/ServerRegionProxy.java      |   44 +-
 .../internal/FunctionServiceManager.java        |    3 +-
 .../gemfire/cache/server/ServerLoadProbe.java   |   10 +-
 .../gemfire/cache/server/ServerMetrics.java     |   10 +-
 .../cache/server/internal/LoadMonitor.java      |   12 +-
 .../gemfire/cache/util/BridgeClient.java        |  156 --
 .../gemfire/cache/util/BridgeLoader.java        |  607 -------
 .../gemfire/cache/util/BridgeMembership.java    |   55 -
 .../cache/util/BridgeMembershipEvent.java       |   23 -
 .../cache/util/BridgeMembershipListener.java    |   41 -
 .../util/BridgeMembershipListenerAdapter.java   |   43 -
 .../gemfire/cache/util/BridgeServer.java        |  442 -----
 .../gemfire/cache/util/BridgeWriter.java        |  795 ---------
 .../cache/util/BridgeWriterException.java       |   48 -
 .../util/EndpointDoesNotExistException.java     |   34 -
 .../gemfire/cache/util/EndpointException.java   |   61 -
 .../cache/util/EndpointExistsException.java     |   28 -
 .../cache/util/EndpointInUseException.java      |   27 -
 .../util/IncompatibleVersionException.java      |   47 -
 .../util/ServerRefusedConnectionException.java  |   36 -
 .../UniversalMembershipListenerAdapter.java     |  352 ----
 .../cache/util/UnknownVersionException.java     |   39 -
 .../gemfire/cache/util/VersionException.java    |   45 -
 .../gemstone/gemfire/cache/util/package.html    |    3 -
 .../gemfire/distributed/ServerLauncher.java     |    4 +-
 .../internal/InternalDistributedSystem.java     |   12 +-
 .../distributed/internal/ServerLocator.java     |   10 +-
 .../jgroup/JGroupMembershipManager.java         |    6 +-
 .../gemstone/gemfire/internal/DSFIDFactory.java |   12 +-
 .../internal/DataSerializableFixedID.java       |    6 +-
 .../internal/admin/ClientStatsManager.java      |    7 -
 .../gemfire/internal/admin/GemFireVM.java       |    2 +-
 .../admin/remote/BridgeServerResponse.java      |   18 +-
 .../admin/remote/DurableClientInfoResponse.java |    4 +-
 .../admin/remote/RemoteBridgeServer.java        |   10 +-
 .../internal/admin/remote/RemoteCacheInfo.java  |    6 +-
 .../internal/admin/remote/RemoteGemFireVM.java  |    2 +-
 .../internal/cache/AbstractBridgeServer.java    |  425 -----
 .../internal/cache/AbstractCacheServer.java     |  398 +++++
 .../gemfire/internal/cache/AbstractRegion.java  |   52 -
 .../gemfire/internal/cache/BridgeObserver.java  |   89 -
 .../internal/cache/BridgeObserverAdapter.java   |  107 --
 .../internal/cache/BridgeObserverHolder.java    |   53 -
 .../internal/cache/BridgeRegionEventImpl.java   |  108 --
 .../internal/cache/BridgeServerAdvisor.java     |  165 --
 .../internal/cache/BridgeServerImpl.java        |  816 ---------
 .../gemfire/internal/cache/BucketAdvisor.java   |    2 +-
 .../gemfire/internal/cache/CacheConfig.java     |    8 +-
 .../internal/cache/CacheServerAdvisor.java      |  164 ++
 .../gemfire/internal/cache/CacheServerImpl.java |  812 +++++++++
 .../internal/cache/ClientRegionEventImpl.java   |  108 ++
 .../internal/cache/ClientServerObserver.java    |   90 +
 .../cache/ClientServerObserverAdapter.java      |  107 ++
 .../cache/ClientServerObserverHolder.java       |   53 +
 .../internal/cache/DestroyRegionOperation.java  |    6 +-
 .../cache/DistributedClearOperation.java        |    6 +-
 .../internal/cache/DistributedRegion.java       |    6 -
 .../gemfire/internal/cache/ExpiryTask.java      |   18 -
 .../cache/FindDurableQueueProcessor.java        |    4 +-
 .../internal/cache/GemFireCacheImpl.java        |   92 +-
 .../gemfire/internal/cache/GridAdvisor.java     |    6 +-
 .../gemfire/internal/cache/LocalRegion.java     |   41 +-
 .../internal/cache/PartitionedRegion.java       |    8 +-
 .../gemfire/internal/cache/PoolFactoryImpl.java |  171 +-
 .../gemfire/internal/cache/PoolManagerImpl.java |   19 -
 .../gemfire/internal/cache/RegionEventImpl.java |    2 +-
 .../internal/cache/doc-files/properties.html    |    4 +-
 .../cache/execute/InternalFunctionService.java  |    4 +-
 .../internal/cache/ha/HARegionQueue.java        |    6 +-
 .../PartitionedRegionObserverHolder.java        |    2 +-
 .../internal/cache/tier/ConnectionProxy.java    |  160 +-
 .../cache/tier/InternalBridgeMembership.java    |  715 --------
 .../cache/tier/InternalClientMembership.java    |  617 +++++++
 .../cache/tier/sockets/AcceptorImpl.java        |   20 +-
 .../cache/tier/sockets/CacheClientNotifier.java |   16 +-
 .../cache/tier/sockets/CacheClientProxy.java    |    6 +-
 .../cache/tier/sockets/CacheClientUpdater.java  |   12 +-
 .../tier/sockets/ClientBlacklistProcessor.java  |    4 +-
 .../RemoveClientFromBlacklistMessage.java       |    4 +-
 .../cache/tier/sockets/ServerConnection.java    |    8 +-
 .../doc-files/communication-architecture.fig    |    4 +-
 .../cache/xmlcache/BridgeServerCreation.java    |  249 ---
 .../internal/cache/xmlcache/CacheCreation.java  |   47 +-
 .../cache/xmlcache/CacheServerCreation.java     |  238 +++
 .../cache/xmlcache/CacheXmlGenerator.java       |   41 +-
 .../internal/cache/xmlcache/CacheXmlParser.java |   18 +-
 .../cache/xmlcache/ClientCacheCreation.java     |    5 -
 .../xmlcache/RegionAttributesCreation.java      |    9 -
 .../gemfire/internal/i18n/LocalizedStrings.java |   20 +-
 .../internal/i18n/ParentLocalizedStrings.java   |   81 +-
 .../internal/beans/CacheServerBridge.java       |   18 +-
 .../beans/GatewayReceiverMBeanBridge.java       |    4 +-
 .../internal/beans/ManagementAdapter.java       |   42 +-
 .../management/internal/beans/ServerBridge.java |    6 +-
 .../cli/functions/ContunuousQueryFunction.java  |    4 +-
 .../functions/GetMemberInformationFunction.java |    4 +-
 .../management/membership/ClientMembership.java |    8 +-
 .../gemfire/cache/cache-9.0.xsd                 |   26 -
 .../batterytest/greplogs/ExpectedStrings.java   |    3 +-
 .../cache/AttributesFactoryJUnitTest.java       |   18 -
 .../gemstone/gemfire/cache/ClientHelper.java    |    1 -
 .../cache/ConnectionPoolAndLoaderDUnitTest.java |    4 +-
 .../internal/AutoConnectionSourceDUnitTest.java |   23 +-
 .../AutoConnectionSourceWithUDPDUnitTest.java   |    4 +-
 .../internal/ConnectionPoolImplJUnitTest.java   |   11 +-
 .../internal/LocatorLoadBalancingDUnitTest.java |   10 +-
 .../cache/client/internal/LocatorTestBase.java  |   12 +-
 .../management/MemoryThresholdsDUnitTest.java   |    4 +-
 .../MemoryThresholdsOffHeapDUnitTest.java       |    4 +-
 .../query/dunit/PdxStringQueryDUnitTest.java    |   16 +-
 .../query/dunit/QueryUsingPoolDUnitTest.java    |   12 +-
 .../cache/query/dunit/RemoteQueryDUnitTest.java |   90 +-
 ...esourceManagerWithQueryMonitorDUnitTest.java |    4 +-
 ...rrentIndexInitOnOverflowRegionDUnitTest.java |    4 +-
 .../cache30/BridgeMembershipDUnitTest.java      | 1642 ------------------
 .../BridgeMembershipSelectorDUnitTest.java      |   16 -
 .../gemfire/cache30/BridgeTestCase.java         |  376 ----
 .../gemfire/cache30/BridgeWriterDUnitTest.java  |  418 -----
 .../cache30/BridgeWriterSelectorDUnitTest.java  |   16 -
 .../gemfire/cache30/Bug38741DUnitTest.java      |   10 +-
 .../gemfire/cache30/CacheXml30DUnitTest.java    |  127 --
 .../gemfire/cache30/CacheXml40DUnitTest.java    |    8 +-
 .../gemfire/cache30/CacheXml41DUnitTest.java    |   28 +-
 .../gemfire/cache30/CacheXml45DUnitTest.java    |    4 +-
 .../gemfire/cache30/CacheXml51DUnitTest.java    |    8 +-
 .../gemfire/cache30/CacheXml57DUnitTest.java    |    1 -
 .../cache30/ClientMembershipDUnitTest.java      | 1642 ++++++++++++++++++
 .../ClientMembershipSelectorDUnitTest.java      |   16 +
 .../ClientRegisterInterestDUnitTest.java        |  418 +++++
 ...ClientRegisterInterestSelectorDUnitTest.java |   16 +
 .../gemfire/cache30/ClientServerTestCase.java   |  376 ++++
 .../AbstractServerLauncherJUnitTestCase.java    |    4 +-
 .../ServerLauncherLocalJUnitTest.java           |    4 +-
 .../ServerLauncherRemoteJUnitTest.java          |    8 +-
 .../internal/ProductUseLogDUnitTest.java        |    2 +-
 .../disttx/DistributedTransactionDUnitTest.java |    4 +-
 .../internal/cache/Bug39079DUnitTest.java       |    6 +-
 .../internal/cache/Bug41957DUnitTest.java       |    6 +-
 ...ssagesRegionCreationAndDestroyJUnitTest.java |   10 +-
 .../cache/ClientServerGetAllDUnitTest.java      |   40 +-
 .../cache/ClientServerTransactionDUnitTest.java |    6 +-
 .../cache/ConcurrentMapOpsDUnitTest.java        |    6 +-
 .../cache/DeltaPropagationDUnitTest.java        |    8 +-
 .../cache/DeltaPropagationStatsDUnitTest.java   |    2 +-
 .../internal/cache/DiskRegionJUnitTest.java     |    9 +-
 .../internal/cache/EventTrackerDUnitTest.java   |    8 +-
 .../internal/cache/GridAdvisorDUnitTest.java    |  106 +-
 .../internal/cache/HABug36773DUnitTest.java     |    8 +-
 .../HAOverflowMemObjectSizerDUnitTest.java      |   12 +-
 .../cache/execute/Bug51193DUnitTest.java        |    4 +-
 .../internal/cache/functions/TestFunction.java  |   10 +-
 .../cache/ha/Bug36853EventsExpiryDUnitTest.java |    8 +-
 .../internal/cache/ha/Bug48571DUnitTest.java    |    2 +-
 .../cache/ha/EventIdOptimizationDUnitTest.java  |   12 +-
 .../internal/cache/ha/FailoverDUnitTest.java    |   22 +-
 .../internal/cache/ha/HABugInPutDUnitTest.java  |    8 +-
 .../internal/cache/ha/HAClearDUnitTest.java     |   10 +-
 .../cache/ha/HAConflationDUnitTest.java         |    8 +-
 .../internal/cache/ha/HADuplicateDUnitTest.java |   10 +-
 .../cache/ha/HAEventIdPropagationDUnitTest.java |   10 +-
 .../internal/cache/ha/HAGIIDUnitTest.java       |   14 +-
 .../cache/ha/HARQueueNewImplDUnitTest.java      |   66 +-
 .../cache/ha/HASlowReceiverDUnitTest.java       |   10 +-
 .../ha/OperationsPropagationDUnitTest.java      |    8 +-
 .../internal/cache/ha/PutAllDUnitTest.java      |   12 +-
 .../cache/ha/StatsBugDUnitDisabledTest.java     |   14 +-
 .../cache/partitioned/Bug43684DUnitTest.java    |    4 +-
 .../fixed/FixedPartitioningTestBase.java        |    6 +-
 .../tier/sockets/AcceptorImplJUnitTest.java     |   62 +-
 ...rdCompatibilityCommandDUnitDisabledTest.java |  235 ---
 ...CompatibilityHandshakeDUnitDisabledTest.java |  218 ---
 ...mpatibilityHigherVersionClientDUnitTest.java |    4 +-
 ...rdCompatibilityMessageDUnitDisabledTest.java |  299 ----
 .../BridgeServerMaxConnectionsJUnitTest.java    |  221 ---
 ...geServerSelectorMaxConnectionsJUnitTest.java |   19 -
 .../tier/sockets/BridgeWriterMiscDUnitTest.java | 1384 ---------------
 .../BridgeWriterMiscSelectorDUnitTest.java      |   27 -
 .../cache/tier/sockets/Bug36269DUnitTest.java   |    4 +-
 .../cache/tier/sockets/Bug36457DUnitTest.java   |   18 +-
 .../cache/tier/sockets/Bug36805DUnitTest.java   |    6 +-
 .../cache/tier/sockets/Bug36995DUnitTest.java   |   11 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java   |   10 +-
 .../CacheServerMaxConnectionsJUnitTest.java     |  220 +++
 ...heServerSelectorMaxConnectionsJUnitTest.java |   19 +
 .../cache/tier/sockets/CacheServerTestUtil.java |   51 +-
 .../CacheServerTransactionsDUnitTest.java       |    4 +-
 .../tier/sockets/ClearPropagationDUnitTest.java |    4 +-
 .../tier/sockets/ClientConflationDUnitTest.java |   20 +-
 .../sockets/ClientHealthMonitorJUnitTest.java   |    6 +-
 .../sockets/ClientInterestNotifyDUnitTest.java  |   14 +-
 .../tier/sockets/ClientServerMiscDUnitTest.java | 1381 +++++++++++++++
 .../ClientServerMiscSelectorDUnitTest.java      |   27 +
 .../cache/tier/sockets/ConflationDUnitTest.java |   24 +-
 .../tier/sockets/ConnectionProxyJUnitTest.java  |  257 +--
 .../DataSerializerPropogationDUnitTest.java     |   36 +-
 .../DestroyEntryPropagationDUnitTest.java       |   12 +-
 .../DurableClientReconnectDUnitTest.java        |   10 +-
 .../sockets/DurableClientStatsDUnitTest.java    |   10 +-
 .../sockets/DurableRegistrationDUnitTest.java   |    8 +-
 .../sockets/DurableResponseMatrixDUnitTest.java |   10 +-
 .../sockets/EventIDVerificationDUnitTest.java   |   10 +-
 .../ForceInvalidateEvictionDUnitTest.java       |   10 +-
 .../cache/tier/sockets/HAInterestBaseTest.java  |   64 +-
 .../tier/sockets/HAInterestPart2DUnitTest.java  |   12 +-
 .../sockets/HAStartupAndFailoverDUnitTest.java  |   81 +-
 .../tier/sockets/InterestListDUnitTest.java     |    4 +-
 .../sockets/InterestListEndpointDUnitTest.java  |   18 +-
 .../sockets/InterestListFailoverDUnitTest.java  |    6 +-
 .../sockets/InterestListRecoveryDUnitTest.java  |   10 +-
 .../sockets/InterestResultPolicyDUnitTest.java  |    4 +-
 .../tier/sockets/RedundancyLevelJUnitTest.java  |   14 +-
 .../sockets/RedundancyLevelPart1DUnitTest.java  |    4 +-
 .../sockets/RedundancyLevelPart3DUnitTest.java  |    6 +-
 .../tier/sockets/RedundancyLevelTestBase.java   |   51 +-
 .../tier/sockets/RegionCloseDUnitTest.java      |   14 +-
 ...erInterestBeforeRegionCreationDUnitTest.java |    6 +-
 .../sockets/RegisterInterestKeysDUnitTest.java  |    4 +-
 .../sockets/ReliableMessagingDUnitTest.java     |   24 +-
 .../internal/cache/tier/sockets/TestPut.java    |   53 -
 .../sockets/UpdatePropagationDUnitTest.java     |   10 +-
 ...UpdatesFromNonInterestEndPointDUnitTest.java |    4 +-
 ...ersalMembershipListenerAdapterDUnitTest.java |   32 +-
 .../pdx/PdxFormatterPutGetJUnitTest.java        |    4 +-
 .../test/java/dunit/DistributedTestCase.java    |    4 +-
 .../gemfire/codeAnalysis/excludedClasses.txt    |    2 +-
 .../sanctionedDataSerializables.txt             |   10 +-
 .../codeAnalysis/sanctionedSerializables.txt    |    9 -
 .../tier/sockets/RedundancyLevelJUnitTest.xml   |   21 +-
 252 files changed, 8011 insertions(+), 13441 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java
index b1b91dd..e63cff5 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.cache.LocalRegion;
 import com.gemstone.gemfire.internal.cache.PartitionedRegion;
 import com.gemstone.gemfire.internal.cache.PartitionedRegionStatus;
 import com.gemstone.gemfire.internal.cache.RegionStatus;
-import com.gemstone.gemfire.internal.cache.tier.InternalBridgeMembership;
+import com.gemstone.gemfire.internal.cache.tier.InternalClientMembership;
 import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
 
 /**
@@ -539,7 +539,7 @@ public class GemFireMemberStatus implements Serializable {
       // The following method returns a map of client member id to a cache
       // client info. For now, keep track of the member ids in the set of
       // _connectedClients.
-      Map allConnectedClients = InternalBridgeMembership.getStatusForAllClientsIgnoreSubscriptionStatus();
+      Map allConnectedClients = InternalClientMembership.getStatusForAllClientsIgnoreSubscriptionStatus();
       Iterator allConnectedClientsIterator = allConnectedClients.values().iterator();
       while (allConnectedClientsIterator.hasNext()) {
         CacheClientStatus ccs = (CacheClientStatus) allConnectedClientsIterator.next();
@@ -549,7 +549,7 @@ public class GemFireMemberStatus implements Serializable {
       }
 
       // Get client queue sizes
-      Map clientQueueSize = getClientIDMap(InternalBridgeMembership.getClientQueueSizes());
+      Map clientQueueSize = getClientIDMap(InternalClientMembership.getClientQueueSizes());
       setClientQueueSizes(clientQueueSize);
       
       // Set server acceptor port (set it based on the first CacheServer)
@@ -590,11 +590,6 @@ public class GemFireMemberStatus implements Serializable {
 	  }
 
   protected void initializeClient() {
-    // There are several ways to detect a client:
-    // - is a loner
-    // - has regions that use BridgeWriters or BridgeLoaders
-    // This method uses the presence of a connection proxy or
-    // a pool on the PoolManager.
     Map poolMap = PoolManager.getAll();
     if (poolMap.size() == 0) {
       setIsClient(false);
@@ -608,7 +603,7 @@ public class GemFireMemberStatus implements Serializable {
       // the logical connections for that server will be 0. For now, keep track
       // of the keys (server names) of this map in the sets of _connectedServers
       // and _unconnectedServers.
-      Map connectedServers = InternalBridgeMembership.getConnectedServers();
+      Map connectedServers = InternalClientMembership.getConnectedServers();
       if (!connectedServers.isEmpty()) {
         Iterator connected = connectedServers.entrySet().iterator();
         while (connected.hasNext()) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberBridgeServer.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberBridgeServer.java b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberBridgeServer.java
index 4cef371..b677cca 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberBridgeServer.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberBridgeServer.java
@@ -10,11 +10,10 @@ package com.gemstone.gemfire.admin;
 import com.gemstone.gemfire.cache.server.ServerLoadProbe;
 
 /**
- * Administrative interface that represents a {@link
- * com.gemstone.gemfire.cache.util.BridgeServer BridgeServer} that
+ * Administrative interface that represents a CacheServer that
  * serves the contents of a system member's cache. 
  *
- * @see SystemMemberCache#addBridgeServer
+ * @see SystemMemberCache#addCacheServer
  *
  * @author David Whitlock
  * @since 4.0

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCache.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCache.java b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCache.java
index 00749d6..14cf189 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCache.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCache.java
@@ -160,33 +160,6 @@ public interface SystemMemberCache {
   public void refresh();
 
   /**
-   * Adds a new, unstarted bridge server that will serve the contents
-   * of this cache.
-   *
-   * @see com.gemstone.gemfire.cache.Cache#addBridgeServer
-   *
-   * @since 4.0
-   * @deprecated as of 5.7 use {@link #addCacheServer} instead.
-   */
-  @Deprecated
-  public SystemMemberBridgeServer addBridgeServer()
-    throws AdminException;
-
-  /**
-   * Returns the bridge servers that run in this member's VM.  Note
-   * that this list will not be updated until {@link #refresh} is
-   * called.
-   *
-   * @see com.gemstone.gemfire.cache.Cache#getBridgeServers
-   *
-   * @since 4.0
-   * @deprecated as of 5.7 use {@link #getCacheServers} instead.
-   */
-  @Deprecated
-  public SystemMemberBridgeServer[] getBridgeServers()
-    throws AdminException;
-
-  /**
    * Adds a new, unstarted cache server that will serve the contents
    * of this cache to clients.
    *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java
index ca7f067..6058487 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java
@@ -373,7 +373,7 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
     throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
   }
 
-  public AdminBridgeServer addBridgeServer(CacheInfo cache)
+  public AdminBridgeServer addCacheServer(CacheInfo cache)
     throws AdminException {
 
     throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheImpl.java
index d823c5e..88792d8 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheImpl.java
@@ -235,14 +235,9 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
 
   public SystemMemberCacheServer addCacheServer()
     throws AdminException {
-    return (SystemMemberCacheServer)addBridgeServer();
-  }
-
-  public SystemMemberBridgeServer addBridgeServer()
-    throws AdminException {
 
-    AdminBridgeServer bridge = this.vm.addBridgeServer(this.info);
-    SystemMemberBridgeServer admin =
+    AdminBridgeServer bridge = this.vm.addCacheServer(this.info);
+    SystemMemberCacheServer admin =
       createSystemMemberBridgeServer(bridge);
     bridgeServers.put(bridge.getId(), admin);
     return admin;
@@ -280,14 +275,6 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
     return (SystemMemberCacheServer[]) bridges.toArray(array);
   };
 
-  public SystemMemberBridgeServer[] getBridgeServers()
-    throws AdminException {
-    Collection bridges = getCacheServersCollection();
-    SystemMemberBridgeServer[] array =
-      new SystemMemberBridgeServer[bridges.size()];
-    return (SystemMemberBridgeServer[]) bridges.toArray(array);
-  }
-
   /**
    * Creates a new instance of <Code>SystemMemberBridgeServer</code>
    * with the given configuration.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberCacheJmxImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberCacheJmxImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberCacheJmxImpl.java
index 8a7c582..8376719 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberCacheJmxImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberCacheJmxImpl.java
@@ -285,19 +285,6 @@ implements com.gemstone.gemfire.admin.jmx.internal.ManagedResource {
   }
 
   /**
-   * Creates a new bridge server MBean and returns its
-   * <code>ObjectName</code>.
-   *
-   * @since 4.0
-   * @deprecated as of 5.7
-   */
-  @Deprecated
-  public ObjectName manageBridgeServer()
-    throws AdminException, MalformedObjectNameException {
-    return manageCacheServer();
-  }
-  
-  /**
    * Returns the MBean <code>ObjectName</code>s for all cache servers
    * that serve this cache to clients.
    *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
index fb3343f..7acd72a 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
@@ -501,11 +501,6 @@ public class AttributesFactory<K,V> {
    */
   public void setCacheLoader(CacheLoader<K,V> cacheLoader)
   {
-    if (cacheLoader != null) {
-      if (AbstractRegion.isBridgeLoader(cacheLoader) && this.regionAttributes.getPoolName() != null) {
-        throw new IllegalStateException("A region with a pool name can not have a BridgeLoader or BridgeClient. Please use pools OR BridgeClient.");
-      }
-    }
     this.regionAttributes.cacheLoader = cacheLoader;
     this.regionAttributes.setHasCacheLoader(true);
   }
@@ -519,11 +514,6 @@ public class AttributesFactory<K,V> {
    */
   public void setCacheWriter(CacheWriter<K,V> cacheWriter)
   {
-    if (cacheWriter != null) {
-      if (AbstractRegion.isBridgeWriter(cacheWriter) &&  this.regionAttributes.getPoolName() != null) {
-        throw new IllegalStateException("A region with a pool name can not have a BridgeWriter or BridgeClient. Please use pools OR BridgeClient.");
-      }
-    }
     this.regionAttributes.cacheWriter = cacheWriter;
     this.regionAttributes.setHasCacheWriter(true);
   }
@@ -1285,8 +1275,6 @@ public class AttributesFactory<K,V> {
    * @param name the name of the connection pool to use; if <code>null</code>
    * or <code>""</code> then the connection pool is disabled for regions
    * using these attributes.
-   * @throws IllegalStateException if a cache loader or cache writer has already
-   * been set.
    * @since 5.7
    */
   public void setPoolName(String name) {
@@ -1294,17 +1282,6 @@ public class AttributesFactory<K,V> {
     if ("".equals(nm)) {
       nm = null;
     }
-    if (nm != null) {
-      // make sure a cache listener or writer has not already been installed
-      if (this.regionAttributes.getCacheLoader() != null 
-          && AbstractRegion.isBridgeLoader(this.regionAttributes.getCacheLoader())) {
-        throw new IllegalStateException("A region with a bridge loader can not have a pool name.");
-      }
-      if (this.regionAttributes.getCacheWriter() != null 
-          && AbstractRegion.isBridgeWriter(this.regionAttributes.getCacheWriter())) {
-        throw new IllegalStateException("A region with a bridge writer can not have a pool name.");
-      }
-    }
     this.regionAttributes.poolName = nm;
     this.regionAttributes.setHasPoolName(true);
     
@@ -1547,14 +1524,6 @@ public class AttributesFactory<K,V> {
         throw new IllegalStateException(LocalizedStrings.AttributesFactory_IF_THE_MEMBERSHIP_ATTRIBUTES_HAS_REQUIRED_ROLES_THEN_SCOPE_MUST_NOT_BE_LOCAL.toLocalizedString());
       }
     }
-    if (attrs.getPoolName() != null) {
-      if (attrs.getCacheLoader() != null && AbstractRegion.isBridgeLoader(attrs.getCacheLoader())) {
-        throw new IllegalStateException("A region with a pool name can not have a BridgeLoader or BridgeClient. Please use pools OR BridgeClient.");
-      }
-      if (attrs.getCacheWriter() != null && AbstractRegion.isBridgeWriter(attrs.getCacheWriter())) {
-        throw new IllegalStateException("A region with a pool name can not have a BridgeWriter or BridgeClient. Please use pools OR BridgeClient.");
-      }
-    }
     
     final PartitionAttributes pa = attrs.getPartitionAttributes();
     // Validations for PartitionRegion Attributes

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
index 72a5555..c6495d0 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
@@ -19,7 +19,6 @@ import com.gemstone.gemfire.cache.client.Pool;
 import com.gemstone.gemfire.cache.hdfs.HDFSStoreFactory;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache.snapshot.CacheSnapshotService;
-import com.gemstone.gemfire.cache.util.BridgeServer;
 import com.gemstone.gemfire.cache.util.GatewayConflictResolver;
 import com.gemstone.gemfire.cache.wan.GatewayReceiver;
 import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
@@ -237,18 +236,6 @@ public interface Cache extends GemFireCache {
   public void setSearchTimeout(int seconds);
 
   /**
-   * Creates a new bridge server with the default configuration.
-   *
-   * @see com.gemstone.gemfire.cache.util.BridgeLoader
-   * @see com.gemstone.gemfire.cache.util.BridgeWriter
-   *
-   * @since 4.0
-   * @deprecated as of 5.7 use {@link #addCacheServer} instead.
-   */
-  @Deprecated
-  public BridgeServer addBridgeServer();
-
-  /**
    * Creates a new cache server, with the default configuration,
    * that will allow clients to access this cache.
    * <p>For the default configuration see the constants in
@@ -260,20 +247,6 @@ public interface Cache extends GemFireCache {
   public CacheServer addCacheServer();
 
   /**
-   * Returns a collection of all of the <code>BridgeServer</code>s
-   * that can serve the contents of this <code>Cache</code>.
-   * <p>Since <code>5.7</code> this method returns a <code>List</code
-   * instead of a <code>Collection</code>.
-   *
-   * @see #addBridgeServer
-   *
-   * @since 4.0
-   * @deprecated as of 5.7 use {@link #getCacheServers} instead.
-   */
-  @Deprecated
-  public List<CacheServer> getBridgeServers();
-
-  /**
    * Returns a collection of all of the <code>CacheServer</code>s
    * that can serve the contents of this <code>Cache</code> to clients.
    *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionFactory.java
index 4922df9..8239ea2 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionFactory.java
@@ -22,7 +22,6 @@ import com.gemstone.gemfire.SystemFailure;
 import com.gemstone.gemfire.cache.client.Pool;
 import com.gemstone.gemfire.cache.client.PoolManager;
 import com.gemstone.gemfire.cache.client.internal.ServerRegionProxy;
-import com.gemstone.gemfire.cache.util.BridgeWriter;
 import com.gemstone.gemfire.cache.wan.GatewaySender;
 import com.gemstone.gemfire.distributed.DistributedMember;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
@@ -100,7 +99,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
  * <p>
  * Notes:
  * <ul>
- * <li>DynamicRegionFactories in non-client VMs must not be configured with a BridgeWriter.
+ * <li>DynamicRegionFactories in non-client VMs must not be configured with a pool.
  * <li>If {@link #open()} is called before cache creation and the cache.xml has a dynamic-region-factory
  * element then the cache.xml will override the open call's configuration.
  * 
@@ -110,7 +109,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
  * are shared by the parent and all its dynamic children
  * so make sure the callback is thread-safe and that its
  * {@link CacheCallback#close} implementation does not stop it from functioning.
- * However the products BridgeLoader, BridgeWriter, and all LRUAlgorithm instances will
+ * However the products LRUAlgorithm instances will
  * be cloned so that each dynamic Region has its own callback.
  * 
  * <li>The root Region name "DynamicRegions" is reserved. The factory creates a root Region of
@@ -223,7 +222,7 @@ public abstract class DynamicRegionFactory  {
     try {
       this.c = theCache;
       this.dynamicRegionList = theCache.getRegion(dynamicRegionListName);
-      final boolean isClient = this.config.getBridgeWriter() != null || this.config.getPoolName()!=null;
+      final boolean isClient = this.config.getPoolName()!=null;
       if (this.dynamicRegionList == null) {
         InternalRegionArguments ira = new InternalRegionArguments()
         .setDestroyLockFlag(true)
@@ -239,7 +238,6 @@ public abstract class DynamicRegionFactory  {
         }
 
         if (isClient) {
-          // BRIDGE CLIENT
           af.setScope(Scope.LOCAL);
           af.setDataPolicy(DataPolicy.NORMAL); //MirrorType(MirrorType.NONE);
           af.setStatisticsEnabled(true);
@@ -254,12 +252,6 @@ public abstract class DynamicRegionFactory  {
               }
               af.setPoolName(cpName);
             }
-          } else {
-            BridgeWriter bw = this.config.getBridgeWriter();
-            if (!bw.hasEstablishCallbackConnection()) {
-              throw new IllegalStateException(LocalizedStrings.DynamicRegionFactory_THE_CLIENT_POOL_OF_A_DYNAMICREGIONFACTORY_MUST_BE_CONFIGURED_WITH_ESTABLISHCALLBACKCONNECTION_SET_TO_TRUE.toLocalizedString());
-            }
-            af.setCacheWriter(bw);
           }
           ira.setInternalMetaRegion(new LocalMetaRegion(af.create(), ira));
         } else {
@@ -667,7 +659,7 @@ public abstract class DynamicRegionFactory  {
    * The default attributes are:
    * <ul>
    * <li>diskDir: <code>null</code>
-   * <li>bridgeWriter: <code>null</code>
+   * <li>poolName: <code>null</code>
    * <li>persistBackup: <code>true</code>
    * <li>registerInterest: <code>true</code>
    * </ul>
@@ -683,16 +675,10 @@ public abstract class DynamicRegionFactory  {
     public final File diskDir;
     /** Causes regions created by the factory to register interest in all keys in a corresponding server cache region */
     public final boolean registerInterest;
-    /** The {@link BridgeWriter} to be used by the factory to communicate with
-     * the factory in its server.
-     * Client factories must configure a BridgeWriter for their factory
-     * and it must be configured to establish a callback connection.
-     */
-    public final BridgeWriter bridgeWriter;
     
     /**
-     * The ${link Pool} to be used by the factory to communicate with 
-     * the server-side factory. Client factories may use this instead of a BridgeWriter 
+     * The ${link Pool} to be used by a client factory to communicate with 
+     * the server-side factory.
      */
     public final String poolName;
 
@@ -700,47 +686,15 @@ public abstract class DynamicRegionFactory  {
      * Creates a configuration with the default attributes.
      */
     public Config() {
-      this(null, null, !DISABLE_PERSIST_BACKUP);
-    }
-    /**
-     * Creates a configuration with the given attributes and defaults for other attributes.
-     * @deprecated use a pool name instead of a bridge writer
-     */
-    @Deprecated
-    public Config(File diskDir, BridgeWriter bridgeWriter) {
-      this(diskDir, bridgeWriter, !DISABLE_PERSIST_BACKUP);
+      this(null, null, !DISABLE_PERSIST_BACKUP, !DISABLE_REGISTER_INTEREST);
     }
-    
+
     /**
-     * Creates a configuration with the given attributes and defaults for other attributes.
-     * @deprecated use a pool name instead of a bridge writer
+     * Creates a configuration with defaults and the given diskDir and poolName.
      */
-    @Deprecated
-    public Config(File diskDir, BridgeWriter bridgeWriter, boolean persistBackup) {
-      this(diskDir, bridgeWriter, persistBackup, !DISABLE_REGISTER_INTEREST);
+    public Config(File diskDir, String poolName) {
+      this(diskDir, poolName, !DISABLE_PERSIST_BACKUP, !DISABLE_REGISTER_INTEREST);
     }
-    
-    
-    
-    /**
-     * Creates a configuration with the given attributes
-     * @deprecated use a pool name instead of a bridge writer
-     */
-    @Deprecated
-    public Config(
-      File diskDir,
-      BridgeWriter bridgeWriter,
-      boolean persistBackup,
-      boolean registerInterest)
-    {
-      this.registerInterest = registerInterest;
-      this.persistBackup = persistBackup;
-      this.diskDir = diskDir;
-      this.bridgeWriter = bridgeWriter;
-      this.poolName = null;
-    }
-    
-
     /**
      * Creates a configuration with the given attributes
      */
@@ -754,7 +708,43 @@ public abstract class DynamicRegionFactory  {
       this.persistBackup = persistBackup;
       this.diskDir = diskDir;
       this.poolName = poolName;
-      this.bridgeWriter = null;
+    }
+
+    @Override
+    public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((diskDir == null) ? 0 : diskDir.hashCode());
+      result = prime * result + (persistBackup ? 1231 : 1237);
+      result = prime * result + ((poolName == null) ? 0 : poolName.hashCode());
+      result = prime * result + (registerInterest ? 1231 : 1237);
+      return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj)
+        return true;
+      if (obj == null)
+        return false;
+      if (getClass() != obj.getClass())
+        return false;
+      Config other = (Config) obj;
+      if (diskDir == null) {
+        if (other.diskDir != null)
+          return false;
+      } else if (!diskDir.equals(other.diskDir))
+        return false;
+      if (persistBackup != other.persistBackup)
+        return false;
+      if (poolName == null) {
+        if (other.poolName != null)
+          return false;
+      } else if (!poolName.equals(other.poolName))
+        return false;
+      if (registerInterest != other.registerInterest)
+        return false;
+      return true;
     }
 
     /**
@@ -782,14 +772,6 @@ public abstract class DynamicRegionFactory  {
       return this.diskDir;
     }
     
-    /**
-     * Returns the {@link BridgeWriter} associated with the dynamic region factory.
-     * Returns null if there is no cache writer for dynamic regions.
-     * A cache writer will only exist if this is a client and the cache writer connects to a server.
-     */
-    public BridgeWriter getBridgeWriter() {
-      return this.bridgeWriter;
-    }
     
     /**
      * Returns the name of the {@link Pool} associated with the dynamic region factory.
@@ -803,7 +785,6 @@ public abstract class DynamicRegionFactory  {
     Config(Config conf) {
       this.diskDir = conf.diskDir;
       this.persistBackup = conf.persistBackup;
-      this.bridgeWriter = conf.bridgeWriter;
       this.registerInterest = conf.registerInterest;
       this.poolName = conf.poolName;
     }
@@ -814,7 +795,7 @@ public abstract class DynamicRegionFactory  {
       return;
     
     // Ignore the callback if it originated in this process (because the region
-    // will already have been created) and the event is not a bridge event
+    // will already have been created) and the event is not a client event
     if ( !event.isOriginRemote() && !event.isBridgeEvent() ) return;
     //
     DynamicRegionAttributes dra = (DynamicRegionAttributes)event.getNewValue();
@@ -913,7 +894,7 @@ public abstract class DynamicRegionFactory  {
     @Override
     protected boolean shouldNotifyBridgeClients()
     {
-      return getCache().getBridgeServers().size() > 0;
+      return getCache().getCacheServers().size() > 0;
     }
 
     // Over-ride the super behavior to perform the destruction of the dynamic region
@@ -1024,7 +1005,7 @@ public abstract class DynamicRegionFactory  {
     @Override
     final public boolean shouldNotifyBridgeClients()
     {
-      return getCache().getBridgeServers().size() > 0;
+      return getCache().getCacheServers().size() > 0;
     }    
    
     // Over-ride the super behavior to perform the destruction of the dynamic region

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/PoolFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/PoolFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/PoolFactory.java
index 547971f..5c29938 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/PoolFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/PoolFactory.java
@@ -17,7 +17,7 @@ import com.gemstone.gemfire.cache.query.*; // for javadocs
  * {@link Pool}.
  * <p>Every pool needs to have at least one {@link #addLocator locator} or {@link #addServer server} added
  * to it. Locators should be added unless direct connections to
- * bridge servers are desired.
+ * cache servers are desired.
  * <p>The setter methods are used to specify
  * non-default values for the other pool properties.
  * <p>Once it is configured {@link #create}
@@ -290,7 +290,7 @@ public interface PoolFactory {
    * 
    * These pings are used by the server to monitor the health of
    * the client. Make sure that the pingInterval is less than the 
-   * maximum time between pings allowed by the bridge server.
+   * maximum time between pings allowed by the cache server.
    * @param pingInterval The amount of time in milliseconds between
    * pings.
    * @return a reference to <code>this</code>
@@ -325,7 +325,7 @@ public interface PoolFactory {
   /**
    * Add a locator, given its host and port, to this factory.
    * The locator must be a server locator and will be used to discover other running
-   * bridge servers and locators.
+   * cache servers and locators.
    * Note that if the host is unknown at the time of this call
    * the locator will still be added. When the pool is used for
    * an operation if the host is still unknown an exception will
@@ -341,7 +341,7 @@ public interface PoolFactory {
 
   /**
    * Add a server, given its host and port, to this factory.
-   * The server must be a bridge server and this client will
+   * The server must be a cache server and this client will
    * directly connect to without consulting a server locator.
    * Note that if the host is unknown at the time of this call
    * the server will still be added. When the pool is used for
@@ -392,7 +392,7 @@ public interface PoolFactory {
   
   /**
    * Sets the interval in milliseconds
-   * to wait before sending acknowledgements to the bridge server for
+   * to wait before sending acknowledgements to the cache server for
    * events received from the server subscriptions.
    * 
    * @param ackInterval number of milliseconds to wait before sending event

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java
index ab11517..32f184e 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java
@@ -19,7 +19,7 @@ import com.gemstone.gemfire.cache.client.ServerOperationException;
 import com.gemstone.gemfire.distributed.internal.DistributionManager;
 import com.gemstone.gemfire.internal.HeapDataOutputStream;
 import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.internal.cache.BridgeServerImpl;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
 import com.gemstone.gemfire.internal.cache.PutAllPartialResultException;
 import com.gemstone.gemfire.internal.cache.TXManagerImpl;
 import com.gemstone.gemfire.internal.cache.tier.MessageType;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/BridgePoolImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/BridgePoolImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/BridgePoolImpl.java
deleted file mode 100644
index 25abf2d..0000000
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/BridgePoolImpl.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.cache.client.internal;
-
-import java.util.Properties;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.logging.log4j.Logger;
-
-import com.gemstone.gemfire.CancelException;
-import com.gemstone.gemfire.cache.CacheLoaderException;
-import com.gemstone.gemfire.cache.CacheWriterException;
-import com.gemstone.gemfire.cache.NoSubscriptionServersAvailableException;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.client.Pool;
-import com.gemstone.gemfire.cache.client.PoolManager;
-import com.gemstone.gemfire.cache.client.ServerConnectivityException;
-import com.gemstone.gemfire.cache.client.SubscriptionNotEnabledException;
-import com.gemstone.gemfire.cache.client.internal.GetOp.GetOpImpl;
-import com.gemstone.gemfire.cache.util.BridgeWriterException;
-import com.gemstone.gemfire.cache.util.EndpointDoesNotExistException;
-import com.gemstone.gemfire.cache.util.EndpointExistsException;
-import com.gemstone.gemfire.cache.util.EndpointInUseException;
-import com.gemstone.gemfire.distributed.internal.ServerLocation;
-import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
-import com.gemstone.gemfire.internal.cache.PoolManagerImpl;
-import com.gemstone.gemfire.internal.cache.tier.ConnectionProxy;
-import com.gemstone.gemfire.internal.cache.tier.sockets.AcceptorImpl;
-import com.gemstone.gemfire.internal.logging.LogService;
-
-/**
- * A pool for use by the old BridgeLoader/BridgeWriter.
- * This class can go away once we drop these deprecated classes
- * 
- * @author darrel
- * @since 5.7
- */
-@SuppressWarnings("deprecation")
-public class BridgePoolImpl extends PoolImpl implements ConnectionProxy {
-  private static final Logger logger = LogService.getLogger();
-  
-  private static final AtomicInteger ID_COUNTER = new AtomicInteger();
-  public static final int DEFAULT_CONNECTIONSPERSERVER = 1;
-  public static final int DEFAULT_HANDSHAKE_TIMEOUT = AcceptorImpl.DEFAULT_HANDSHAKE_TIMEOUT_MS;
-  public static final String DEFAULT_LBPOLICY = LBPolicy.STICKY_PROPERTY_NAME;
-  
-  //this field is only set to true when the cache is closing with
-  //keep alive set to true.
-  private boolean keepAlive;
-
-  private static int getBridgePoolId() {
-    return ID_COUNTER.incrementAndGet();
-  }
-  
-  public static BridgePoolImpl create(Properties props, boolean usedByBridgeWriter) {
-    return create(props, usedByBridgeWriter, false/*usedByGateway*/);
-  }
-
-  public static BridgePoolImpl create(Properties props, boolean usedByBridgeWriter,
-                                      boolean usedByGateway) {
-    
-    String name = (usedByGateway ? "GatewayPool-" : "BridgePool-") + getBridgePoolId();
-    PoolFactoryImpl pf = (PoolFactoryImpl)PoolManager.createFactory();
-    pf.init(props, usedByBridgeWriter, usedByGateway);
-    BridgePoolImpl result = (BridgePoolImpl)pf.create(name);
-    if (!result.isDestroyed()) {
-      result.attach();
-    }
-    return result;
-  }
-  /**
-   * Should only be called by PoolFactoryImpl#create.
-   * All other creators should use the static create method
-   */
-  public BridgePoolImpl(PoolManagerImpl pm, String name, Pool attributes) {
-    super(pm, name, attributes);
-    finishCreate(pm); // do this last since we are escaping the constructor
-  }
-  public static void loadEmergencyClasses() {
-    // nyi
-  }
-
-  ////////////////// ConnectionProxy methods ////////////////////
-  /**
-   * Initializes this <code>ConnectionProxy</code> according to the
-   * given properties.
-   */
-  public void initialize(Properties p) {
-    throw new IllegalStateException("nyi");
-  }
-
-
-
-  public void finalizeProxy() {
-    detach();
-    if (getAttachCount() <= 0) {
-      destroy(keepAlive);
-    }
-  }
-
-
-  /**
-   * Returns the load balancing policy in effect for this connection
-   * proxy.
-   */
-  public String getLBPolicy() {
-    if (getThreadLocalConnections()) {
-      return "Sticky";
-    } else {
-      return "RoundRobin";
-    }
-  }
-
-
-  /**
-   * Returns the number of milliseconds to wait before re-connecting
-   * to a dead server.
-   */
-  public int getRetryInterval() {
-    return (int)getPingInterval();
-  }
-
-
-  /**
-   * Closes this connection proxy and all of its connections
-   */
-  public void close() {
-    if (logger.isDebugEnabled()) {
-      logger.debug("BridgePoolImpl - closing");
-    }
-    finalizeProxy();
-  }
-
-
-  /**
-   * Returned true if this ConnectionProxy has been initialized and not closed.
-   */
-  public boolean isOpen() {
-    return !isDestroyed();
-  }
-
-
-  /**
-   * Update bookkeeping on this proxy associated with the loss of a region.
-   * In particular, remove all region interests.
-   */
-  public void detachRegion(Region r) {
-    // nyi
-  }
-
-
-  /**
-   * Returns the number of {@link Connection}s that should be created
-   * to every cache server.
-   */
-  public int getConnectionsPerServer() {
-    return getMinConnections();
-  }
-
-
-  /**
-   * Notes that the server with the given name is unavailable
-   */
-  public void setServerUnavailable(String name) {
-    throw new IllegalStateException("nyi");
-  }
-
-
-  /**
-   * Notes that the server with the given name is available
-   */
-  public void setServerAvailable(String name) {
-    throw new IllegalStateException("nyi");
-  }
-
-
-  /**
-   * Stops this connection proxy and
-   */
-  public void terminate() {
-    finalizeProxy();
-  }
-
-
-  /**
-   * Releases the connection associated with the current thread
-   */
-  public void release() {
-    // nyi
-  }
-
-  /**
-   * Returns value of establishCallbackConnection property.
-   * @since 4.2.3
-   */
-  public boolean getEstablishCallbackConnection() {
-    return getSubscriptionEnabled();
-  }
-
-
-  /**
-   * Add an <code>Endpoint</code> to the known <code>Endpoint</code>s.
-   *
-   * @param name The name of the endpoint to add
-   * @param host The host name or ip address of the endpoint to add
-   * @param port The port of the endpoint to add
-   *
-   * @throws EndpointExistsException if the <code>Endpoint</code> to be
-   * added already exists.
-   *
-   * @since 5.0.2
-   */
-  public void addEndpoint(String name, String host, int port)
-  throws EndpointExistsException {
-    ((ExplicitConnectionSourceImpl)getConnectionSource()).addEndpoint(host,port);
-  }
-
-
-  /**
-   * Remove an <code>Endpoint</code> from the dead <code>Endpoint</code>s.
-   * The specified <code>Endpoint</code> must be dead.
-   *
-   * @param name The name of the endpoint to remove
-   * @param host The host name or ip address of the endpoint to remove
-   * @param port The port of the endpoint to remove
-   *
-   * @throws EndpointDoesNotExistException if the <code>Endpoint</code> to be
-   * removed doesn't exist.
-   *
-   * @since 5.0.2
-   */
-  public void removeEndpoint(String name, String host, int port)
-  throws EndpointDoesNotExistException,EndpointInUseException {
-    ((ExplicitConnectionSourceImpl)getConnectionSource()).removeEndpoint(host,port);
-  }
-
-
-  /**
-   * @return Returns the redundancy number
-   * @since 5.1
-   */
-  public int getRedundancyLevel() {
-    return getSubscriptionRedundancy();
-  }
-
-  /**
-   * The configurable expiry time of last received sequence ID
-   *
-   * @return The configurable expiry time of last received sequence ID
-   */
-  public long getMessageTrackingTimeout() {
-    return getSubscriptionMessageTrackingTimeout();
-  }
-
-  public void reuse() {
-    attach();
-  }
-  
-  
-  public static boolean isLoaderOp(Op op) {
-    return op instanceof GetOpImpl;
-  }
-
-  private RuntimeException transformException(RuntimeException ex, Op op) {
-    if(isLoaderOp(op)) {
-      if (ex instanceof SubscriptionNotEnabledException) {
-        return new CacheLoaderException("establishCallbackConnection must be set to true", ex);
-      } else if (ex instanceof CacheLoaderException) {
-        return ex;
-      } else if (ex instanceof CancelException) {
-        return ex;
-      } else if (ex instanceof ServerConnectivityException && ex.getCause() != null) {
-        return new CacheLoaderException(ex.getCause());
-      } else {
-        return new CacheLoaderException(ex);
-      }
-    }
-    else {
-      if (ex instanceof SubscriptionNotEnabledException) {
-        return new BridgeWriterException("establishCallbackConnection must be set to true", ex);
-      } else if (ex instanceof CacheWriterException) {
-        return ex;
-      } else if (ex instanceof CancelException) {
-        return ex;
-      } else if (ex instanceof ServerConnectivityException && ex.getCause() != null) {
-        return new BridgeWriterException(ex.getCause());
-      } else {
-        return new BridgeWriterException(ex);
-      }
-    }
-  }
-  
-  @Override
-  public Object execute(Op op) {
-    try {
-      return super.execute(op);
-    } catch (RuntimeException ex) {
-      throw transformException(ex, op);
-    }
-  }
-
-  @Override
-  public Object executeOn(ServerLocation server, Op op) {
-    try {
-      return super.executeOn(server, op);
-    } catch (RuntimeException ex) {
-      throw transformException(ex, op);
-    }
-  }
-  
-  @Override
-  public Object executeOn(Connection con, Op op) {
-    try {
-      return super.executeOn(con, op);
-    } catch (RuntimeException ex) {
-      throw transformException(ex, op);
-    }
-  }
-
-  @Override
-  public Object executeOn(Connection con, Op op, boolean timeoutFatal) {
-    try {
-      return super.executeOn(con, op, timeoutFatal);
-    } catch (RuntimeException ex) {
-      throw transformException(ex, op);
-    }
-  }
-
-  @Override
-  public Object executeOnQueuesAndReturnPrimaryResult(Op op) {
-    try {
-      return super.executeOnQueuesAndReturnPrimaryResult(op);
-    } catch (RuntimeException ex) {
-      throw transformException(ex, op);
-    }
-  }
-
-  @Override
-  public void executeOnAllQueueServers(Op op)
-    throws NoSubscriptionServersAvailableException, SubscriptionNotEnabledException {
-    try {
-      super.executeOnAllQueueServers(op);
-    } catch (RuntimeException ex) {
-      throw transformException(ex, op);
-    }
-  }
-
-  @Override
-  public Object executeOnPrimary(Op op) {
-    try {
-      return super.executeOnPrimary(op);
-    } catch (RuntimeException ex) {
-      throw transformException(ex, op);
-    }
-  }
-  public void setKeepAlive(boolean keepAlive) {
-    this.keepAlive = keepAlive;
-  }
-  
-  /** ******** INNER CLASSES ************************* */
-  public static class LBPolicy
-  {
-    public static final String STICKY_PROPERTY_NAME = "Sticky";
-
-    public static final String RANDOMSTICKY_PROPERTY_NAME = "RandomSticky";
-
-    public static final String ROUNDROBIN_PROPERTY_NAME = "RoundRobin";
-
-    public static final String RANDOM_PROPERTY_NAME = "Random";
-
-    public static final String APPASSISTED_PROPERTY_NAME = "AppAssisted";
-
-    public static final int STICKY = 0;
-
-    public static final int ROUNDROBIN = 1;
-
-    public static final int APPASSISTED = 2;
-
-    public static final int RANDOM = 3;
-
-    public static final int RANDOMSTICKY = 4;
-
-    public final int thePolicy;
-
-    public LBPolicy(String name) {
-      if (name.equalsIgnoreCase(STICKY_PROPERTY_NAME)) {
-        this.thePolicy = STICKY;
-      }
-      else if (name.equalsIgnoreCase(ROUNDROBIN_PROPERTY_NAME)) {
-        this.thePolicy = ROUNDROBIN;
-      }
-      else if (name.equalsIgnoreCase(APPASSISTED_PROPERTY_NAME)) {
-        this.thePolicy = APPASSISTED;
-      }
-      else if (name.equalsIgnoreCase(RANDOM_PROPERTY_NAME)) {
-        this.thePolicy = RANDOM;
-      }
-      else if (name.equalsIgnoreCase(RANDOMSTICKY_PROPERTY_NAME)) {
-        this.thePolicy = RANDOMSTICKY;
-      }
-      else {
-        this.thePolicy = STICKY; // DEFAULT
-      }
-    }
-
-    public int getPolicy()
-    {
-      return this.thePolicy;
-    }
-
-    public boolean isSticky() {
-      return getPolicy() == STICKY || getPolicy() == RANDOMSTICKY;
-    }
-
-    public boolean isRandom() {
-      return getPolicy() == RANDOM || getPolicy() == RANDOMSTICKY;
-    }
-
-    public String getPolicyPropertyName(int pol)
-    {
-      String retStr;
-      switch (pol) {
-      case STICKY:
-        retStr = STICKY_PROPERTY_NAME;
-        break;
-      case ROUNDROBIN:
-        retStr = ROUNDROBIN_PROPERTY_NAME;
-        break;
-      case APPASSISTED:
-        retStr = APPASSISTED_PROPERTY_NAME;
-        break;
-      case RANDOM:
-        retStr = RANDOM_PROPERTY_NAME;
-        break;
-      case RANDOMSTICKY:
-        retStr = RANDOMSTICKY_PROPERTY_NAME;
-        break;
-      default:
-        return Integer.toString(pol);
-      }
-      return retStr;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-      if (obj == this) {
-        return true;
-      }
-
-      if (obj instanceof LBPolicy) {
-        LBPolicy other = (LBPolicy)obj;
-        return this.thePolicy == other.thePolicy;
-      }
-      else {
-        return false;
-      }
-    }
-
-    @Override
-    public int hashCode()
-    {
-      return this.thePolicy;
-    }
-
-    @Override
-    public String toString()
-    {
-      return getPolicyPropertyName(this.thePolicy);
-    }
-  }
-
-  
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/BridgeServerLoadMessage.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/BridgeServerLoadMessage.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/BridgeServerLoadMessage.java
deleted file mode 100644
index a419216..0000000
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/BridgeServerLoadMessage.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.cache.client.internal;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.cache.server.ServerLoad;
-import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.InternalLocator;
-import com.gemstone.gemfire.distributed.internal.SerialDistributionMessage;
-import com.gemstone.gemfire.distributed.internal.ServerLocation;
-import com.gemstone.gemfire.distributed.internal.ServerLocator;
-import com.gemstone.gemfire.internal.InternalDataSerializer;
-
-/**
- * A message from bridge server to locator to update the locator
- * with new load information from the bridge server.
- * Also includes the id of any clients whose estimate is no
- * longer needed on the server-locator.
- * @author dsmith
- * @since 5.7
- *
- */
-public class BridgeServerLoadMessage extends SerialDistributionMessage {
-  protected ServerLoad load;
-  protected ServerLocation location;
-  protected ArrayList clientIds;
-
-  public BridgeServerLoadMessage() {
-    super();
-  }
-  
-  public BridgeServerLoadMessage(ServerLoad load, ServerLocation location,
-                                 ArrayList clientIds) {
-    super();
-    this.load = load;
-    this.location = location;
-    this.clientIds = clientIds;
-  }
-
-  @Override
-  protected void process(DistributionManager dm) {
-    updateLocalLocators();
-  }
-
-  public void updateLocalLocators() {
-    List locators = Locator.getLocators();
-    for (int i=0; i < locators.size(); i++) {
-      InternalLocator l = (InternalLocator)locators.get(i);
-      ServerLocator serverLocator = l.getServerLocatorAdvisee();
-      if(serverLocator != null) {
-        serverLocator.updateLoad(location, load, this.clientIds);
-      }
-    }
-  }
-  
-  
-
-  public int getDSFID() {
-   return BRIDGE_SERVER_LOAD_MESSAGE;
-  }
-
-  @Override
-  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
-    super.fromData(in);
-    load = new ServerLoad();
-    InternalDataSerializer.invokeFromData(load, in);
-    location = new ServerLocation();
-    InternalDataSerializer.invokeFromData(location, in);
-    this.clientIds = DataSerializer.readArrayList(in);
-  }
-
-  @Override
-  public void toData(DataOutput out) throws IOException {
-    super.toData(out);
-    InternalDataSerializer.invokeToData(load, out);
-    InternalDataSerializer.invokeToData(location, out);
-    DataSerializer.writeArrayList(this.clientIds, out);
-  }
-
-  @Override
-  protected Object clone() throws CloneNotSupportedException {
-    return super.clone();
-  }
-  
-  
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage.java
new file mode 100644
index 0000000..e4f63dc
--- /dev/null
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage.java
@@ -0,0 +1,99 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.gemstone.gemfire.DataSerializer;
+import com.gemstone.gemfire.cache.server.ServerLoad;
+import com.gemstone.gemfire.distributed.Locator;
+import com.gemstone.gemfire.distributed.internal.DistributionManager;
+import com.gemstone.gemfire.distributed.internal.InternalLocator;
+import com.gemstone.gemfire.distributed.internal.SerialDistributionMessage;
+import com.gemstone.gemfire.distributed.internal.ServerLocation;
+import com.gemstone.gemfire.distributed.internal.ServerLocator;
+import com.gemstone.gemfire.internal.InternalDataSerializer;
+
+/**
+ * A message from a server to a locator to update the locator
+ * with new load information from the server.
+ * Also includes the id of any clients whose estimate is no
+ * longer needed on the server-locator.
+ * @author dsmith
+ * @since 5.7
+ *
+ */
+public class CacheServerLoadMessage extends SerialDistributionMessage {
+  protected ServerLoad load;
+  protected ServerLocation location;
+  protected ArrayList clientIds;
+
+  public CacheServerLoadMessage() {
+    super();
+  }
+  
+  public CacheServerLoadMessage(ServerLoad load, ServerLocation location,
+                                 ArrayList clientIds) {
+    super();
+    this.load = load;
+    this.location = location;
+    this.clientIds = clientIds;
+  }
+
+  @Override
+  protected void process(DistributionManager dm) {
+    updateLocalLocators();
+  }
+
+  public void updateLocalLocators() {
+    List locators = Locator.getLocators();
+    for (int i=0; i < locators.size(); i++) {
+      InternalLocator l = (InternalLocator)locators.get(i);
+      ServerLocator serverLocator = l.getServerLocatorAdvisee();
+      if(serverLocator != null) {
+        serverLocator.updateLoad(location, load, this.clientIds);
+      }
+    }
+  }
+  
+  
+
+  public int getDSFID() {
+   return CACHE_SERVER_LOAD_MESSAGE;
+  }
+
+  @Override
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+    super.fromData(in);
+    load = new ServerLoad();
+    InternalDataSerializer.invokeFromData(load, in);
+    location = new ServerLocation();
+    InternalDataSerializer.invokeFromData(location, in);
+    this.clientIds = DataSerializer.readArrayList(in);
+  }
+
+  @Override
+  public void toData(DataOutput out) throws IOException {
+    super.toData(out);
+    InternalDataSerializer.invokeToData(load, out);
+    InternalDataSerializer.invokeToData(location, out);
+    DataSerializer.writeArrayList(this.clientIds, out);
+  }
+
+  @Override
+  protected Object clone() throws CloneNotSupportedException {
+    return super.clone();
+  }
+  
+  
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyOp.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyOp.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyOp.java
index 7dc0eaa..dbcc7ed 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyOp.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyOp.java
@@ -15,7 +15,6 @@ import com.gemstone.gemfire.cache.Operation;
 import com.gemstone.gemfire.cache.client.AllConnectionsInUseException;
 import com.gemstone.gemfire.cache.client.ServerConnectivityException;
 import com.gemstone.gemfire.cache.client.ServerOperationException;
-import com.gemstone.gemfire.cache.util.BridgeWriterException;
 import com.gemstone.gemfire.distributed.internal.ServerLocation;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.EntryEventImpl;
@@ -80,10 +79,6 @@ public class DestroyOp {
           }
           cms.removeBucketServerLocation(server);
         }
-        catch (BridgeWriterException e) {
-          if (e.getCause() instanceof ServerConnectivityException)
-            cms.removeBucketServerLocation(server);
-        }
       }
     }
     return pool.execute(op);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/EndpointManagerImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/EndpointManagerImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/EndpointManagerImpl.java
index 5bf3a48..e4741de 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/EndpointManagerImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/EndpointManagerImpl.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.distributed.internal.ServerLocation;
 import com.gemstone.gemfire.internal.DummyStatisticsFactory;
 import com.gemstone.gemfire.internal.cache.PoolStats;
 import com.gemstone.gemfire.internal.cache.execute.TransactionFunctionService;
-import com.gemstone.gemfire.internal.cache.tier.InternalBridgeMembership;
+import com.gemstone.gemfire.internal.cache.tier.InternalClientMembership;
 import com.gemstone.gemfire.internal.logging.LogService;
 
 /**
@@ -274,7 +274,7 @@ public class EndpointManagerImpl implements EndpointManager {
         return;
       }
       //logger.warn("EMANFIRE:CRASH:"+endpoint.getLocation());
-      InternalBridgeMembership.notifyCrashed(endpoint.getMemberId(), false);
+      InternalClientMembership.notifyCrashed(endpoint.getMemberId(), false);
     }
 
     public void endpointNoLongerInUse(Endpoint endpoint) {
@@ -282,7 +282,7 @@ public class EndpointManagerImpl implements EndpointManager {
         return;
       }
       //logger.warn("EMANFIRE:LEFT:"+endpoint.getLocation());
-      InternalBridgeMembership.notifyLeft(endpoint.getMemberId(), false);
+      InternalClientMembership.notifyLeft(endpoint.getMemberId(), false);
     }
 
     public void endpointNowInUse(Endpoint endpoint) {
@@ -290,7 +290,7 @@ public class EndpointManagerImpl implements EndpointManager {
         return;
       }
       //logger.warn("EMANFIRE:JOIN:"+endpoint.getLocation()+" mid:"+endpoint.getMemberId(),new Exception());
-      InternalBridgeMembership.notifyJoined(endpoint.getMemberId(), false);
+      InternalClientMembership.notifyJoined(endpoint.getMemberId(), false);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExplicitConnectionSourceImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExplicitConnectionSourceImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExplicitConnectionSourceImpl.java
index a1bdc16..9e2b6ca 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExplicitConnectionSourceImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExplicitConnectionSourceImpl.java
@@ -7,9 +7,7 @@
  */
 package com.gemstone.gemfire.cache.client.internal;
 
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.net.UnknownHostException; 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -19,9 +17,6 @@ import java.util.Set;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.cache.util.EndpointDoesNotExistException;
-import com.gemstone.gemfire.cache.util.EndpointExistsException;
-import com.gemstone.gemfire.cache.util.EndpointInUseException;
 import com.gemstone.gemfire.distributed.internal.ServerLocation;
 import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
 import com.gemstone.gemfire.internal.cache.tier.sockets.ServerQueueStatus;
@@ -64,15 +59,18 @@ public class ExplicitConnectionSourceImpl implements ConnectionSource {
     this.serverList = Collections.unmodifiableList(serverList);
   }
 
+  @Override
   public synchronized void start(InternalPool pool) {
     this.pool = pool;
     pool.getStats().setInitialContacts(serverList.size());
   }
   
+  @Override
   public void stop() {
     //do nothing
   }
 
+  @Override
   public ServerLocation findReplacementServer(ServerLocation currentServer, Set/*<ServerLocation>*/ excludedServers) {
     // at this time we always try to find a server other than currentServer
     // and if we do return it. Otherwise return null;
@@ -85,6 +83,7 @@ public class ExplicitConnectionSourceImpl implements ConnectionSource {
     return findServer(excludedPlusCurrent);
   }
   
+  @Override
   public synchronized ServerLocation findServer(Set excludedServers) {
     if(PoolImpl.TEST_DURABLE_IS_NET_DOWN) {
       return null;
@@ -109,6 +108,7 @@ public class ExplicitConnectionSourceImpl implements ConnectionSource {
    * connect to every server in the system to find where our durable
    * queue lives.
    */
+  @Override
   public synchronized List findServersForQueue(Set excludedServers,
       int numServers, ClientProxyMembershipID proxyId, boolean findDurableQueue) {
     if(PoolImpl.TEST_DURABLE_IS_NET_DOWN) {
@@ -124,80 +124,7 @@ public class ExplicitConnectionSourceImpl implements ConnectionSource {
     }
   }
   
-  /**
-   * Remove an endpoint from this connection source.
-   * 
-   * @param host
-   * @param port
-   * @throws EndpointDoesNotExistException if the <code>Endpoint</code> to be
-   * removed doesn't exist.
-   */
-  public synchronized void removeEndpoint(String host,int port) throws EndpointInUseException,EndpointDoesNotExistException {
-    serverList = new ArrayList(serverList);
-    Iterator it = serverList.iterator();
-    boolean found = false;
-    host = lookupHostName(host);
-    while(it.hasNext()) {
-      ServerLocation loc = (ServerLocation)it.next();
-      if(loc.getHostName().equalsIgnoreCase(host)) {
-        if(loc.getPort()==port) {
-          EndpointManager em = pool.getEndpointManager();
-          if(em.getEndpointMap().containsKey(loc)) {
-            throw new EndpointInUseException("Endpoint in use cannot be removed:"+loc);
-          } else {
-            it.remove();
-            found = true;
-          }
-        }
-      }
-    }
-    serverList = Collections.unmodifiableList(serverList);
-    if(!found) {
-      throw new EndpointDoesNotExistException("endpointlist:"+serverList,host,port);
-    }
-  }
-  
-  /**
-   * Add an endpoint to this connection source.
-   * 
-   * @param host
-   * @param port
-   * @throws EndpointExistsException if the <code>Endpoint</code> to be
-   * added already exists.
-   */
-  public synchronized void addEndpoint(String host,int port) throws EndpointExistsException {
-    Iterator it = serverList.iterator();
-    host = lookupHostName(host);
-    while(it.hasNext()) {
-      ServerLocation loc = (ServerLocation)it.next();
-      if(loc.getHostName().equalsIgnoreCase(host)) {
-        if(loc.getPort()==port) {
-          throw new EndpointExistsException("Endpoint already exists host="+host+" port="+port);
-        }
-      }
-    }
-    serverList = new ArrayList(serverList);
-    serverList.add(new ServerLocation(host,port));
-    serverList = Collections.unmodifiableList(serverList);
-  }
- 
-  /**
-   * When we create an ExplicitConnectionSource, we convert a the hostname of an
-   * endpoint from a string to an InetAddress and back. This method duplicates
-   * that process for endpoints that are added or removed after the fact.
-   */
-  private String lookupHostName(String host) {
-    try {
-      InetAddress hostAddr = InetAddress.getByName(host);
-      host = hostAddr.getHostName();
-    } catch (UnknownHostException cause) {
-      IllegalArgumentException ex = new IllegalArgumentException("Unknown host " + host);
-      ex.initCause(cause);
-      throw ex;
-    }
-    return host;
-  } 
-
+  @Override
   public boolean isBalanced() {
     return false;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetOp.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetOp.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetOp.java
index 019da2e..a187bcb 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetOp.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetOp.java
@@ -15,7 +15,6 @@ import com.gemstone.gemfire.cache.Operation;
 import com.gemstone.gemfire.cache.client.AllConnectionsInUseException;
 import com.gemstone.gemfire.cache.client.ServerConnectivityException;
 import com.gemstone.gemfire.cache.client.ServerOperationException;
-import com.gemstone.gemfire.cache.util.BridgeWriterException;
 import com.gemstone.gemfire.distributed.internal.ServerLocation;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.EntryEventImpl;
@@ -81,10 +80,6 @@ public class GetOp {
             }
             cms.removeBucketServerLocation(server);
           }
-          catch (BridgeWriterException e) {
-            if (e.getCause() instanceof ServerConnectivityException)
-              cms.removeBucketServerLocation(server);
-          }
           catch (CacheLoaderException e) {
             if (e.getCause() instanceof ServerConnectivityException)
               cms.removeBucketServerLocation(server);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
index 851c5c8..d211417 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
@@ -1204,36 +1204,36 @@ public class PoolImpl implements InternalPool {
   
   ///////////////////// start test hooks ///////////////////////
   /**
-   * A debug flag used for testing used in BridgeObserver
+   * A debug flag used for testing used in ClientServerObserver
    */
   public static volatile boolean AFTER_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = false;
 
   /**
-   * A debug flag used for testing used in BridgeObserver
+   * A debug flag used for testing used in ClientServerObserver
    */
   public static volatile boolean BEFORE_REGISTER_CALLBACK_FLAG = false;
 
   /**
-   * A debug flag used for testing used in BridgeObserver
+   * A debug flag used for testing used in ClientServerObserver
    */
   public static volatile boolean BEFORE_RECOVER_INTEREST_CALLBACK_FLAG = false;
 
   /**
-   * A debug flag used for testing used in BridgeObserver
+   * A debug flag used for testing used in ClientServerObserver
    */
   public static volatile boolean AFTER_REGISTER_CALLBACK_FLAG = false;
 
   /**
-   * A debug flag used for testing used in BridgeObserver
+   * A debug flag used for testing used in ClientServerObserver
    */
   public static volatile boolean BEFORE_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = false;
 
   /**
-   * A debug flag used for testing used in BridgeObserver
+   * A debug flag used for testing used in ClientServerObserver
    */
   public static volatile boolean BEFORE_SENDING_CLIENT_ACK_CALLBACK_FLAG = false;
   /**
-   * A debug flag used for testing used in BridgeObserver
+   * A debug flag used for testing used in ClientServerObserver
    */  
   public static volatile boolean AFTER_QUEUE_DESTROY_MESSAGE_FLAG = false;
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutOp.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutOp.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutOp.java
index 35822ed..05caa9c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutOp.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutOp.java
@@ -14,7 +14,6 @@ import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.client.AllConnectionsInUseException;
 import com.gemstone.gemfire.cache.client.ServerConnectivityException;
 import com.gemstone.gemfire.cache.client.ServerOperationException;
-import com.gemstone.gemfire.cache.util.BridgeWriterException;
 import com.gemstone.gemfire.distributed.internal.ServerLocation;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.cache.CachedDeserializable;
@@ -91,10 +90,6 @@ public class PutOp {
           }
           cms.removeBucketServerLocation(server);
         }
-        catch (BridgeWriterException e) {
-          if (e.getCause() instanceof ServerConnectivityException)
-            cms.removeBucketServerLocation(server);
-        }
       }
     }
     return pool.execute(op);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java
index f0bf9e9..1d6597f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java
@@ -48,8 +48,8 @@ import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.distributed.internal.ServerLocation;
 import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
 import com.gemstone.gemfire.internal.cache.tier.InterestType;
@@ -733,7 +733,7 @@ public class QueueManagerImpl implements QueueManager {
   private boolean promoteBackupCnxToPrimary(QueueConnectionImpl cnx) {
     boolean result = false;
     if (PoolImpl.BEFORE_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG) {
-      BridgeObserver bo = BridgeObserverHolder.getInstance();
+      ClientServerObserver bo = ClientServerObserverHolder.getInstance();
       bo.beforePrimaryIdentificationFromBackup();
     }
     try {
@@ -752,7 +752,7 @@ public class QueueManagerImpl implements QueueManager {
         MakePrimaryOp.execute(pool, cnx, haveSentClientReady);
         result = true;
         if (PoolImpl.AFTER_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG) {
-          BridgeObserver bo = BridgeObserverHolder.getInstance();
+          ClientServerObserver bo = ClientServerObserverHolder.getInstance();
           bo.afterPrimaryIdentificationFromBackup(cnx.getServer());
         }
       }
@@ -888,7 +888,7 @@ public class QueueManagerImpl implements QueueManager {
         logger.debug("SubscriptionManager redundancy satisfier - Switched backup server to primary: {}", newPrimary.getEndpoint());
       }
       if (PoolImpl.AFTER_PRIMARY_RECOVERED_CALLBACK_FLAG) {
-        BridgeObserver bo = BridgeObserverHolder.getInstance();
+        ClientServerObserver bo = ClientServerObserverHolder.getInstance();
         bo.afterPrimaryRecovered(newPrimary.getServer());
       }
      
@@ -924,7 +924,7 @@ public class QueueManagerImpl implements QueueManager {
       }
 
       if (newPrimary != null && PoolImpl.AFTER_PRIMARY_RECOVERED_CALLBACK_FLAG) {
-        BridgeObserver bo = BridgeObserverHolder.getInstance();
+        ClientServerObserver bo = ClientServerObserverHolder.getInstance();
         bo.afterPrimaryRecovered(newPrimary.getServer());
       }
       printPrimaryNotFoundError = true;
@@ -1207,7 +1207,7 @@ public class QueueManagerImpl implements QueueManager {
   protected void recoverAllInterestTypes(final Connection recoveredConnection,
       boolean isFirstNewConnection) {
     if (PoolImpl.BEFORE_RECOVER_INTEREST_CALLBACK_FLAG) {
-      BridgeObserver bo = BridgeObserverHolder.getInstance();
+      ClientServerObserver bo = ClientServerObserverHolder.getInstance();
       bo.beforeInterestRecovery();
     }
     recoverInterestList(recoveredConnection, false, true, isFirstNewConnection);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
index 9a6b3db..9f15155 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
@@ -24,8 +24,8 @@ import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionDestroyedException;
 import com.gemstone.gemfire.cache.client.internal.PoolImpl.PoolTask;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
 import com.gemstone.gemfire.internal.cache.EventID;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
@@ -257,7 +257,7 @@ public class QueueStateImpl implements QueueState {
         return;
       }
       if (PoolImpl.BEFORE_SENDING_CLIENT_ACK_CALLBACK_FLAG) {
-        BridgeObserver bo = BridgeObserverHolder.getInstance();
+        ClientServerObserver bo = ClientServerObserverHolder.getInstance();
         bo.beforeSendingClientAck();
       }
       //if ((qManager.getPool().getSubscriptionRedundancy() != 0) || (qManager.getPool().isDurableClient())) {



Mime
View raw message