You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2015/10/15 23:35:35 UTC
[12/38] incubator-geode git commit: GEODE-243: remove deprecated
Bridge feature
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/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 db5a5f2..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
@@ -31,11 +31,13 @@ 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.client.internal.BridgePoolImpl;
+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.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;
@@ -64,7 +66,7 @@ public class ConnectionProxyJUnitTest
Cache cache;
- BridgePoolImpl proxy = null;
+ PoolImpl proxy = null;
SequenceIdAndExpirationObject seo = null;
@@ -100,7 +102,7 @@ public class ConnectionProxyJUnitTest
this.system.disconnect();
if (proxy != null)
- proxy.close();
+ proxy.destroy();
}
/**
@@ -121,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();
@@ -131,16 +133,18 @@ public class ConnectionProxyJUnitTest
fail("Failed to create server");
}
try {
- Properties props = new Properties();
- props.setProperty("retryAttempts", "1");
- props.setProperty("endpoints", "ep1=localhost:"+port3);
- props.setProperty("establishCallbackConnection", "false");
- props.setProperty("LBPolicy", "Sticky");
- props.setProperty("readTimeout", "2000");
- props.setProperty("socketBufferSize", "32768");
- props.setProperty("retryInterval", "10000");
- props.setProperty("connectionsPerServer", "2");
- props.setProperty("redundancyLevel", "-1");
+ PoolFactory pf = PoolManager.createFactory();
+ pf.addServer("localhost", port3);
+ pf.setSubscriptionEnabled(false);
+ pf.setSubscriptionRedundancy(-1);
+ pf.setReadTimeout(2000);
+ pf.setThreadLocalConnections(true);
+ pf.setSocketBufferSize(32768);
+ pf.setRetryAttempts(1);
+ pf.setPingInterval(10000);
+
+ proxy = (PoolImpl) pf.create("clientPool");
+
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setCacheListener(new CacheListenerAdapter() {
@@ -156,8 +160,6 @@ public class ConnectionProxyJUnitTest
}
}
});
- proxy = BridgePoolImpl.create(props, true/*useByBridgeWriter*/);
-
RegionAttributes attrs = factory.create();
testRegion = cache.createRegion("testregion", attrs);
@@ -200,17 +202,17 @@ public class ConnectionProxyJUnitTest
// final int maxWaitTime = 10000;
try {
- Properties props = new Properties();
- props.setProperty("retryAttempts", "1");
- props.setProperty("endpoints", "ep1=localhost:"+port3);
- props.setProperty("establishCallbackConnection", "false");
- props.setProperty("LBPolicy", "Sticky");
- props.setProperty("readTimeout", "2000");
- props.setProperty("socketBufferSize", "32768");
- props.setProperty("retryInterval", "500");
- props.setProperty("connectionsPerServer", "1");
+ PoolFactory pf = PoolManager.createFactory();
+ pf.addServer("localhost", port3);
+ pf.setSubscriptionEnabled(false);
+ pf.setReadTimeout(2000);
+ pf.setThreadLocalConnections(true);
+ pf.setMinConnections(1);
+ pf.setSocketBufferSize(32768);
+ pf.setRetryAttempts(1);
+ pf.setPingInterval(500);
- proxy = BridgePoolImpl.create(props, true/*useByBridgeWriter*/);
+ proxy = (PoolImpl) pf.create("clientPool");
}catch (Exception ex) {
ex.printStackTrace();
fail("Failed to initialize client");
@@ -230,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();
@@ -272,16 +274,16 @@ public class ConnectionProxyJUnitTest
// final int maxWaitTime = 10000;
try {
- Properties props = new Properties();
- props.setProperty("retryAttempts", "1");
- props.setProperty("endpoints", "ep1=localhost:"+port3);
- props.setProperty("establishCallbackConnection", "false");
- props.setProperty("LBPolicy", "Sticky");
- props.setProperty("readTimeout", "2000");
- props.setProperty("socketBufferSize", "32768");
- props.setProperty("retryInterval", "500");
- props.setProperty("connectionsPerServer", "1");
- proxy = BridgePoolImpl.create(props, true/*useByBridgeWriter*/);
+ PoolFactory pf = PoolManager.createFactory();
+ pf.addServer("localhost", port3);
+ pf.setSubscriptionEnabled(false);
+ pf.setReadTimeout(2000);
+ pf.setThreadLocalConnections(true);
+ pf.setMinConnections(1);
+ pf.setSocketBufferSize(32768);
+ pf.setRetryAttempts(1);
+ pf.setPingInterval(500);
+ proxy = (PoolImpl) pf.create("clientPool");
}catch (Exception ex) {
ex.printStackTrace();
fail("Failed to initialize client");
@@ -291,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();
@@ -324,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();
@@ -337,11 +339,11 @@ public class ConnectionProxyJUnitTest
fail("Failed to create server");
}
try {
- Properties props = new Properties();
- props.setProperty("endpoints", "ep1=localhost:" + port3);
- props.setProperty("establishCallbackConnection", "true");
- props.setProperty("redundancyLevel", "-1");
- proxy = BridgePoolImpl.create(props, true/*useByBridgeWriter*/);
+ PoolFactory pf = PoolManager.createFactory();
+ pf.addServer("localhost", port3);
+ pf.setSubscriptionEnabled(true);
+ pf.setSubscriptionRedundancy(-1);
+ proxy = (PoolImpl) pf.create("clientPool");
if (proxy.getThreadIdToSequenceIdMap() == null) {
fail(" ThreadIdToSequenceIdMap is null. ");
}
@@ -368,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();
@@ -381,14 +383,13 @@ public class ConnectionProxyJUnitTest
fail("Failed to create server");
}
try {
- Properties props = new Properties();
- props.setProperty("endpoints", "ep1=localhost:"+port3);
- props.setProperty("redundancyLevel", "-1");
- props.setProperty("clientAckInterval", "2000");
- props.setProperty("messageTrackingTimeout", "4000");
- props.setProperty("establishCallbackConnection", "true");
-
- proxy = BridgePoolImpl.create(props, true/*useByBridgeWriter*/);
+ PoolFactory pf = PoolManager.createFactory();
+ pf.addServer("localhost", port3);
+ pf.setSubscriptionEnabled(true);
+ pf.setSubscriptionRedundancy(-1);
+ pf.setSubscriptionMessageTrackingTimeout(4000);
+ pf.setSubscriptionAckInterval(2000);
+ proxy = (PoolImpl) pf.create("clientPool");
EventID eid = new EventID(new byte[0],1,1);
if(proxy.verifyIfDuplicate(eid)){
@@ -419,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();
@@ -432,12 +433,13 @@ public class ConnectionProxyJUnitTest
fail("Failed to create server");
}
try {
- Properties props = new Properties();
- props.setProperty("endpoints", "ep1=localhost:"+port3);
- props.setProperty("establishCallbackConnection", "true");
- props.setProperty("redundancyLevel", "-1");
- props.setProperty("messageTrackingTimeout", "10000");
- proxy = BridgePoolImpl.create(props, true/*useByBridgeWriter*/);
+ PoolFactory pf = PoolManager.createFactory();
+ pf.addServer("localhost", port3);
+ pf.setSubscriptionEnabled(true);
+ pf.setSubscriptionRedundancy(-1);
+ pf.setSubscriptionMessageTrackingTimeout(10000);
+
+ proxy = (PoolImpl) pf.create("clientPool");
final EventID eid = new EventID(new byte[0],1,1);
if(proxy.verifyIfDuplicate(eid)){
@@ -470,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();
@@ -483,14 +485,14 @@ public class ConnectionProxyJUnitTest
fail("Failed to create server");
}
try {
- Properties props = new Properties();
- props.setProperty("endpoints", "ep1=localhost:"+port3);
- props.setProperty("redundancyLevel", "-1");
- props.setProperty("clientAckInterval", "2000");
- props.setProperty("messageTrackingTimeout", "5000");
- props.setProperty("establishCallbackConnection", "true");
+ PoolFactory pf = PoolManager.createFactory();
+ pf.addServer("localhost", port3);
+ pf.setSubscriptionEnabled(true);
+ pf.setSubscriptionRedundancy(-1);
+ pf.setSubscriptionMessageTrackingTimeout(5000);
+ pf.setSubscriptionAckInterval(2000);
+ proxy = (PoolImpl) pf.create("clientPool");
- proxy = BridgePoolImpl.create(props, true/*useByBridgeWriter*/);
final int EVENT_ID_COUNT = 10000; // why 10,000?
EventID[] eid = new EventID[EVENT_ID_COUNT];
for (int i = 0; i < EVENT_ID_COUNT; i++) {
@@ -525,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();
@@ -538,12 +540,13 @@ public class ConnectionProxyJUnitTest
fail("Failed to create server");
}
try {
- Properties props = new Properties();
- props.setProperty("endpoints", "ep1=localhost:"+port3);
- props.setProperty("establishCallbackConnection", "true");
- props.setProperty("redundancyLevel", "-1");
- props.setProperty("messageTrackingTimeout", "100000");
- proxy = BridgePoolImpl.create(props, true/*useByBridgeWriter*/);
+ PoolFactory pf = PoolManager.createFactory();
+ pf.addServer("localhost", port3);
+ pf.setSubscriptionEnabled(true);
+ pf.setSubscriptionRedundancy(-1);
+ pf.setSubscriptionMessageTrackingTimeout(100000);
+ proxy = (PoolImpl) pf.create("clientPool");
+
EventID eid1 = new EventID(new byte[0],1,5);
if(proxy.verifyIfDuplicate(eid1)){
fail(" eid1 can never be duplicate, it is being created for the first time! ");
@@ -562,7 +565,7 @@ public class ConnectionProxyJUnitTest
}
assertTrue(!proxy.getThreadIdToSequenceIdMap().isEmpty());
- proxy.close();
+ proxy.destroy();
}
catch (Exception ex) {
ex.printStackTrace();
@@ -583,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();
@@ -596,12 +599,13 @@ public class ConnectionProxyJUnitTest
fail("Failed to create server");
}
try {
- Properties props = new Properties();
- props.setProperty("endpoints", "ep1=localhost:"+port3);
- props.setProperty("establishCallbackConnection", "true");
- props.setProperty("redundancyLevel", "-1");
- props.setProperty("messageTrackingTimeout", "100000");
- proxy = BridgePoolImpl.create(props, true/*useByBridgeWriter*/);
+ PoolFactory pf = PoolManager.createFactory();
+ pf.addServer("localhost", port3);
+ pf.setSubscriptionEnabled(true);
+ pf.setSubscriptionRedundancy(-1);
+ pf.setSubscriptionMessageTrackingTimeout(100000);
+ proxy = (PoolImpl) pf.create("clientPool");
+
EventID eid1 = new EventID(new byte[0],1,2);
if(proxy.verifyIfDuplicate(eid1)){
fail(" eid can never be duplicate, it is being created for the first time! ");
@@ -640,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();
@@ -653,22 +657,28 @@ public class ConnectionProxyJUnitTest
fail("Failed to create server");
}
try {
- Properties props = new Properties();
- props.setProperty("endpoints", "ep1=localhost:"+port3);
- props.setProperty("establishCallbackConnection", "true");
- props.setProperty("redundancyLevel", "-1");
- props.setProperty("messageTrackingTimeout", "100000");
- BridgePoolImpl proxy1 = BridgePoolImpl.create(props, true/*useByBridgeWriter*/);
- BridgePoolImpl proxy2 = BridgePoolImpl.create(props, true/*useByBridgeWriter*/);
+ PoolFactory pf = PoolManager.createFactory();
+ pf.addServer("localhost", port3);
+ pf.setSubscriptionEnabled(true);
+ pf.setSubscriptionRedundancy(-1);
+ pf.setSubscriptionMessageTrackingTimeout(100000);
+
+ PoolImpl proxy1 = (PoolImpl) pf.create("clientPool1");
+ try {
+ PoolImpl proxy2 = (PoolImpl) pf.create("clientPool2");
+ try {
Map map1 = proxy1.getThreadIdToSequenceIdMap();
Map map2 = proxy2.getThreadIdToSequenceIdMap();
assertTrue(!(map1==map2));
- // Close the proxies to remove them from the set of all proxies
- proxy1.close();
- proxy2.close();
+ } finally {
+ proxy2.destroy();
+ }
+ } finally {
+ proxy1.destroy();
+ }
}
catch (Exception ex) {
ex.printStackTrace();
@@ -686,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();
}
@@ -698,15 +708,15 @@ public class ConnectionProxyJUnitTest
fail("Failed to create server");
}
try {
- Properties props = new Properties();
- props.setProperty("endpoints", "ep1=localhost:"+port);
- props.setProperty("establishCallbackConnection", "true");
- props.setProperty("redundancyLevel", "1");
- props.setProperty("readTimeout", "20000");
- props.setProperty("messageTrackingTimeout", "15000");
- props.setProperty("clientAckInterval", "5000");
+ PoolFactory pf = PoolManager.createFactory();
+ pf.addServer("localhost", port);
+ pf.setSubscriptionEnabled(true);
+ pf.setSubscriptionRedundancy(1);
+ pf.setReadTimeout(20000);
+ pf.setSubscriptionMessageTrackingTimeout(15000);
+ pf.setSubscriptionAckInterval(5000);
- proxy = BridgePoolImpl.create(props, true/*useByBridgeWriter*/);
+ proxy = (PoolImpl) pf.create("clientPool");
EventID eid = new EventID(new byte[0],1,1);
@@ -757,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();
}
@@ -769,14 +779,15 @@ public class ConnectionProxyJUnitTest
fail("Failed to create server");
}
try {
- Properties props = new Properties();
- props.setProperty("endpoints", "ep1=localhost:"+port);
- props.setProperty("readTimeout", "20000");
- props.setProperty("messageTrackingTimeout", "8000");
- props.setProperty("clientAckInterval", "2000");
- props.setProperty("establishCallbackConnection", "true");
+ PoolFactory pf = PoolManager.createFactory();
+ pf.addServer("localhost", port);
+ pf.setSubscriptionEnabled(true);
+ pf.setSubscriptionRedundancy(1);
+ pf.setReadTimeout(20000);
+ pf.setSubscriptionMessageTrackingTimeout(8000);
+ pf.setSubscriptionAckInterval(2000);
- proxy = BridgePoolImpl.create(props, true/*useByBridgeWriter*/);
+ proxy = (PoolImpl) pf.create("clientPool");
EventID eid = new EventID(new byte[0],1,1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/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..85bd4d1 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,16 +27,16 @@ 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;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.InternalDataSerializer;
import com.gemstone.gemfire.internal.InternalDataSerializer.SerializerAttributesHolder;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
-import com.gemstone.gemfire.internal.cache.BridgeServerImpl;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.EventID;
import dunit.DistributedTestCase;
@@ -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());
+ CacheServerImpl bs = (CacheServerImpl)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()
+ CacheServerImpl bs = (CacheServerImpl)c.getCacheServers().iterator()
.next();
assertNotNull(bs);
bs.start();
@@ -726,9 +726,9 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
client2.invoke(DataSerializerPropogationDUnitTest.class,
"createClientCache", new Object[] {
getServerHostName(server2.getHost()), new Integer(PORT2) });
- setBridgeObserver1();
+ setClientServerObserver1();
client2
- .invoke(DataSerializerPropogationDUnitTest.class, "setBridgeObserver2");
+ .invoke(DataSerializerPropogationDUnitTest.class, "setClientServerObserver2");
registerDSObject13();
@@ -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);
@@ -905,9 +905,9 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
return new Integer(port);
}
- public static void setBridgeObserver1() {
+ public static void setClientServerObserver1() {
PoolImpl.IS_INSTANTIATOR_CALLBACK = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
@Override
public void beforeSendingToServer(EventID eventID) {
eventId = eventID;
@@ -928,9 +928,9 @@ public class DataSerializerPropogationDUnitTest extends DistributedTestCase {
eventId = eventID;
}
- public static void setBridgeObserver2() {
+ public static void setClientServerObserver2() {
PoolImpl.IS_INSTANTIATOR_CALLBACK = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
@Override
public void afterReceivingFromServer(EventID eventID) {
testEventIDResult = eventID.equals(eventId);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/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/2eb4e175/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..8d2ef40 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,12 +28,12 @@ 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;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeServerImpl;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import dunit.DistributedTestCase;
import dunit.Host;
@@ -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);
@@ -563,8 +563,8 @@ public class DurableClientReconnectDUnitTest extends DistributedTestCase
.getClientProxies().size();
}
- private static BridgeServerImpl getBridgeServer() {
- BridgeServerImpl bridgeServer = (BridgeServerImpl) cache.getBridgeServers().iterator().next();
+ private static CacheServerImpl getBridgeServer() {
+ CacheServerImpl bridgeServer = (CacheServerImpl) cache.getCacheServers().iterator().next();
assertNotNull(bridgeServer);
return bridgeServer;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/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..f8f036e 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
@@ -18,7 +18,7 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeServerImpl;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.cache.client.*;
import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
@@ -269,8 +269,8 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase {
try {
Cache cache = CacheServerTestUtil.getCache();
com.gemstone.gemfire.LogWriter logger = cache.getLogger();
- BridgeServerImpl currentServer = (BridgeServerImpl)(new ArrayList(cache
- .getBridgeServers()).get(0));
+ CacheServerImpl currentServer = (CacheServerImpl)(new ArrayList(cache
+ .getCacheServers()).get(0));
AcceptorImpl ai = currentServer.getAcceptor();
CacheClientNotifier notifier = ai.getCacheClientNotifier();
CacheClientNotifierStats stats = notifier.getStats();
@@ -290,8 +290,8 @@ public class DurableClientStatsDUnitTest extends DistributedTestCase {
try {
Cache cache = CacheServerTestUtil.getCache();
com.gemstone.gemfire.LogWriter logger = cache.getLogger();
- BridgeServerImpl currentServer = (BridgeServerImpl)(new ArrayList(cache
- .getBridgeServers()).get(0));
+ CacheServerImpl currentServer = (CacheServerImpl)(new ArrayList(cache
+ .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/2eb4e175/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..14c7ac4 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
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeServerImpl;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.FilterProfile;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.InitialImageOperation;
@@ -835,9 +835,9 @@ public class DurableRegistrationDUnitTest extends DistributedTestCase {
return proxy;
}
- private static BridgeServerImpl getBridgeServer() {
- BridgeServerImpl bridgeServer = (BridgeServerImpl)CacheServerTestUtil
- .getCache().getBridgeServers().iterator().next();
+ private static CacheServerImpl getBridgeServer() {
+ CacheServerImpl bridgeServer = (CacheServerImpl)CacheServerTestUtil
+ .getCache().getCacheServers().iterator().next();
assertNotNull(bridgeServer);
return bridgeServer;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/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..79f7281 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,11 +10,11 @@ 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;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.cache.client.*;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
@@ -147,7 +147,7 @@ public class DurableResponseMatrixDUnitTest extends DistributedTestCase
public void testRegisterInterest_Destroy_Concurrent() throws Exception
{
PoolImpl.BEFORE_REGISTER_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeInterestRegistration()
{
Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
@@ -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/2eb4e175/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..c52e7a5 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,10 +21,10 @@ 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;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -174,10 +174,10 @@ public class EventIDVerificationDUnitTest extends DistributedTestCase
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setMirrorType(MirrorType.NONE);
- BridgeTestCase.configureConnectionPool(factory, host, new int[] {PORT1,PORT2}, true, -1, 2, null, -1, -1, false, -2);
+ ClientServerTestCase.configureConnectionPool(factory, host, new int[] {PORT1,PORT2}, true, -1, 2, null, -1, -1, false, -2);
- CacheWriter writer = new CacheWriterAdapter() { // couldn't port this test to pool because it subclasses BridgeWriter
+ CacheWriter writer = new CacheWriterAdapter() {
public void beforeCreate(EntryEvent event)
{
vm0.invoke(EventIDVerificationDUnitTest.class, "setEventIDData",
@@ -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/2eb4e175/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/2eb4e175/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..c8d5fcc 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,14 +20,14 @@ 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;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
-import com.gemstone.gemfire.internal.cache.BridgeServerImpl;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.tier.InterestType;
@@ -285,9 +285,9 @@ public class HAInterestBaseTest extends DistributedTestCase {
r1.put(k2, server_k2);
}
- public static void setBridgeObserverForBeforeInterestRecoveryFailure() {
+ public static void setClientServerObserverForBeforeInterestRecoveryFailure() {
PoolImpl.BEFORE_RECOVER_INTEREST_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeInterestRecovery() {
synchronized (HAInterestBaseTest.class) {
Thread t = new Thread() {
@@ -310,9 +310,9 @@ public class HAInterestBaseTest extends DistributedTestCase {
});
}
- public static void setBridgeObserverForBeforeInterestRecovery() {
+ public static void setClientServerObserverForBeforeInterestRecovery() {
PoolImpl.BEFORE_RECOVER_INTEREST_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeInterestRecovery() {
synchronized (HAInterestBaseTest.class) {
Thread t = new Thread() {
@@ -341,9 +341,9 @@ public class HAInterestBaseTest extends DistributedTestCase {
}
}
- public static void setBridgeObserverForBeforeRegistration(final VM vm) {
+ public static void setClientServerObserverForBeforeRegistration(final VM vm) {
PoolImpl.BEFORE_REGISTER_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeInterestRegistration() {
synchronized (HAInterestBaseTest.class) {
vm.invoke(HAInterestBaseTest.class, "startServer");
@@ -364,9 +364,9 @@ public class HAInterestBaseTest extends DistributedTestCase {
}
}
- public static void setBridgeObserverForAfterRegistration(final VM vm) {
+ public static void setClientServerObserverForAfterRegistration(final VM vm) {
PoolImpl.AFTER_REGISTER_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void afterInterestRegistration() {
synchronized (HAInterestBaseTest.class) {
vm.invoke(HAInterestBaseTest.class, "startServer");
@@ -389,7 +389,7 @@ public class HAInterestBaseTest extends DistributedTestCase {
}
}
- public static void unSetBridgeObserverForRegistrationCallback() {
+ public static void unSetClientServerObserverForRegistrationCallback() {
synchronized (HAInterestBaseTest.class) {
PoolImpl.BEFORE_REGISTER_CALLBACK_FLAG = false;
PoolImpl.AFTER_REGISTER_CALLBACK_FLAG = false;
@@ -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();
+ CacheServerImpl bs = (CacheServerImpl) 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();
+ CacheServerImpl bs = (CacheServerImpl) 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());
+ CacheServerImpl bs = (CacheServerImpl) 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());
+ CacheServerImpl bs = (CacheServerImpl) 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();
+ CacheServerImpl bs = (CacheServerImpl) 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();
+ CacheServerImpl bs = (CacheServerImpl) 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/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
index 2ea7f7c..995bc31 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
@@ -82,12 +82,12 @@ public class HAInterestPart2DUnitTest extends HAInterestBaseTest {
VM backup = getBackupVM();
backup.invoke(HAInterestBaseTest.class, "stopServer");
verifyDeadAndLiveServers(1, 2);
- setBridgeObserverForBeforeRegistration(backup);
+ setClientServerObserverForBeforeRegistration(backup);
try {
registerK1AndK2();
waitForBeforeRegistrationCallback();
} finally {
- unSetBridgeObserverForRegistrationCallback();
+ unSetClientServerObserverForRegistrationCallback();
}
server1.invoke(HAInterestBaseTest.class, "verifyInterestRegistration");
server2.invoke(HAInterestBaseTest.class, "verifyInterestRegistration");
@@ -111,12 +111,12 @@ public class HAInterestPart2DUnitTest extends HAInterestBaseTest {
backup.invoke(HAInterestBaseTest.class, "stopServer");
verifyDeadAndLiveServers(1, 2);
- setBridgeObserverForAfterRegistration(backup);
+ setClientServerObserverForAfterRegistration(backup);
try {
registerK1AndK2();
waitForAfterRegistrationCallback();
} finally {
- unSetBridgeObserverForRegistrationCallback();
+ unSetClientServerObserverForRegistrationCallback();
}
server1.invoke(HAInterestBaseTest.class, "verifyInterestRegistration");
@@ -248,7 +248,7 @@ public class HAInterestPart2DUnitTest extends HAInterestBaseTest {
// put on stopped server
server1.invoke(HAInterestBaseTest.class, "putK1andK2");
// spawn a thread to put on server , which will acquire a lock on entry
- setBridgeObserverForBeforeInterestRecovery();
+ setClientServerObserverForBeforeInterestRecovery();
server1.invoke(HAInterestBaseTest.class, "startServer");
verifyDeadAndLiveServers(0, 1);
waitForBeforeInterestRecoveryCallBack();
@@ -304,7 +304,7 @@ public class HAInterestPart2DUnitTest extends HAInterestBaseTest {
verifyDeadAndLiveServers(2, 0);
primary.invoke(HAInterestBaseTest.class, "putK1andK2");
- setBridgeObserverForBeforeInterestRecoveryFailure();
+ setClientServerObserverForBeforeInterestRecoveryFailure();
primary.invoke(HAInterestBaseTest.class, "startServer");
waitForBeforeInterestRecoveryCallBack();
if (exceptionOccured) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/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..4242fe0 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,14 +22,14 @@ 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;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
-import com.gemstone.gemfire.internal.cache.BridgeServerImpl;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import dunit.DistributedTestCase;
import dunit.Host;
@@ -98,23 +98,23 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
- setBridgeObserver();
+ setClientServerObserver();
server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
waitForPrimaryIdentification();
//primary
server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive");
- unSetBridgeObserver();
+ unSetClientServerObserver();
//secondary
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
- setBridgeObserver();
+ setClientServerObserver();
server2.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
//primary
waitForPrimaryIdentification();
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive");
- unSetBridgeObserver();
+ unSetClientServerObserver();
server3.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
// All servers are dead at this point , no primary in the system.
verifyDeadAndLiveServers(3,0);
@@ -146,7 +146,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
//secondary
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
- setBridgeObserver();
+ setClientServerObserver();
//stop new primary
server2.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
@@ -156,7 +156,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
//newly selectd primary
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive");
- unSetBridgeObserver();
+ unSetClientServerObserver();
}
/**
@@ -174,7 +174,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
// secondaries
server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
- setBridgeObserver();
+ setClientServerObserver();
server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
//stop ProbablePrimary
@@ -185,7 +185,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
waitForPrimaryIdentification();
//new primary
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive");
- unSetBridgeObserver();
+ unSetClientServerObserver();
}
@@ -212,10 +212,10 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
server1.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive");
server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
server3.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsNotAlive");
- setBridgeObserver();
+ setClientServerObserver();
server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
waitForPrimaryIdentification();
- unSetBridgeObserver();
+ unSetClientServerObserver();
verifyDeadAndLiveServers(1,2);
server2.invoke(HAStartupAndFailoverDUnitTest.class, "verifyDispatcherIsAlive");
}
@@ -288,31 +288,6 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
verifyDeadAndLiveServers(1,2);
}
-
- // darrel: this following is an invalid test.
- // A "primary" is only identified when you have a callback connection
-// /**
-// * Tests failover initialization by cache operation Threads on Primary
-// */
-// public void testInitiateFailoverByCacheOperationThreads_Primary() throws Exception
-// {
-// // create a client with large retry interval for server monitors and no client updater thread
-// // so that only cache operation can detect a server failure and should initiate failover
-// createClientCacheWithLargeRetryIntervalAndWithoutCallbackConnection(this.getName());
-// setBridgeObserver();
-// server1.invoke(HAStartupAndFailoverDUnitTest.class, "stopServer");
-// releaseConnection();//Added by Jason
-// put();
-// waitForPrimaryIdentification();
-// unSetBridgeObserver();
-// verifyDeadAndLiveServers(1,2);
-// }
-// public static void releaseConnection() {
-// Region r1 = cache.getRegion("/" + REGION_NAME);
-// BridgeWriter bw = (BridgeWriter)r1.getAttributes().getCacheWriter();
-// bw.release();
-// }
-
public static void put()
{
try {
@@ -357,9 +332,9 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
// start = System.currentTimeMillis();
}
- public static void setBridgeObserver() {
+ public static void setClientServerObserver() {
PoolImpl.AFTER_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void afterPrimaryIdentificationFromBackup(ServerLocation primaryEndpoint) {
synchronized (HAStartupAndFailoverDUnitTest.class) {
HAStartupAndFailoverDUnitTest.identifiedPrimary = true;
@@ -369,12 +344,12 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
});
}
- public static void unSetBridgeObserver()
+ public static void unSetClientServerObserver()
{
synchronized (HAStartupAndFailoverDUnitTest.class) {
PoolImpl.AFTER_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = false;
HAStartupAndFailoverDUnitTest.identifiedPrimary = false;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter());
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter());
}
}
@@ -383,8 +358,8 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
{
try {
assertEquals("Expected exactly one BridgeServer", 1, cache
- .getBridgeServers().size());
- BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers()
+ .getCacheServers().size());
+ CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers()
.iterator().next();
assertNotNull(bs);
bs.stop();
@@ -430,8 +405,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());
+ CacheServerImpl bs = (CacheServerImpl) c.getCacheServers()
.iterator().next();
assertNotNull(bs);
bs.start();
@@ -473,7 +448,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 +456,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
};
DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
- BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers()
+ CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers()
.iterator().next();
assertNotNull(bs);
assertNotNull(bs.getAcceptor());
@@ -529,11 +504,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 +516,7 @@ public class HAStartupAndFailoverDUnitTest extends DistributedTestCase
};
DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
- BridgeServerImpl bs = (BridgeServerImpl)c.getBridgeServers().iterator()
+ CacheServerImpl bs = (CacheServerImpl)c.getCacheServers().iterator()
.next();
assertNotNull(bs);
assertNotNull(bs.getAcceptor());
@@ -714,7 +689,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/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
index 493840b..d1ba9d6 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeServerImpl;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.cache.client.*;
import com.gemstone.gemfire.cache.NoSubscriptionServersAvailableException;
@@ -566,7 +566,7 @@ public class InterestListDUnitTest extends DistributedTestCase
/** wait for queues to drain in the server */
public static void flushQueues() throws Exception {
- BridgeServerImpl impl = (BridgeServerImpl)server;
+ CacheServerImpl impl = (CacheServerImpl)server;
for (CacheClientProxy proxy: (Set<CacheClientProxy>)impl.getAllClientSessions()) {
final CacheClientProxy fproxy = proxy;
WaitCriterion ev = new WaitCriterion() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/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..ca34569 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,12 +29,12 @@ 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;
import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.cache.BridgeServerImpl;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import dunit.DistributedTestCase;
import dunit.Host;
@@ -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());
+ CacheServerImpl bs = (CacheServerImpl) 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());
+ CacheServerImpl bs = (CacheServerImpl) c.getCacheServers().iterator().next();
assertNotNull(bs);
assertNotNull(bs.getAcceptor());
assertNotNull(bs.getAcceptor().getCacheClientNotifier());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/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/2eb4e175/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..ebaba34 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,11 +24,11 @@ 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;
-import com.gemstone.gemfire.internal.cache.BridgeServerImpl;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.cache.client.*;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
@@ -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());
+ CacheServerImpl bs = (CacheServerImpl)c.getCacheServers().iterator()
.next();
assertNotNull(bs);
assertNotNull(bs.getAcceptor());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/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/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
index c448511..4cb31e7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.client.Pool;
-import com.gemstone.gemfire.cache.util.BridgeWriter;
+import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.cache.tier.ConnectionProxy;
@@ -46,9 +46,6 @@ public class RedundancyLevelJUnitTest
/** The distributed system */
Cache cache;
- /** The proxy instance */
- ConnectionProxy proxy = null;
-
/**
* Close the cache and proxy instances for a test and disconnect from the
* distributed system.
@@ -71,9 +68,6 @@ public class RedundancyLevelJUnitTest
system.disconnect();
}
- if (proxy != null) {
- proxy.close();
- }
}
/**
@@ -114,16 +108,14 @@ public class RedundancyLevelJUnitTest
assertNotNull("cache was null", cache);
Region region = cache.getRegion("/root/exampleRegion");
assertNotNull(region);
- BridgeWriter writer = (BridgeWriter)region.getAttributes()
- .getCacheWriter();
- Pool pool = (Pool)writer.getConnectionProxy();
+ Pool pool = PoolManager.find("clientPool");
assertEquals(
"Redundancy level not matching the one specified in cache-xml", 6,
pool.getSubscriptionRedundancy());
} finally {
final String removeExpected =
"<ExpectedException action=remove>" + expected + "</ExpectedException>";
- cache.getLogger().info(removeExpected);
+ system.getLogWriter().info(removeExpected);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
index c1f4aab..05f5449 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart1DUnitTest.java
@@ -81,7 +81,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
*/
public void testRedundancyNotSpecifiedPrimaryServerFails()
{
- /*BridgeObserver oldBo = BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ /*ClientServerObserver oldBo = ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeFailoverByCacheClientUpdater(Endpoint epFailed)
{
try{
@@ -123,7 +123,7 @@ public class RedundancyLevelPart1DUnitTest extends RedundancyLevelTestBase
"test failed due to exception in test RedundancyNotSpecifiedPrimaryServerFails ",
ex);
}/*finally {
- BridgeObserverHolder.setInstance(oldBo);
+ ClientServerObserverHolder.setInstance(oldBo);
}*/
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
index 7869289..3d11b5b 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelPart3DUnitTest.java
@@ -7,8 +7,8 @@
*/
package com.gemstone.gemfire.internal.cache.tier.sockets;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import dunit.DistributedTestCase;
@@ -59,7 +59,7 @@ public class RedundancyLevelPart3DUnitTest extends RedundancyLevelTestBase
PoolImpl.BEFORE_RECOVER_INTEREST_CALLBACK_FLAG = true;
registerInterestCalled = false;
makePrimaryCalled = false;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeInterestRegistration()
{
registerInterestCalled = true;