http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java index 551bebd..1e7823e 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java @@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.InterestResultPolicy; import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolFactory; import com.gemstone.gemfire.cache.client.PoolManager; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -402,7 +402,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase // occasional failures in precheckins and cruisecontrol. public static void assertAllQueuesEmpty() { - Iterator servers = cacheServer.getBridgeServers().iterator(); + Iterator servers = cacheServer.getCacheServers().iterator(); assertTrue("No servers found!", servers.hasNext()); while (servers.hasNext()) { Iterator proxies = ((BridgeServerImpl)servers.next()).getAcceptor(). @@ -421,7 +421,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase public boolean done() { // assume a single cache server as configured in this test BridgeServerImpl bridgeServer = (BridgeServerImpl) cacheServer. - getBridgeServers().iterator().next(); + getCacheServers().iterator().next(); if (bridgeServer == null) { excuse = "No Cache Server"; return false; @@ -474,7 +474,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase cacheServer.createRegion(REGION_NAME1, attrs); cacheServer.createRegion(REGION_NAME2, attrs); cacheServer.createRegion(REGION_NAME3, attrs); - BridgeServer server = cacheServer.addBridgeServer(); + CacheServer server = cacheServer.addCacheServer(); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET) ; server.setPort(port); server.setNotifyBySubscription(true);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java index 35eb52d..86f215f 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java @@ -19,7 +19,7 @@ import com.gemstone.gemfire.cache.EntryEvent; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -648,7 +648,7 @@ public class ConflationDUnitTest extends DistributedTestCase RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME1, attrs); cache.createRegion(REGION_NAME2, attrs); - BridgeServer server = cache.addBridgeServer(); + CacheServer server = cache.addCacheServer(); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET) ; server.setPort(port); server.setNotifyBySubscription(true); @@ -793,7 +793,7 @@ public class ConflationDUnitTest extends DistributedTestCase public static void getStatsOnServer() { Cache cache = GemFireCacheImpl.getInstance(); - Iterator itr = cache.getBridgeServers().iterator(); + Iterator itr = cache.getCacheServers().iterator(); BridgeServerImpl server = (BridgeServerImpl)itr.next(); Iterator iter_prox = server.getAcceptor().getCacheClientNotifier() .getClientProxies().iterator(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java index c8fe2e6..042917b 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java @@ -37,7 +37,7 @@ import com.gemstone.gemfire.cache.client.internal.Connection; import com.gemstone.gemfire.cache.client.internal.PoolImpl; import com.gemstone.gemfire.cache.client.internal.PutOp; import com.gemstone.gemfire.cache.client.internal.QueueStateImpl.SequenceIdAndExpirationObject; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -123,7 +123,7 @@ public class ConnectionProxyJUnitTest int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); Region testRegion = null ; try { - BridgeServer server = this.cache.addBridgeServer(); + CacheServer server = this.cache.addCacheServer(); server.setMaximumTimeBetweenPings(10000); server.setPort(port3); server.start(); @@ -232,10 +232,10 @@ public class ConnectionProxyJUnitTest // long start = System.currentTimeMillis(); assertEquals(0, proxy.getConnectedServerCount()); //start the server - BridgeServer server = null; + CacheServer server = null; try { try { - server = this.cache.addBridgeServer(); + server = this.cache.addCacheServer(); server.setMaximumTimeBetweenPings(15000); server.setPort(port3); server.start(); @@ -293,10 +293,10 @@ public class ConnectionProxyJUnitTest // long start = System.currentTimeMillis(); assertEquals(0, proxy.getConnectedServerCount()); //start the server - BridgeServer server = null; + CacheServer server = null; try { try { - server = this.cache.addBridgeServer(); + server = this.cache.addCacheServer(); server.setMaximumTimeBetweenPings(15000); server.setPort(port3); server.start(); @@ -326,10 +326,10 @@ public class ConnectionProxyJUnitTest public void testThreadIdToSequenceIdMapCreation() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - BridgeServer server = null; + CacheServer server = null; try { try { - server = this.cache.addBridgeServer(); + server = this.cache.addCacheServer(); server.setMaximumTimeBetweenPings(10000); server.setPort(port3); server.start(); @@ -370,10 +370,10 @@ public class ConnectionProxyJUnitTest public void testThreadIdToSequenceIdMapExpiryPositive() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - BridgeServer server = null; + CacheServer server = null; try { try { - server = this.cache.addBridgeServer(); + server = this.cache.addCacheServer(); server.setMaximumTimeBetweenPings(10000); server.setPort(port3); server.start(); @@ -420,10 +420,10 @@ public class ConnectionProxyJUnitTest public void testThreadIdToSequenceIdMapExpiryNegative() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - BridgeServer server = null; + CacheServer server = null; try { try { - server = this.cache.addBridgeServer(); + server = this.cache.addCacheServer(); server.setMaximumTimeBetweenPings(10000); server.setPort(port3); server.start(); @@ -472,10 +472,10 @@ public class ConnectionProxyJUnitTest public void testThreadIdToSequenceIdMapConcurrency() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - BridgeServer server = null; + CacheServer server = null; try { try { - server = this.cache.addBridgeServer(); + server = this.cache.addCacheServer(); server.setMaximumTimeBetweenPings(10000); server.setPort(port3); server.start(); @@ -527,10 +527,10 @@ public class ConnectionProxyJUnitTest public void testDuplicateSeqIdLesserThanCurrentSeqIdBeingIgnored() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - BridgeServer server = null; + CacheServer server = null; try { try { - server = this.cache.addBridgeServer(); + server = this.cache.addCacheServer(); server.setMaximumTimeBetweenPings(10000); server.setPort(port3); server.start(); @@ -586,10 +586,10 @@ public class ConnectionProxyJUnitTest public void testCleanCloseOfThreadIdToSeqId() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - BridgeServer server = null; + CacheServer server = null; try { try { - server = this.cache.addBridgeServer(); + server = this.cache.addCacheServer(); server.setMaximumTimeBetweenPings(10000); server.setPort(port3); server.start(); @@ -644,10 +644,10 @@ public class ConnectionProxyJUnitTest public void testTwoClientsHavingDifferentThreadIdMaps() { int port3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - BridgeServer server = null; + CacheServer server = null; try { try { - server = this.cache.addBridgeServer(); + server = this.cache.addCacheServer(); server.setMaximumTimeBetweenPings(10000); server.setPort(port3); server.start(); @@ -696,10 +696,10 @@ public class ConnectionProxyJUnitTest public void testPeriodicAckSendByClient() { int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - BridgeServer server = null; + CacheServer server = null; try { try { - server = this.cache.addBridgeServer(); + server = this.cache.addCacheServer(); server.setPort(port); server.start(); } @@ -767,10 +767,10 @@ public class ConnectionProxyJUnitTest public void testNoAckSendByClient() { int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - BridgeServer server = null; + CacheServer server = null; try { try { - server = this.cache.addBridgeServer(); + server = this.cache.addCacheServer(); server.setPort(port); server.start(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java index a8b5e5e..6b146fe 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java @@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.PoolImpl; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -132,7 +132,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase { RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - BridgeServer server1 = cache.addBridgeServer(); + CacheServer server1 = cache.addCacheServer(); server1.setPort(port); server1.setMaxThreads(maxThreads.intValue()); server1.setNotifyBySubscription(true); @@ -353,9 +353,9 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase { public static void stopServer() { try { - assertEquals("Expected exactly one BridgeServer", 1, cache - .getBridgeServers().size()); - BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers() + assertEquals("Expected exactly one CacheServer", 1, cache + .getCacheServers().size()); + BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); bs.stop(); @@ -368,9 +368,9 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase { public static void startServer() { try { Cache c = CacheFactory.getAnyInstance(); - assertEquals("Expected exactly one BridgeServer", 1, c.getBridgeServers() + assertEquals("Expected exactly one CacheServer", 1, c.getCacheServers() .size()); - BridgeServerImpl bs = (BridgeServerImpl)c.getBridgeServers().iterator() + BridgeServerImpl bs = (BridgeServerImpl)c.getCacheServers().iterator() .next(); assertNotNull(bs); bs.start(); @@ -873,7 +873,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase { RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - BridgeServer server1 = cache.addBridgeServer(); + CacheServer server1 = cache.addCacheServer(); server1.setPort(port); server1.setMaxThreads(maxThreads.intValue()); server1.setNotifyBySubscription(true); @@ -897,7 +897,7 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase { RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - BridgeServer server1 = cache.addBridgeServer(); + CacheServer server1 = cache.addCacheServer(); server1.setPort(port); server1.setMaxThreads(maxThreads.intValue()); server1.setNotifyBySubscription(true); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java index b0b9912..a8ad9f9 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java @@ -24,7 +24,6 @@ import com.gemstone.gemfire.cache.Operation; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.util.BridgeServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; @@ -36,6 +35,7 @@ import com.gemstone.gemfire.cache.client.*; import com.gemstone.gemfire.cache.client.internal.PoolImpl; import com.gemstone.gemfire.cache.client.internal.ServerRegionProxy; import com.gemstone.gemfire.cache.client.internal.Connection; +import com.gemstone.gemfire.cache.server.CacheServer; import dunit.DistributedTestCase; import dunit.Host; @@ -287,10 +287,10 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase public static void killServer(Integer port) { try { - Iterator iter = cache.getBridgeServers().iterator(); - getLogWriter().fine ("Asif: servers running = "+cache.getBridgeServers().size()); + Iterator iter = cache.getCacheServers().iterator(); + getLogWriter().fine ("Asif: servers running = "+cache.getCacheServers().size()); if (iter.hasNext()) { - BridgeServer server = (BridgeServer)iter.next(); + CacheServer server = (CacheServer)iter.next(); getLogWriter().fine("asif : server running on port="+server.getPort()+ " asked to kill serevre onport="+port); if(port.intValue() == server.getPort()){ server.stop(); @@ -305,7 +305,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase public static void startServer(Integer port) { try { - BridgeServer server1 = cache.addBridgeServer(); + CacheServer server1 = cache.addCacheServer(); server1.setPort(port.intValue()); server1.setNotifyBySubscription(true); server1.start(); @@ -455,7 +455,7 @@ public class DestroyEntryPropagationDUnitTest extends DistributedTestCase RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); - BridgeServer server = cache.addBridgeServer(); + CacheServer server = cache.addCacheServer(); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET) ; server.setPort(port); server.setNotifyBySubscription(true); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java index 76f8d44..a8c1317 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java @@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.client.PoolFactory; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.Connection; import com.gemstone.gemfire.cache.client.internal.PoolImpl; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.ServerLocation; @@ -464,7 +464,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase RegionAttributes attrs = factory.create(); Region r = cache.createRegion(REGION_NAME, attrs); assertNotNull(r); - BridgeServer server1 = cache.addBridgeServer(); + CacheServer server1 = cache.addCacheServer(); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server1.setPort(port); server1.setNotifyBySubscription(true); @@ -564,7 +564,7 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase } private static BridgeServerImpl getBridgeServer() { - BridgeServerImpl bridgeServer = (BridgeServerImpl) cache.getBridgeServers().iterator().next(); + BridgeServerImpl bridgeServer = (BridgeServerImpl) cache.getCacheServers().iterator().next(); assertNotNull(bridgeServer); return bridgeServer; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java index 8e3e145..a39ea2f 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java @@ -270,7 +270,7 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase { Cache cache = CacheServerTestUtil.getCache(); com.gemstone.gemfire.LogWriter logger = cache.getLogger(); BridgeServerImpl currentServer = (BridgeServerImpl)(new ArrayList(cache - .getBridgeServers()).get(0)); + .getCacheServers()).get(0)); AcceptorImpl ai = currentServer.getAcceptor(); CacheClientNotifier notifier = ai.getCacheClientNotifier(); CacheClientNotifierStats stats = notifier.getStats(); @@ -291,7 +291,7 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase { Cache cache = CacheServerTestUtil.getCache(); com.gemstone.gemfire.LogWriter logger = cache.getLogger(); BridgeServerImpl currentServer = (BridgeServerImpl)(new ArrayList(cache - .getBridgeServers()).get(0)); + .getCacheServers()).get(0)); AcceptorImpl ai = currentServer.getAcceptor(); CacheClientNotifier notifier = ai.getCacheClientNotifier(); CacheClientNotifierStats stats = notifier.getStats(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java index 0e1972b..316cf32 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java @@ -837,7 +837,7 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase { private static BridgeServerImpl getBridgeServer() { BridgeServerImpl bridgeServer = (BridgeServerImpl)CacheServerTestUtil - .getCache().getBridgeServers().iterator().next(); + .getCache().getCacheServers().iterator().next(); assertNotNull(bridgeServer); return bridgeServer; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java index 0ccee9e..4d97c41 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java @@ -10,7 +10,7 @@ package com.gemstone.gemfire.internal.cache.tier.sockets; import java.util.Properties; import com.gemstone.gemfire.cache.*; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter; @@ -474,7 +474,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase RegionAttributes attrs = factory.create(); Region r = cache.createRegion(REGION_NAME, attrs); assertNotNull(r); - BridgeServer server1 = cache.addBridgeServer(); + CacheServer server1 = cache.addCacheServer(); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server1.setPort(port); server1.setNotifyBySubscription(true); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java index 7e162f6..20eacae 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java @@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.RegionEvent; import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache.util.CacheListenerAdapter; import com.gemstone.gemfire.cache.util.CacheWriterAdapter; import com.gemstone.gemfire.cache30.BridgeTestCase; @@ -360,7 +360,7 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); - BridgeServer server1 = cache.addBridgeServer(); + CacheServer server1 = cache.addCacheServer(); server1.setPort(port); server1.setNotifyBySubscription(true); server1.start(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java index 1f6c123..4a2c003 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java @@ -111,7 +111,7 @@ public class ForceInvalidateEvictionDUnitTest extends CacheTestCase { createPR(vm0); createPR(vm1); - int port = addBridgeServer(vm1); + int port = addCacheServer(vm1); createClient(vm3, port); @@ -132,7 +132,7 @@ public class ForceInvalidateEvictionDUnitTest extends CacheTestCase { createPR(vm0); createPR(vm1); createAccessor(vm2, false); - int port = addBridgeServer(vm2); + int port = addCacheServer(vm2); createClient(vm3, port); doPropagationTest(vm0, vm3, true, true); @@ -151,7 +151,7 @@ public class ForceInvalidateEvictionDUnitTest extends CacheTestCase { createAccessor(vm2, false); //test an invalidate from the accessor through one of the data stores - int port1 = addBridgeServer(vm0); + int port1 = addCacheServer(vm0); createClient(vm3, port1); doPropagationTest(vm2, vm3, true, true); vm3.invoke(new SerializableRunnable("close cache") { @@ -163,7 +163,7 @@ public class ForceInvalidateEvictionDUnitTest extends CacheTestCase { }); //test an invalidate from the accessor through the other data store - int port2 = addBridgeServer(vm1); + int port2 = addCacheServer(vm1); createClient(vm3, port2); doPropagationTest(vm2, vm3, true, true); } @@ -347,7 +347,7 @@ public class ForceInvalidateEvictionDUnitTest extends CacheTestCase { } - private int addBridgeServer(VM vm) { + private int addCacheServer(VM vm) { final int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); vm.invoke(new SerializableRunnable("add bridge server") { public void run() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java index 9aafaed..2da9050 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java @@ -20,7 +20,7 @@ import com.gemstone.gemfire.cache.client.internal.Connection; import com.gemstone.gemfire.cache.client.internal.PoolImpl; import com.gemstone.gemfire.cache.client.internal.RegisterInterestTracker; import com.gemstone.gemfire.cache.client.internal.ServerRegionProxy; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.ServerLocation; @@ -399,21 +399,21 @@ public class HAInterestBaseTest extends DistributedTestCase { } public static void verifyDispatcherIsAlive() { - assertEquals("More than one BridgeServer", 1, cache.getBridgeServers().size()); + assertEquals("More than one BridgeServer", 1, cache.getCacheServers().size()); WaitCriterion wc = new WaitCriterion() { @Override public boolean done() { - return cache.getBridgeServers().size() == 1; + return cache.getCacheServers().size() == 1; } @Override public String description() { - return "waiting for cache.getBridgeServers().size() == 1"; + return "waiting for cache.getCacheServers().size() == 1"; } }; DistributedTestCase.waitForCriterion(wc, TIMEOUT_MILLIS, INTERVAL_MILLIS, true); - BridgeServerImpl bs = (BridgeServerImpl) cache.getBridgeServers().iterator().next(); + BridgeServerImpl bs = (BridgeServerImpl) cache.getCacheServers().iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); assertNotNull(bs.getAcceptor().getCacheClientNotifier()); @@ -458,16 +458,16 @@ public class HAInterestBaseTest extends DistributedTestCase { WaitCriterion wc = new WaitCriterion() { @Override public boolean done() { - return cache.getBridgeServers().size() == 1; + return cache.getCacheServers().size() == 1; } @Override public String description() { - return "cache.getBridgeServers().size() == 1"; + return "cache.getCacheServers().size() == 1"; } }; DistributedTestCase.waitForCriterion(wc, TIMEOUT_MILLIS, INTERVAL_MILLIS, true); - BridgeServerImpl bs = (BridgeServerImpl) cache.getBridgeServers().iterator().next(); + BridgeServerImpl bs = (BridgeServerImpl) cache.getCacheServers().iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); assertNotNull(bs.getAcceptor().getCacheClientNotifier()); @@ -551,15 +551,15 @@ public class HAInterestBaseTest extends DistributedTestCase { public static void startServer() throws IOException { Cache c = CacheFactory.getAnyInstance(); - assertEquals("More than one BridgeServer", 1, c.getBridgeServers().size()); - BridgeServerImpl bs = (BridgeServerImpl) c.getBridgeServers().iterator().next(); + assertEquals("More than one BridgeServer", 1, c.getCacheServers().size()); + BridgeServerImpl bs = (BridgeServerImpl) c.getCacheServers().iterator().next(); assertNotNull(bs); bs.start(); } public static void stopServer() { - assertEquals("More than one BridgeServer", 1, cache.getBridgeServers().size()); - BridgeServerImpl bs = (BridgeServerImpl) cache.getBridgeServers().iterator().next(); + assertEquals("More than one BridgeServer", 1, cache.getCacheServers().size()); + BridgeServerImpl bs = (BridgeServerImpl) cache.getCacheServers().iterator().next(); assertNotNull(bs); bs.stop(); } @@ -749,16 +749,16 @@ public class HAInterestBaseTest extends DistributedTestCase { WaitCriterion wc = new WaitCriterion() { @Override public boolean done() { - return cache.getBridgeServers().size() == 1; + return cache.getCacheServers().size() == 1; } @Override public String description() { - return "waiting for cache.getBridgeServers().size() == 1"; + return "waiting for cache.getCacheServers().size() == 1"; } }; DistributedTestCase.waitForCriterion(wc, TIMEOUT_MILLIS, INTERVAL_MILLIS, true); - BridgeServerImpl bs = (BridgeServerImpl) cache.getBridgeServers().iterator().next(); + BridgeServerImpl bs = (BridgeServerImpl) cache.getCacheServers().iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); assertNotNull(bs.getAcceptor().getCacheClientNotifier()); @@ -809,16 +809,16 @@ public class HAInterestBaseTest extends DistributedTestCase { WaitCriterion wc = new WaitCriterion() { @Override public boolean done() { - return cache.getBridgeServers().size() == 1; + return cache.getCacheServers().size() == 1; } @Override public String description() { - return "waiting for cache.getBridgeServers().size() == 1"; + return "waiting for cache.getCacheServers().size() == 1"; } }; DistributedTestCase.waitForCriterion(wc, TIMEOUT_MILLIS, INTERVAL_MILLIS, true); - BridgeServerImpl bs = (BridgeServerImpl) cache.getBridgeServers().iterator().next(); + BridgeServerImpl bs = (BridgeServerImpl) cache.getCacheServers().iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); assertNotNull(bs.getAcceptor().getCacheClientNotifier()); @@ -976,7 +976,7 @@ public class HAInterestBaseTest extends DistributedTestCase { factory.setConcurrencyChecksEnabled(true); cache.createRegion(REGION_NAME, factory.create()); - BridgeServer server = cache.addBridgeServer(); + CacheServer server = cache.addCacheServer(); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); server.setMaximumTimeBetweenPings(180000); @@ -994,7 +994,7 @@ public class HAInterestBaseTest extends DistributedTestCase { RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); - BridgeServer server = cache.addBridgeServer(); + CacheServer server = cache.addCacheServer(); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); // ensures updates to be sent instead of invalidations http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java index e83b300..f146cad 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java @@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.PoolImpl; import com.gemstone.gemfire.cache.client.internal.Connection; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.ServerLocation; @@ -383,8 +383,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase { try { assertEquals("Expected exactly one BridgeServer", 1, cache - .getBridgeServers().size()); - BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers() + .getCacheServers().size()); + BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); bs.stop(); @@ -430,8 +430,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase try { Cache c = CacheFactory.getAnyInstance(); assertEquals("Expected exactly one BridgeServer", 1, - c.getBridgeServers().size()); - BridgeServerImpl bs = (BridgeServerImpl) c.getBridgeServers() + c.getCacheServers().size()); + BridgeServerImpl bs = (BridgeServerImpl) c.getCacheServers() .iterator().next(); assertNotNull(bs); bs.start(); @@ -473,7 +473,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase WaitCriterion wc = new WaitCriterion() { String excuse; public boolean done() { - return cache.getBridgeServers().size() == 1; + return cache.getCacheServers().size() == 1; } public String description() { return excuse; @@ -481,7 +481,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase }; DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true); - BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers() + BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); @@ -529,11 +529,11 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase try { Cache c = CacheFactory.getAnyInstance(); // assertEquals("More than one BridgeServer", 1, - // c.getBridgeServers().size()); + // c.getCacheServers().size()); WaitCriterion wc = new WaitCriterion() { String excuse; public boolean done() { - return cache.getBridgeServers().size() == 1; + return cache.getCacheServers().size() == 1; } public String description() { return excuse; @@ -541,7 +541,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase }; DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true); - BridgeServerImpl bs = (BridgeServerImpl)c.getBridgeServers().iterator() + BridgeServerImpl bs = (BridgeServerImpl)c.getCacheServers().iterator() .next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); @@ -714,7 +714,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); - BridgeServer server1 = cache.addBridgeServer(); + CacheServer server1 = cache.addCacheServer(); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET) ; server1.setPort(port); // ensures updates to be sent instead of invalidations http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java index 21d40bc..3eae255 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java @@ -29,7 +29,7 @@ import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.Connection; import com.gemstone.gemfire.cache.client.internal.PoolImpl; import com.gemstone.gemfire.cache.client.internal.QueueConnectionImpl; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -263,8 +263,8 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase { try { Cache c = CacheFactory.getAnyInstance(); - assertEquals("More than one BridgeServer", 1, c.getBridgeServers().size()); - BridgeServerImpl bs = (BridgeServerImpl) c.getBridgeServers().iterator().next(); + assertEquals("More than one BridgeServer", 1, c.getCacheServers().size()); + BridgeServerImpl bs = (BridgeServerImpl) c.getCacheServers().iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); assertNotNull(bs.getAcceptor().getCacheClientNotifier()); @@ -273,9 +273,9 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase CacheClientProxy proxy = (CacheClientProxy)iter_prox.next(); //if (proxy._interestList._keysOfInterest.get("/"+REGION_NAME) != null) { if(proxy.isPrimary()){ - Iterator iter = cache.getBridgeServers().iterator(); + Iterator iter = cache.getCacheServers().iterator(); if (iter.hasNext()) { - BridgeServer server = (BridgeServer)iter.next(); + CacheServer server = (CacheServer)iter.next(); cache.getLogger().fine("stopping server " + server); server.stop(); } @@ -356,7 +356,7 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase new InterestListEndpointDUnitTest("temp").createCache(new Properties()); RegionAttributes attrs = impl.createServerCacheAttributes(); cache.createRegion(REGION_NAME, attrs); - BridgeServer server1 = cache.addBridgeServer(); + CacheServer server1 = cache.addCacheServer(); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET) ; server1.setPort(port); server1.setMaxThreads(maxThreads.intValue()); @@ -390,8 +390,8 @@ public class InterestListEndpointDUnitTest extends DistributedTestCase { try { Cache c = CacheFactory.getAnyInstance(); - assertEquals("More than one BridgeServer", 1, c.getBridgeServers().size()); - BridgeServerImpl bs = (BridgeServerImpl) c.getBridgeServers().iterator().next(); + assertEquals("More than one CacheServer", 1, c.getCacheServers().size()); + BridgeServerImpl bs = (BridgeServerImpl) c.getCacheServers().iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); assertNotNull(bs.getAcceptor().getCacheClientNotifier()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java index 28923c1..985abb2 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListFailoverDUnitTest.java @@ -12,7 +12,7 @@ package com.gemstone.gemfire.internal.cache.tier.sockets; import java.util.Iterator; import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache.client.*; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.cache.PoolFactoryImpl; @@ -202,9 +202,9 @@ public class InterestListFailoverDUnitTest extends DistributedTestCase public static void stopServer() { try { - Iterator iter = CacheServerTestUtil.getCache().getBridgeServers().iterator(); + Iterator iter = CacheServerTestUtil.getCache().getCacheServers().iterator(); if (iter.hasNext()) { - BridgeServer server = (BridgeServer)iter.next(); + CacheServer server = (CacheServer)iter.next(); server.stop(); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java index 60e7a63..76dc221 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java @@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.InterestResultPolicy; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; @@ -226,7 +226,7 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET) ; - BridgeServer server1 = cache.addBridgeServer(); + CacheServer server1 = cache.addCacheServer(); server1.setPort(port); server1.setNotifyBySubscription(true); server1.start(); @@ -452,8 +452,8 @@ public class InterestListRecoveryDUnitTest extends DistributedTestCase public static Set getCacheClientProxies() { Cache c = CacheFactory.getAnyInstance(); - assertEquals("More than one BridgeServer", 1, c.getBridgeServers().size()); - BridgeServerImpl bs = (BridgeServerImpl)c.getBridgeServers().iterator() + assertEquals("More than one CacheServer", 1, c.getCacheServers().size()); + BridgeServerImpl bs = (BridgeServerImpl)c.getCacheServers().iterator() .next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java index 42c4bfa..dbdc1cc 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java @@ -20,7 +20,7 @@ import com.gemstone.gemfire.cache.InterestResultPolicy; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; @@ -244,7 +244,7 @@ public class InterestResultPolicyDUnitTest extends DistributedTestCase factory.setScope(Scope.DISTRIBUTED_ACK); RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); - BridgeServer server = cache.addBridgeServer(); + CacheServer server = cache.addCacheServer(); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); server.setNotifyBySubscription(true); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java index 6722c72..2566224 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java @@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.PoolImpl; import com.gemstone.gemfire.cache.client.internal.RegisterInterestTracker; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.ServerLocation; import com.gemstone.gemfire.internal.AvailablePort; @@ -150,12 +150,12 @@ public class RedundancyLevelTestBase extends DistributedTestCase public static void verifyDispatcherIsAlive() { try { -// assertEquals("More than one BridgeServer", 1, cache.getBridgeServers() +// assertEquals("More than one BridgeServer", 1, cache.getCacheServers() // .size()); WaitCriterion wc = new WaitCriterion() { String excuse; public boolean done() { - return cache.getBridgeServers().size() == 1; + return cache.getCacheServers().size() == 1; } public String description() { return excuse; @@ -163,7 +163,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase }; DistributedTestCase.waitForCriterion(wc, 3 * 60 * 1000, 1000, true); - BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers() + BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); @@ -210,11 +210,11 @@ public class RedundancyLevelTestBase extends DistributedTestCase { try { // assertEquals("More than one BridgeServer", 1, - // cache.getBridgeServers().size()); + // cache.getCacheServers().size()); WaitCriterion wc = new WaitCriterion() { String excuse; public boolean done() { - return cache.getBridgeServers().size() == 1; + return cache.getCacheServers().size() == 1; } public String description() { return excuse; @@ -222,7 +222,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase }; DistributedTestCase.waitForCriterion(wc, 3 * 60 * 1000, 1000, true); - BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers() + BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); @@ -350,9 +350,9 @@ public class RedundancyLevelTestBase extends DistributedTestCase public static void verifyNoCCP() { - assertEquals("More than one BridgeServer", 1, cache.getBridgeServers() + assertEquals("More than one BridgeServer", 1, cache.getCacheServers() .size()); - BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers() + BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); @@ -368,7 +368,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase WaitCriterion wc = new WaitCriterion() { String excuse; public boolean done() { - return cache.getBridgeServers().size() == 1; + return cache.getCacheServers().size() == 1; } public String description() { return excuse; @@ -376,7 +376,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase }; DistributedTestCase.waitForCriterion(wc, 3 * 60 * 1000, 1000, true); - BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers() + BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); @@ -405,16 +405,16 @@ public class RedundancyLevelTestBase extends DistributedTestCase try { WaitCriterion wc = new WaitCriterion() { public boolean done() { - return cache.getBridgeServers().size() == 1; + return cache.getCacheServers().size() == 1; } public String description() { return "Number of bridge servers (" - + cache.getBridgeServers().size() + ") never became 1"; + + cache.getCacheServers().size() + ") never became 1"; } }; DistributedTestCase.waitForCriterion(wc, 180 * 1000, 2000, true); - BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers() + BridgeServerImpl bs = (BridgeServerImpl)cache.getCacheServers() .iterator().next(); assertNotNull(bs); assertNotNull(bs.getAcceptor()); @@ -474,9 +474,9 @@ public class RedundancyLevelTestBase extends DistributedTestCase public static void stopServer() { try { - Iterator iter = cache.getBridgeServers().iterator(); + Iterator iter = cache.getCacheServers().iterator(); if (iter.hasNext()) { - BridgeServer server = (BridgeServer)iter.next(); + CacheServer server = (CacheServer)iter.next(); server.stop(); } } @@ -489,7 +489,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase { try { Cache c = CacheFactory.getAnyInstance(); - BridgeServerImpl bs = (BridgeServerImpl)c.getBridgeServers().iterator() + BridgeServerImpl bs = (BridgeServerImpl)c.getCacheServers().iterator() .next(); assertNotNull(bs); bs.start(); @@ -579,7 +579,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase RegionAttributes attrs = factory.createRegionAttributes(); cache.createVMRegion(REGION_NAME, attrs); - BridgeServer server1 = cache.addBridgeServer(); + CacheServer server1 = cache.addCacheServer(); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server1.setMaximumTimeBetweenPings(180000); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java index d6f950b..7272f2f 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java @@ -16,7 +16,7 @@ import com.gemstone.gemfire.cache.DataPolicy; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -125,7 +125,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase factory.setDataPolicy(DataPolicy.REPLICATE); RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); - BridgeServer server = cache.addBridgeServer(); + CacheServer server = cache.addCacheServer(); assertNotNull(server); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); @@ -137,10 +137,10 @@ public class RegionCloseDUnitTest extends DistributedTestCase public static void VerifyClientProxyOnServerBeforeClose() { Cache c = CacheFactory.getAnyInstance(); - assertEquals("More than one BridgeServer", 1, c.getBridgeServers().size()); + assertEquals("More than one CacheServer", 1, c.getCacheServers().size()); - final BridgeServerImpl bs = (BridgeServerImpl) c.getBridgeServers().iterator().next(); + final BridgeServerImpl bs = (BridgeServerImpl) c.getCacheServers().iterator().next(); WaitCriterion ev = new WaitCriterion() { public boolean done() { return bs.getAcceptor().getCacheClientNotifier().getClientProxies().size() == 1; @@ -182,7 +182,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase final Cache c = CacheFactory.getAnyInstance(); WaitCriterion ev = new WaitCriterion() { public boolean done() { - return c.getBridgeServers().size() == 1; + return c.getCacheServers().size() == 1; } public String description() { return null; @@ -190,7 +190,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase }; DistributedTestCase.waitForCriterion(ev, 40 * 1000, 200, true); - final BridgeServerImpl bs = (BridgeServerImpl)c.getBridgeServers().iterator() + final BridgeServerImpl bs = (BridgeServerImpl)c.getCacheServers().iterator() .next(); ev = new WaitCriterion() { public boolean done() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java index 722f370..034fc0a 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java @@ -214,7 +214,7 @@ public class RegisterInterestBeforeRegionCreationDUnitTest extends DistributedTe RegionAttributes attrs = factory.createRegionAttributes(); cache.createVMRegion(REGION_NAME, attrs); } - BridgeServerImpl server = (BridgeServerImpl)cache.addBridgeServer(); + BridgeServerImpl server = (BridgeServerImpl)cache.addCacheServer(); assertNotNull(server); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); @@ -267,4 +267,4 @@ public class RegisterInterestBeforeRegionCreationDUnitTest extends DistributedTe cache.getDistributedSystem().disconnect(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java index 299e157..27e254d 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java @@ -10,7 +10,7 @@ package com.gemstone.gemfire.internal.cache.tier.sockets; import java.util.*; import com.gemstone.gemfire.cache.*; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; @@ -171,7 +171,7 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase RegionAttributes attrs = impl.createServerCacheAttributes(); cache.createRegion(REGION_NAME, attrs); - BridgeServer server = cache.addBridgeServer(); + CacheServer server = cache.addCacheServer(); assertNotNull(server); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java index 987182c..f10f25d 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java @@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.PoolImpl; import com.gemstone.gemfire.cache.client.internal.QueueStateImpl.SequenceIdAndExpirationObject; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; @@ -249,9 +249,9 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase public static void stopServer() { try { - Iterator iter = cache.getBridgeServers().iterator(); + Iterator iter = cache.getCacheServers().iterator(); if (iter.hasNext()) { - BridgeServer server = (BridgeServer)iter.next(); + CacheServer server = (CacheServer)iter.next(); server.stop(); } } @@ -357,7 +357,7 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase cache.setMessageSyncInterval(25); cache.createRegion(REGION_NAME, attrs); - BridgeServer server = cache.addBridgeServer(); + CacheServer server = cache.addCacheServer(); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); server.setNotifyBySubscription(true); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java index 1eb3ae3..30c0f1b 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java @@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.client.PoolManager; import com.gemstone.gemfire.cache.client.internal.Connection; import com.gemstone.gemfire.cache.client.internal.PoolImpl; import com.gemstone.gemfire.cache.client.internal.ServerRegionProxy; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -402,9 +402,9 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase public static void killServer(Integer port ) { try { - Iterator iter = cache.getBridgeServers().iterator(); + Iterator iter = cache.getCacheServers().iterator(); if (iter.hasNext()) { - BridgeServer server = (BridgeServer)iter.next(); + CacheServer server = (CacheServer)iter.next(); if(server.getPort() == port.intValue()){ server.stop(); } @@ -419,7 +419,7 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase public static void startServer(Integer port) { try { - BridgeServer server1 = cache.addBridgeServer(); + CacheServer server1 = cache.addCacheServer(); server1.setPort(port.intValue()); server1.setNotifyBySubscription(true); server1.start(); @@ -498,7 +498,7 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase new UpdatePropagationDUnitTest("temp").createCache(new Properties()); RegionAttributes attrs = impl.createCacheServerAttributes(); cache.createRegion(REGION_NAME, attrs); - BridgeServer server = cache.addBridgeServer(); + CacheServer server = cache.addCacheServer(); assertNotNull(server); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java index 9eca096..a850b21 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java @@ -17,7 +17,7 @@ import com.gemstone.gemfire.cache.DataPolicy; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; @@ -191,7 +191,7 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe factory.setDataPolicy(DataPolicy.REPLICATE); RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); - BridgeServer server1 = cache.addBridgeServer(); + CacheServer server1 = cache.addCacheServer(); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET) ; server1.setPort(port); server1.setNotifyBySubscription(true); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3eaf0e94/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxFormatterPutGetJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxFormatterPutGetJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxFormatterPutGetJUnitTest.java index 8a9bd0f..f70d2d2 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxFormatterPutGetJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxFormatterPutGetJUnitTest.java @@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.DataPolicy; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.util.BridgeServer; +import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.internal.Assert; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; @@ -47,7 +47,7 @@ public class PdxFormatterPutGetJUnitTest { this.c = (GemFireCacheImpl) new CacheFactory().set("mcast-port", "0").setPdxReadSerialized(true).create(); //start cache-server - BridgeServer server = c.addBridgeServer(); + CacheServer server = c.addCacheServer(); final int serverPort = 40405; server.setPort(serverPort); server.start();
