You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by vf...@apache.org on 2015/11/25 20:07:46 UTC
[33/50] [abbrv] 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/ha/FailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
index af4e64f..7c623d9 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
@@ -20,14 +20,14 @@ 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.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;
-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.cache.tier.sockets.CacheServerTestUtil;
import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
import com.gemstone.gemfire.cache.client.PoolManager;
@@ -98,7 +98,7 @@ public class FailoverDUnitTest extends DistributedTestCase
registerInterestList();
primary.invoke(FailoverDUnitTest.class, "put");
verifyEntries();
- setBridgeObserver();
+ setClientServerObserver();
primary.invoke(FailoverDUnitTest.class, "stopServer");
verifyEntriesAfterFailover();
}
@@ -135,7 +135,7 @@ public class FailoverDUnitTest extends DistributedTestCase
*/
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- BridgeTestCase.configureConnectionPoolWithName(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null, "FailoverPool");
+ ClientServerTestCase.configureConnectionPoolWithName(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null, "FailoverPool");
factory.setCacheListener(new CacheListenerAdapter() {
public void afterUpdate(EntryEvent event)
{
@@ -157,7 +157,7 @@ public class FailoverDUnitTest extends DistributedTestCase
RegionAttributes attrs = factory.create();
cache.createRegion(regionName, attrs);
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET) ;
- BridgeServer server1 = cache.addBridgeServer();
+ CacheServer server1 = cache.addCacheServer();
server1.setPort(port);
server1.setNotifyBySubscription(true);
server1.start();
@@ -224,9 +224,9 @@ public class FailoverDUnitTest 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();
}
}
@@ -270,9 +270,9 @@ public class FailoverDUnitTest extends DistributedTestCase
assertEquals("value-3", r.getEntry("key-3").getValue());
}
- public static void setBridgeObserver() {
+ public static void setClientServerObserver() {
PoolImpl.BEFORE_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforePrimaryIdentificationFromBackup() {
primary.invoke(FailoverDUnitTest.class, "putDuringFailover");
PoolImpl.BEFORE_PRIMARY_IDENTIFICATION_FROM_BACKUP_CALLBACK_FLAG = false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
index b6a831e..d92c00a 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
@@ -19,12 +19,12 @@ 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.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
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;
@@ -132,7 +132,7 @@ public class HABugInPutDUnitTest extends DistributedTestCase
factory.setDataPolicy(DataPolicy.REPLICATE);
RegionAttributes attrs = factory.create();
cache.createRegion(REGION_NAME, attrs);
- BridgeServerImpl server = (BridgeServerImpl)cache.addBridgeServer();
+ CacheServerImpl server = (CacheServerImpl)cache.addCacheServer();
assertNotNull(server);
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
server.setPort(port);
@@ -152,7 +152,7 @@ public class HABugInPutDUnitTest extends DistributedTestCase
new HABugInPutDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- BridgeTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null);
+ ClientServerTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null);
RegionAttributes attrs = factory.create();
cache.createRegion(REGION_NAME, attrs);
Region region = cache.getRegion(Region.SEPARATOR + REGION_NAME);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
index f9d563f..1e93273 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
@@ -19,11 +19,11 @@ import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.RegionEvent;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
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.CacheObserverAdapter;
import com.gemstone.gemfire.internal.cache.CacheObserverHolder;
import com.gemstone.gemfire.internal.cache.LocalRegion;
@@ -61,7 +61,7 @@ public class HAClearDUnitTest extends DistributedTestCase
protected static Cache cache = null;
- static BridgeServerImpl server = null;
+ static CacheServerImpl server = null;
static final int NO_OF_PUTS = 100;
@@ -572,7 +572,7 @@ public class HAClearDUnitTest extends DistributedTestCase
factory.setDataPolicy(DataPolicy.REPLICATE);
RegionAttributes attrs = factory.create();
cache.createRegion(REGION_NAME, attrs);
- server = (BridgeServerImpl)cache.addBridgeServer();
+ server = (CacheServerImpl)cache.addCacheServer();
assertNotNull(server);
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
server.setPort(port);
@@ -603,7 +603,7 @@ public class HAClearDUnitTest extends DistributedTestCase
new HAClearDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- BridgeTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null);
+ ClientServerTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null);
if (isListenerAttached) {
factory.setCacheListener(new CacheListenerAdapter() {
public void afterRegionClear(RegionEvent event)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
index 04a2901..ffec42d 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
@@ -21,13 +21,13 @@ 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.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.cache30.CacheTestCase;
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.tier.sockets.ConflationDUnitTest;
import dunit.Host;
@@ -311,7 +311,7 @@ public class HAConflationDUnitTest extends CacheTestCase
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
new HAConflationDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
- BridgeTestCase.configureConnectionPool(factory, host, new int[] { PORT1 }, true, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, host, new int[] { PORT1 }, true, -1, -1, null);
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setEnableConflation(true);
if (isListenerPresent.booleanValue() == true) {
@@ -346,7 +346,7 @@ public class HAConflationDUnitTest extends CacheTestCase
}
RegionAttributes attrs = factory.create();
cache.createRegion(regionName, attrs);
- BridgeServerImpl server = (BridgeServerImpl)cache.addBridgeServer();
+ CacheServerImpl server = (CacheServerImpl)cache.addCacheServer();
assertNotNull(server);
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
server.setPort(port);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
index 17412eb..830decd 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
@@ -24,11 +24,11 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
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;
@@ -67,7 +67,7 @@ public class HADuplicateDUnitTest extends DistributedTestCase
static boolean isEventDuplicate = true;
- static BridgeServerImpl server = null;
+ static CacheServerImpl server = null;
static final int NO_OF_PUTS = 100;
@@ -240,7 +240,7 @@ public class HADuplicateDUnitTest extends DistributedTestCase
factory.setDataPolicy(DataPolicy.REPLICATE);
RegionAttributes attrs = factory.create();
cache.createRegion(REGION_NAME, attrs);
- server = (BridgeServerImpl)cache.addBridgeServer();
+ server = (CacheServerImpl)cache.addCacheServer();
assertNotNull(server);
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
server.setPort(port);
@@ -269,7 +269,7 @@ public class HADuplicateDUnitTest extends DistributedTestCase
props.setProperty("locators", "");
new HADuplicateDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
- BridgeTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null);
+ ClientServerTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null);
factory.setScope(Scope.DISTRIBUTED_ACK);
CacheListener clientListener = new HAValidateDuplicateListener();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
index 16ce1c7..06beb27 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
@@ -28,11 +28,11 @@ 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.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
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.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.EventID;
import com.gemstone.gemfire.internal.cache.RegionEventImpl;
@@ -66,7 +66,7 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase
private static Cache cache = null;
/** server * */
- static BridgeServerImpl server = null;
+ static CacheServerImpl server = null;
/** test constructor * */
public HAEventIdPropagationDUnitTest(String name) {
@@ -129,7 +129,7 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase
factory.setCacheListener(clientListener);
RegionAttributes attrs = factory.create();
cache.createRegion(REGION_NAME, attrs);
- server = (BridgeServerImpl)cache.addBridgeServer();
+ server = (CacheServerImpl)cache.addCacheServer();
assertNotNull(server);
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
server.setPort(port);
@@ -160,7 +160,7 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase
props.setProperty("locators", "");
new HAEventIdPropagationDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
- PoolImpl pi = (PoolImpl)BridgeTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1}, true, -1, 2, null);
+ PoolImpl pi = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1}, true, -1, 2, null);
factory.setScope(Scope.DISTRIBUTED_ACK);
CacheListener clientListener = new HAEventIdPropagationListenerForClient();
factory.setCacheListener(clientListener);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
index 3229bf7..7ff64db 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
@@ -23,9 +23,9 @@ 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.cache.server.CacheServer;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -176,7 +176,7 @@ public class HAGIIDUnitTest extends DistributedTestCase
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
new HAGIIDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
- BridgeTestCase.configureConnectionPool(factory, host, new int[] {PORT1,PORT2}, true, -1, 2, null, 1000, -1, false, -1);
+ ClientServerTestCase.configureConnectionPool(factory, host, new int[] {PORT1,PORT2}, true, -1, 2, null, 1000, -1, false, -1);
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.addCacheListener(HAGIIDUnitTest.checker);
RegionAttributes attrs = factory.create();
@@ -192,7 +192,7 @@ public class HAGIIDUnitTest 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();
@@ -207,7 +207,7 @@ public class HAGIIDUnitTest extends DistributedTestCase
factory.setDataPolicy(DataPolicy.REPLICATE);
RegionAttributes attrs = factory.create();
cache.createRegion(REGION_NAME, attrs);
- BridgeServer server1 = cache.addBridgeServer();
+ CacheServer server1 = cache.addCacheServer();
server1.setPort(port.intValue());
server1.setNotifyBySubscription(true);
server1.start();
@@ -244,9 +244,9 @@ public class HAGIIDUnitTest 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();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
index ae2519c..c46dd19 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -27,14 +27,14 @@ 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.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.distributed.internal.InternalDistributedSystem;
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.internal.cache.ha.HAContainerMap;
import com.gemstone.gemfire.internal.cache.ha.HAContainerRegion;
@@ -165,7 +165,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
logger = cache.getLogger();
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
- BridgeServer server1 = cache.addBridgeServer();
+ CacheServer server1 = cache.addCacheServer();
server1.setPort(port);
server1.setNotifyBySubscription(true);
if (ePolicy != null) {
@@ -186,7 +186,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
public static Integer createOneMoreBridgeServer(Boolean notifyBySubscription)
throws Exception {
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
- BridgeServer server1 = cache.addBridgeServer();
+ CacheServer server1 = cache.addCacheServer();
server1.setPort(port);
server1.setNotifyBySubscription(notifyBySubscription.booleanValue());
server1.getClientSubscriptionConfig().setEvictionPolicy(
@@ -205,7 +205,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
props.setProperty(DistributionConfig.LOCATORS_NAME, "");
new HARQueueNewImplDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
- BridgeTestCase.configureConnectionPool(factory, host, port1
+ ClientServerTestCase.configureConnectionPool(factory, host, port1
.intValue(), port2.intValue(), true, Integer.parseInt(rLevel), 2, null,
1000, 250, false);
@@ -893,7 +893,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
private static void verifyNullCUMReference(Integer port) {
Region r = cache.getRegion("/"
- + BridgeServerImpl.generateNameForClientMsgsRegion(port.intValue()));
+ + CacheServerImpl.generateNameForClientMsgsRegion(port.intValue()));
assertNotNull(r);
Object[] arr = r.keySet().toArray();
@@ -905,7 +905,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
private static void verifyHaContainerDestroyed(Boolean isRegion, Integer port) {
Map r = cache.getRegion("/"
- + BridgeServerImpl.generateNameForClientMsgsRegion(port.intValue()));
+ + CacheServerImpl.generateNameForClientMsgsRegion(port.intValue()));
if (isRegion.booleanValue()) {
if (r != null) {
@@ -913,7 +913,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
}
}
else {
- r = ((BridgeServerImpl)cache.getBridgeServers().toArray()[0])
+ r = ((CacheServerImpl)cache.getCacheServers().toArray()[0])
.getAcceptor().getCacheClientNotifier().getHaContainer();
if (r != null) {
assertTrue(r.isEmpty());
@@ -942,9 +942,9 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
private static void setHACapacity(Integer cap) {
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.getClientSubscriptionConfig().setCapacity(cap.intValue());
}
}
@@ -955,9 +955,9 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
private static void stopOneBridgeServer(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();
}
@@ -970,9 +970,9 @@ public class HARQueueNewImplDUnitTest 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();
}
}
@@ -1053,7 +1053,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
public static void verifyNullValuesInCMR(final Integer numOfEntries,
final Integer port,
String[] keys) {
- final Region msgsRegion = cache.getRegion(BridgeServerImpl
+ final Region msgsRegion = cache.getRegion(CacheServerImpl
.generateNameForClientMsgsRegion(port.intValue()));
WaitCriterion wc = new WaitCriterion() {
String excuse;
@@ -1082,7 +1082,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
public static void makeValuesOfSomeKeysNullInClientMsgsRegion(Integer port,
String[] keys) {
- Region msgsRegion = cache.getRegion(BridgeServerImpl
+ Region msgsRegion = cache.getRegion(CacheServerImpl
.generateNameForClientMsgsRegion(port.intValue()));
assertNotNull(msgsRegion);
@@ -1104,7 +1104,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
public static void populateValuesOfSomeKeysInClientMsgsRegion(Integer port,
String[] keys) {
- Region msgsRegion = cache.getRegion(BridgeServerImpl
+ Region msgsRegion = cache.getRegion(CacheServerImpl
.generateNameForClientMsgsRegion(port.intValue()));
assertNotNull(msgsRegion);
@@ -1117,9 +1117,9 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
public static void startServer() {
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.start();
}
}
@@ -1132,7 +1132,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
Integer msgsRegionsize, Integer port) {
try {
// Get the clientMessagesRegion and check the size.
- Region msgsRegion = cache.getRegion(BridgeServerImpl
+ Region msgsRegion = cache.getRegion(CacheServerImpl
.generateNameForClientMsgsRegion(port.intValue()));
Region region = cache.getRegion("/" + regionName);
logger.fine("size<serverRegion, clientMsgsRegion>: " + region.size()
@@ -1173,9 +1173,9 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
return false;
}
- Iterator iter = cache.getBridgeServers().iterator();
+ Iterator iter = cache.getCacheServers().iterator();
if (iter.hasNext()) {
- BridgeServerImpl server = (BridgeServerImpl)iter.next();
+ CacheServerImpl server = (CacheServerImpl)iter.next();
Map msgsRegion = server.getAcceptor().getCacheClientNotifier()
.getHaContainer();
//Region msgsRegion = cache.getRegion(BridgeServerImpl
@@ -1215,11 +1215,11 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
", actual = " + sz;
return false;
}
- Iterator iter = cache.getBridgeServers().iterator();
+ Iterator iter = cache.getCacheServers().iterator();
if (!iter.hasNext()) {
return true;
}
- BridgeServerImpl server = (BridgeServerImpl)iter.next();
+ CacheServerImpl server = (CacheServerImpl)iter.next();
sz = server.getAcceptor().getCacheClientNotifier().getHaContainer().size();
if (sz != msgsRegionsize.intValue()) {
excuse = "Expected msgsRegionsize = " + msgsRegionsize.intValue() +
@@ -1241,19 +1241,19 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
public static void verifyHaContainerType(Boolean isRegion, Integer port) {
try {
- Map haMap = cache.getRegion(BridgeServerImpl
+ Map haMap = cache.getRegion(CacheServerImpl
.generateNameForClientMsgsRegion(port.intValue()));
if (isRegion.booleanValue()) {
assertNotNull(haMap);
assertTrue(haMap instanceof LocalRegion);
- haMap = ((BridgeServerImpl)cache.getBridgeServers().toArray()[0])
+ haMap = ((CacheServerImpl)cache.getCacheServers().toArray()[0])
.getAcceptor().getCacheClientNotifier().getHaContainer();
assertNotNull(haMap);
assertTrue(haMap instanceof HAContainerRegion);
}
else {
assertNull(haMap);
- haMap = ((BridgeServerImpl)cache.getBridgeServers().toArray()[0])
+ haMap = ((CacheServerImpl)cache.getCacheServers().toArray()[0])
.getAcceptor().getCacheClientNotifier().getHaContainer();
assertNotNull(haMap);
assertTrue(haMap instanceof HAContainerMap);
@@ -1267,7 +1267,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
public static void verifyRootRegionsDoesNotReturnCMR(Integer port) {
try {
- String cmrName = BridgeServerImpl.generateNameForClientMsgsRegion(port
+ String cmrName = CacheServerImpl.generateNameForClientMsgsRegion(port
.intValue());
Map haMap = cache.getRegion(cmrName);
assertNotNull(haMap);
@@ -1323,12 +1323,12 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase {
try {
Map haContainer = null;
haContainer = cache.getRegion(Region.SEPARATOR
- + BridgeServerImpl.generateNameForClientMsgsRegion(port.intValue()));
+ + CacheServerImpl.generateNameForClientMsgsRegion(port.intValue()));
if (haContainer == null) {
- Object[] servers = cache.getBridgeServers().toArray();
+ Object[] servers = cache.getCacheServers().toArray();
for (int i = 0; i < servers.length; i++) {
- if (port.intValue() == ((BridgeServerImpl)servers[i]).getPort()) {
- haContainer = ((BridgeServerImpl)servers[i]).getAcceptor()
+ if (port.intValue() == ((CacheServerImpl)servers[i]).getPort()) {
+ haContainer = ((CacheServerImpl)servers[i]).getAcceptor()
.getCacheClientNotifier().getHaContainer();
break;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
index a3eb9e4..90b8425 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
@@ -20,13 +20,13 @@ import com.gemstone.gemfire.cache.RegionAttributes;
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.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;
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.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
import dunit.DistributedTestCase;
import dunit.Host;
@@ -121,7 +121,7 @@ public class HASlowReceiverDUnitTest extends DistributedTestCase {
logger = cache.getLogger();
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
- BridgeServer server1 = cache.addBridgeServer();
+ CacheServer server1 = cache.addCacheServer();
server1.setPort(port);
server1.setNotifyBySubscription(true);
server1.setMaximumMessageCount(200);
@@ -260,7 +260,7 @@ public class HASlowReceiverDUnitTest extends DistributedTestCase {
public static void setBridgeObeserverForAfterQueueDestroyMessage()
throws Exception {
PoolImpl.AFTER_QUEUE_DESTROY_MESSAGE_FLAG = true;
- BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
@Override
public void afterQueueDestroyMessage() {
clientVM.invoke(HASlowReceiverDUnitTest.class, "checkRedundancyLevel",
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
index 384cb2a..10ef9d0 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
@@ -19,11 +19,11 @@ 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.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;
-import com.gemstone.gemfire.internal.cache.BridgeServerImpl;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import dunit.DistributedTestCase;
import dunit.Host;
@@ -170,7 +170,7 @@ public class OperationsPropagationDUnitTest extends DistributedTestCase
RegionAttributes attrs = factory.create();
region = cache.createRegion(REGION_NAME, attrs);
- BridgeServerImpl server = (BridgeServerImpl)cache.addBridgeServer();
+ CacheServerImpl server = (CacheServerImpl)cache.addCacheServer();
assertNotNull(server);
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
server.setPort(port);
@@ -205,7 +205,7 @@ public class OperationsPropagationDUnitTest extends DistributedTestCase
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- BridgeTestCase.configureConnectionPool(factory, host, PORT2,-1, true, -1, 2, null);
+ ClientServerTestCase.configureConnectionPool(factory, host, PORT2,-1, true, -1, 2, null);
RegionAttributes attrs = factory.create();
region = cache.createRegion(REGION_NAME, attrs);
assertNotNull(region);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
index 5407160..7cd2ebf 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
@@ -26,11 +26,11 @@ import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import com.gemstone.gemfire.cache.client.internal.QueueStateImpl.SequenceIdAndExpirationObject;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
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.EntryEventImpl;
import com.gemstone.gemfire.internal.cache.EventID;
@@ -73,7 +73,7 @@ public class PutAllDUnitTest extends DistributedTestCase
/** cache **/
private static Cache cache = null;
/** server **/
- static BridgeServerImpl server = null;
+ static CacheServerImpl server = null;
/** test constructor **/
public PutAllDUnitTest(String name) {
@@ -148,7 +148,7 @@ public class PutAllDUnitTest extends DistributedTestCase
factory.setCacheListener(clientListener);
RegionAttributes attrs = factory.create();
cache.createRegion(REGION_NAME, attrs);
- server = (BridgeServerImpl)cache.addBridgeServer();
+ server = (CacheServerImpl)cache.addCacheServer();
assertNotNull(server);
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
server.setPort(port);
@@ -189,7 +189,7 @@ public class PutAllDUnitTest extends DistributedTestCase
props.setProperty("connectionsPerServer", "2");
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- PoolImpl p = (PoolImpl)BridgeTestCase.configureConnectionPool(factory, host, PORT1,-1, true, -1, 2, null);
+ PoolImpl p = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, host, PORT1,-1, true, -1, 2, null);
CacheListener clientListener = new HAEventIdPropagationListenerForClient2();
factory.setCacheListener(clientListener);
RegionAttributes attrs = factory.create();
@@ -220,7 +220,7 @@ public class PutAllDUnitTest extends DistributedTestCase
props.setProperty("connectionsPerServer", "2");
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- PoolImpl p = (PoolImpl)BridgeTestCase.configureConnectionPool(factory, host, PORT1,-1, true, -1, 2, null);
+ PoolImpl p = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, host, PORT1,-1, true, -1, 2, null);
CacheListener clientListener = new HAEventIdPropagationListenerForClient1();
factory.setCacheListener(clientListener);
RegionAttributes attrs = factory.create();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitDisabledTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitDisabledTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitDisabledTest.java
index a12ee6d..ad5050a 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitDisabledTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitDisabledTest.java
@@ -18,8 +18,8 @@ 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.PoolImpl;
-import com.gemstone.gemfire.cache.util.BridgeServer;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -209,7 +209,7 @@ public class StatsBugDUnitDisabledTest 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(false);
@@ -236,7 +236,7 @@ public class StatsBugDUnitDisabledTest extends DistributedTestCase
cache = test.createCache(createProperties1());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- pool = (PoolImpl)BridgeTestCase.configureConnectionPool(factory, host, new int[] {port1.intValue(),port2.intValue()}, true, -1, 3, null);
+ pool = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, host, new int[] {port1.intValue(),port2.intValue()}, true, -1, 3, null);
RegionAttributes attrs = factory.create();
Region region = cache.createRegion(REGION_NAME, attrs);
region.registerInterest("ALL_KEYS");
@@ -260,7 +260,7 @@ public class StatsBugDUnitDisabledTest extends DistributedTestCase
cache = test.createCache(createProperties1());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
- pool = (PoolImpl)BridgeTestCase.configureConnectionPool(factory, host, new int[] {port1.intValue(),port2.intValue()}, true, -1, 3, null);
+ pool = (PoolImpl)ClientServerTestCase.configureConnectionPool(factory, host, new int[] {port1.intValue(),port2.intValue()}, true, -1, 3, null);
RegionAttributes attrs = factory.create();
Region region = cache.createRegion(REGION_NAME, attrs);
region.registerInterest("ALL_KEYS", false, false);
@@ -295,9 +295,9 @@ public class StatsBugDUnitDisabledTest 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();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
index 999c63b..b2c8256 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.client.ClientRegionFactory;
import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.OSProcess;
-import com.gemstone.gemfire.internal.cache.BridgeServerImpl;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.RegionEntry;
@@ -248,7 +248,7 @@ public class Bug43684DUnitTest extends DistributedTestCase {
rf.setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(numBuckets).create());
}
rf.create(REGION_NAME);
- BridgeServerImpl server = (BridgeServerImpl)cache.addCacheServer();
+ CacheServerImpl server = (CacheServerImpl)cache.addCacheServer();
server.setPort(AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET));
server.start();
return server.getPort();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
index d2b134f..7d34359 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
@@ -40,9 +40,9 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
import com.gemstone.gemfire.internal.Assert;
import com.gemstone.gemfire.internal.FileUtil;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
import com.gemstone.gemfire.internal.cache.FixedPartitionAttributesImpl;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.internal.cache.HARegion;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
index 91f75fc..b92ef5c 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
@@ -24,7 +24,7 @@ import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.cache.CacheException;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.server.CacheServer;
-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.InternalDistributedSystem;
@@ -72,13 +72,13 @@ public class AcceptorImplJUnitTest
port1,
null,
false,
- BridgeServer.DEFAULT_SOCKET_BUFFER_SIZE,
- BridgeServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
+ CacheServer.DEFAULT_SOCKET_BUFFER_SIZE,
+ CacheServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
this.cache,
AcceptorImpl.MINIMUM_MAX_CONNECTIONS - 1,
- BridgeServer.DEFAULT_MAX_THREADS,
- BridgeServer.DEFAULT_MAXIMUM_MESSAGE_COUNT,
- BridgeServer.DEFAULT_MESSAGE_TIME_TO_LIVE,0,null,null, false, false, Collections.EMPTY_LIST,
+ CacheServer.DEFAULT_MAX_THREADS,
+ CacheServer.DEFAULT_MAXIMUM_MESSAGE_COUNT,
+ CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE,0,null,null, false, false, Collections.EMPTY_LIST,
CacheServer.DEFAULT_TCP_NO_DELAY);
fail("Expected an IllegalArgumentExcption due to max conns < min pool size");
} catch (IllegalArgumentException expected) {
@@ -89,13 +89,13 @@ public class AcceptorImplJUnitTest
port2,
null,
false,
- BridgeServer.DEFAULT_SOCKET_BUFFER_SIZE,
- BridgeServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
+ CacheServer.DEFAULT_SOCKET_BUFFER_SIZE,
+ CacheServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
this.cache,
0,
- BridgeServer.DEFAULT_MAX_THREADS,
- BridgeServer.DEFAULT_MAXIMUM_MESSAGE_COUNT,
- BridgeServer.DEFAULT_MESSAGE_TIME_TO_LIVE,0,null,null,false, false, Collections.EMPTY_LIST,
+ CacheServer.DEFAULT_MAX_THREADS,
+ CacheServer.DEFAULT_MAXIMUM_MESSAGE_COUNT,
+ CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE,0,null,null,false, false, Collections.EMPTY_LIST,
CacheServer.DEFAULT_TCP_NO_DELAY);
fail("Expected an IllegalArgumentExcption due to max conns of zero");
} catch (IllegalArgumentException expected) {
@@ -106,25 +106,25 @@ public class AcceptorImplJUnitTest
port1,
null,
false,
- BridgeServer.DEFAULT_SOCKET_BUFFER_SIZE,
- BridgeServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
+ CacheServer.DEFAULT_SOCKET_BUFFER_SIZE,
+ CacheServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
this.cache,
AcceptorImpl.MINIMUM_MAX_CONNECTIONS,
- BridgeServer.DEFAULT_MAX_THREADS,
- BridgeServer.DEFAULT_MAXIMUM_MESSAGE_COUNT,
- BridgeServer.DEFAULT_MESSAGE_TIME_TO_LIVE,0,null,null,false, false, Collections.EMPTY_LIST,
+ CacheServer.DEFAULT_MAX_THREADS,
+ CacheServer.DEFAULT_MAXIMUM_MESSAGE_COUNT,
+ CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE,0,null,null,false, false, Collections.EMPTY_LIST,
CacheServer.DEFAULT_TCP_NO_DELAY);
a2 = new AcceptorImpl(
port1,
null,
false,
- BridgeServer.DEFAULT_SOCKET_BUFFER_SIZE,
- BridgeServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
+ CacheServer.DEFAULT_SOCKET_BUFFER_SIZE,
+ CacheServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
this.cache,
AcceptorImpl.MINIMUM_MAX_CONNECTIONS,
- BridgeServer.DEFAULT_MAX_THREADS,
- BridgeServer.DEFAULT_MAXIMUM_MESSAGE_COUNT,
- BridgeServer.DEFAULT_MESSAGE_TIME_TO_LIVE,0,null,null,false, false, Collections.EMPTY_LIST,
+ CacheServer.DEFAULT_MAX_THREADS,
+ CacheServer.DEFAULT_MAXIMUM_MESSAGE_COUNT,
+ CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE,0,null,null,false, false, Collections.EMPTY_LIST,
CacheServer.DEFAULT_TCP_NO_DELAY);
fail("Expecetd a BindException while attaching to the same port");
} catch (BindException expected) {
@@ -134,13 +134,13 @@ public class AcceptorImplJUnitTest
port2,
null,
false,
- BridgeServer.DEFAULT_SOCKET_BUFFER_SIZE,
- BridgeServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
+ CacheServer.DEFAULT_SOCKET_BUFFER_SIZE,
+ CacheServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
this.cache,
AcceptorImpl.MINIMUM_MAX_CONNECTIONS,
- BridgeServer.DEFAULT_MAX_THREADS,
- BridgeServer.DEFAULT_MAXIMUM_MESSAGE_COUNT,
- BridgeServer.DEFAULT_MESSAGE_TIME_TO_LIVE,0,null,null, false, false, Collections.EMPTY_LIST,
+ CacheServer.DEFAULT_MAX_THREADS,
+ CacheServer.DEFAULT_MAXIMUM_MESSAGE_COUNT,
+ CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE,0,null,null, false, false, Collections.EMPTY_LIST,
CacheServer.DEFAULT_TCP_NO_DELAY);
assertEquals(port2, a3.getPort());
InternalDistributedSystem isystem = (InternalDistributedSystem) this.cache.getDistributedSystem();
@@ -187,13 +187,13 @@ public class AcceptorImplJUnitTest
port2,
null,
false,
- BridgeServer.DEFAULT_SOCKET_BUFFER_SIZE,
- BridgeServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
+ CacheServer.DEFAULT_SOCKET_BUFFER_SIZE,
+ CacheServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
this.cache,
AcceptorImpl.MINIMUM_MAX_CONNECTIONS,
- BridgeServer.DEFAULT_MAX_THREADS,
- BridgeServer.DEFAULT_MAXIMUM_MESSAGE_COUNT,
- BridgeServer.DEFAULT_MESSAGE_TIME_TO_LIVE,null,null);
+ CacheServer.DEFAULT_MAX_THREADS,
+ CacheServer.DEFAULT_MAXIMUM_MESSAGE_COUNT,
+ CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE,null,null);
ac.start();
putMsg.setMessageType(MessageType.PUT);
putMsg.setTransactionId(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/BackwardCompatibilityCommandDUnitDisabledTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityCommandDUnitDisabledTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityCommandDUnitDisabledTest.java
deleted file mode 100755
index 05792fd..0000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityCommandDUnitDisabledTest.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.internal.cache.tier.sockets;
-
-import java.util.Properties;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.Cache;
-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.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;
-import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.cache.client.PoolManager;
-import com.gemstone.gemfire.cache.client.internal.PoolImpl;
-import com.gemstone.gemfire.internal.cache.tier.ConnectionProxy;
-import com.gemstone.gemfire.internal.cache.tier.MessageType;
-import com.gemstone.gemfire.internal.cache.tier.sockets.TestPut;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
-
-/**
- * @author Pallavi
- *
- * Test to verify that server serves different versioned clients with their
- * respective client-versions of command .
- */
-public class BackwardCompatibilityCommandDUnitDisabledTest extends DistributedTestCase {
- /** the cache */
- private static Cache cache = null;
-
- private static VM server1 = null;
-
- private static VM client1 = null;
-
- private static VM client2 = null;
-
- /** name of the test region */
- private static final String REGION_NAME = "BackwardCompatibilityCommandDUnitTest_Region";
-
- static int CLIENT_ACK_INTERVAL = 5000;
-
- private static final String k1 = "k1";
-
- private static final String k2 = "k2";
-
- private static final String client_k1 = "client-k1";
-
- private static final String client_k2 = "client-k2";
-
- public static boolean TEST_PUT_COMMAND_INVOKED = false;
-
- /** constructor */
- public BackwardCompatibilityCommandDUnitDisabledTest(String name) {
- super(name);
- }
-
- public void setUp() throws Exception {
- super.setUp();
- final Host host = Host.getHost(0);
- server1 = host.getVM(0);
- client1 = host.getVM(1);
- client2 = host.getVM(2);
- }
-
- private void createCache(Properties props) throws Exception {
- DistributedSystem ds = getSystem(props);
- ds.disconnect();
- ds = getSystem(props);
- assertNotNull(ds);
- cache = CacheFactory.create(ds);
- assertNotNull(cache);
- }
-
- public static void createClientCache(String host, Integer port1)
- throws Exception {
- new BackwardCompatibilityCommandDUnitDisabledTest("temp");
- Properties props = new Properties();
- props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
- props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new BackwardCompatibilityCommandDUnitDisabledTest("temp").createCache(props);
- PoolImpl p = (PoolImpl)PoolManager.createFactory().addServer(host,
- port1.intValue()).setSubscriptionEnabled(false)
- .setThreadLocalConnections(true).setMinConnections(1).setReadTimeout(
- 20000).setPingInterval(10000).setRetryAttempts(1)
- .create("BackwardCompatibilityCommandDUnitTest");
-
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.DISTRIBUTED_ACK);
- factory.setPoolName(p.getName());
-
- RegionAttributes attrs = factory.create();
- Region region = cache.createRegion(REGION_NAME, attrs);
- //region.registerInterest("ALL_KEYS");
- }
-
- public static Integer createServerCache(String hostName) throws Exception {
- new BackwardCompatibilityCommandDUnitDisabledTest("temp")
- .createCache(new Properties());
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.DISTRIBUTED_ACK);
- factory.setDataPolicy(DataPolicy.REPLICATE);
- RegionAttributes attrs = factory.create();
- cache.createRegion(REGION_NAME, attrs);
- int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
- BridgeServer server1 = cache.addBridgeServer();
- server1.setBindAddress(hostName);
- server1.setPort(port);
- server1.setNotifyBySubscription(true);
- server1.start();
- return new Integer(server1.getPort());
- }
-
- public void tearDown2() throws Exception {
- super.tearDown2();
- // close the clients first
- client2.invoke(BackwardCompatibilityCommandDUnitDisabledTest.class,
- "unsetHandshakeVersionForTesting");
- client1.invoke(BackwardCompatibilityCommandDUnitDisabledTest.class, "closeCache");
- client2.invoke(BackwardCompatibilityCommandDUnitDisabledTest.class, "closeCache");
- // then close the servers
- server1.invoke(BackwardCompatibilityCommandDUnitDisabledTest.class, "closeCache");
- }
-
- public static void closeCache() {
- if (cache != null && !cache.isClosed()) {
- cache.close();
- cache.getDistributedSystem().disconnect();
- }
- }
-
- /*
- * Test to verify that server serves different versioned clients with their
- * respective client-versions of command .
- */
- public void testCommand() {
- server1.invoke(BackwardCompatibilityCommandDUnitDisabledTest.class,
- "setTestCommands");
- String serverHostName = getServerHostName(server1.getHost());
- Integer port1 = ((Integer)server1.invoke(
- BackwardCompatibilityCommandDUnitDisabledTest.class, "createServerCache",
- new Object[] { serverHostName }));
-
- client1.invoke(BackwardCompatibilityCommandDUnitDisabledTest.class,
- "createClientCache", new Object[] { serverHostName, port1 });
-
- client2.invoke(BackwardCompatibilityCommandDUnitDisabledTest.class,
- "setHandshakeVersionForTesting");
- client2.invoke(BackwardCompatibilityCommandDUnitDisabledTest.class,
- "createClientCache", new Object[] { serverHostName, port1 });
-
- client1.invoke(BackwardCompatibilityCommandDUnitDisabledTest.class, "put");
- server1.invoke(BackwardCompatibilityCommandDUnitDisabledTest.class,
- "checkTestPutCommandNotInvoked");
-
- client2.invoke(BackwardCompatibilityCommandDUnitDisabledTest.class, "put");
- server1.invoke(BackwardCompatibilityCommandDUnitDisabledTest.class,
- "checkTestPutCommandInvoked");
- }
-
- /*
- * Add test command to CommandInitializer.ALL_COMMANDS.
- */
- public static void setTestCommands() throws Exception {
- getLogWriter().info("setTestCommands invoked");
- Map testCommands = new HashMap();
- testCommands.putAll((Map)CommandInitializer.ALL_COMMANDS
- .get(AcceptorImpl.VERSION));
- testCommands.put(new Integer(MessageType.PUT), new TestPut());
- CommandInitializer.testSetCommands(testCommands);
- getLogWriter().info("end of setTestCommands");
- }
-
- /*
- * Prepare to write TEST_VERSION byte from client to server during handshake.
- */
- public static void setHandshakeVersionForTesting() throws Exception {
- HandShake.setVersionForTesting(Version.TEST_VERSION.ordinal());
- }
-
- public static void put() {
- try {
- Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
- assertNotNull(r1);
-
- r1.put(k1, client_k1);
- assertEquals(r1.getEntry(k1).getValue(), client_k1);
- r1.put(k2, client_k2);
- assertEquals(r1.getEntry(k2).getValue(), client_k2);
- }
- catch (Exception ex) {
- fail("failed while put", ex);
- }
- }
-
- /*
- * Prepare to write revert back to original version from client to server
- * during handshake.
- */
- public static void unsetHandshakeVersionForTesting() throws Exception {
- HandShake.setVersionForTesting(ConnectionProxy.VERSION.ordinal());
- }
-
- /*
- * Check that TestPut command did not get invoked at server.
- */
- public static void checkTestPutCommandNotInvoked() {
- assertTrue("TestPut command got invoked for GFE57 versioned client",
- !TEST_PUT_COMMAND_INVOKED);
- }
-
- /*
- * Check whether TestPut command got invoked at server.
- */
- public static void checkTestPutCommandInvoked() {
- assertTrue(
- "TestPut command did not get invoked for higher versioned client",
- TEST_PUT_COMMAND_INVOKED);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHandshakeDUnitDisabledTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHandshakeDUnitDisabledTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHandshakeDUnitDisabledTest.java
deleted file mode 100755
index 9190d80..0000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHandshakeDUnitDisabledTest.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.internal.cache.tier.sockets;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.Cache;
-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.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;
-import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.internal.cache.tier.ConnectionProxy;
-import com.gemstone.gemfire.cache.client.PoolManager;
-import com.gemstone.gemfire.cache.client.internal.PoolImpl;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
-
-/**
- * @author Pallavi
- *
- * Test to verify handshake with equal or lower version clients. Both equal and
- * lower version clients should be able to connect to the server successfully.
- */
-public class BackwardCompatibilityHandshakeDUnitDisabledTest extends
- DistributedTestCase {
-
- /** the cache */
- private static Cache cache = null;
-
- private static VM server1 = null;
-
- private static VM client1 = null;
-
- private static VM client2 = null;
-
- /** name of the test region */
- private static final String REGION_NAME = "BackwardCompatibilityHandshakeDUnitTest_Region";
-
- static int CLIENT_ACK_INTERVAL = 5000;
-
- private static short clientVersionForTesting = Version.TEST_VERSION.ordinal();
-
- private static short currentClientVersion = ConnectionProxy.VERSION.ordinal();
-
- /** constructor */
- public BackwardCompatibilityHandshakeDUnitDisabledTest(String name) {
- super(name);
- }
-
- public void setUp() throws Exception {
- super.setUp();
- final Host host = Host.getHost(0);
- server1 = host.getVM(0);
- client1 = host.getVM(1);
- client2 = host.getVM(2);
-
- }
-
- private void createCache(Properties props) throws Exception {
- DistributedSystem ds = getSystem(props);
- ds.disconnect();
- ds = getSystem(props);
- assertNotNull(ds);
- cache = CacheFactory.create(ds);
- assertNotNull(cache);
- }
-
- public static void createClientCache(String host, Integer port1)
- throws Exception {
- new BackwardCompatibilityHandshakeDUnitDisabledTest("temp");
- Properties props = new Properties();
- props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
- props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new BackwardCompatibilityHandshakeDUnitDisabledTest("temp").createCache(props);
- PoolImpl p = (PoolImpl)PoolManager.createFactory().addServer(host,
- port1.intValue()).setSubscriptionEnabled(true)
- .setThreadLocalConnections(true).setMinConnections(1).setReadTimeout(
- 20000).setPingInterval(10000).setRetryAttempts(1)
- .setSubscriptionAckInterval(CLIENT_ACK_INTERVAL).create(
- "BackwardCompatibilityHandshakeDUnitTest");
-
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.DISTRIBUTED_ACK);
- factory.setPoolName(p.getName());
-
- RegionAttributes attrs = factory.create();
- Region region = cache.createRegion(REGION_NAME, attrs);
- region.registerInterest("ALL_KEYS");
- }
-
- public static Integer createServerCache(String serverHostName)
- throws Exception {
- new BackwardCompatibilityHandshakeDUnitDisabledTest("temp")
- .createCache(new Properties());
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.DISTRIBUTED_ACK);
- factory.setDataPolicy(DataPolicy.REPLICATE);
- RegionAttributes attrs = factory.create();
- cache.createRegion(REGION_NAME, attrs);
- int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
- BridgeServer server1 = cache.addBridgeServer();
- server1.setBindAddress(serverHostName);
- server1.setPort(port);
- server1.setNotifyBySubscription(true);
- server1.start();
- return new Integer(server1.getPort());
- }
-
- public void tearDown2() throws Exception {
- super.tearDown2();
- client2.invoke(BackwardCompatibilityHandshakeDUnitDisabledTest.class,
- "unsetHandshakeVersionForTesting");
- client2.invoke(BackwardCompatibilityHandshakeDUnitDisabledTest.class,
- "unsetTestVersionAfterHandshake");
- // close the clients first
- client1.invoke(BackwardCompatibilityHandshakeDUnitDisabledTest.class, "closeCache");
- client2.invoke(BackwardCompatibilityHandshakeDUnitDisabledTest.class, "closeCache");
- // then close the servers
- server1.invoke(BackwardCompatibilityHandshakeDUnitDisabledTest.class, "closeCache");
- }
-
- public static void closeCache() {
- if (cache != null && !cache.isClosed()) {
- cache.close();
- cache.getDistributedSystem().disconnect();
- }
- }
-
- /*
- * Test to verify handshake with equal or lower version clients. Both equal
- * and lower version clients should be able to connect to the server
- * successfully.
- */
- public void testHandShake() {
- server1.invoke(BackwardCompatibilityHandshakeDUnitDisabledTest.class,
- "setTestCommands");
- String serverHostName = getServerHostName(server1.getHost());
- Integer port1 = ((Integer)server1.invoke(
- BackwardCompatibilityHandshakeDUnitDisabledTest.class, "createServerCache",
- new Object[] { serverHostName }));
-
- client1.invoke(BackwardCompatibilityHandshakeDUnitDisabledTest.class,
- "createClientCache", new Object[] { serverHostName, port1 });
-
- client2.invoke(BackwardCompatibilityHandshakeDUnitDisabledTest.class,
- "setHandshakeVersionForTesting");
- client2.invoke(BackwardCompatibilityHandshakeDUnitDisabledTest.class,
- "setTestVersionAfterHandshake");
- client2.invoke(BackwardCompatibilityHandshakeDUnitDisabledTest.class,
- "createClientCache", new Object[] { serverHostName, port1 });
- }
-
- /*
- * Add test command to CommandInitializer.ALL_COMMANDS.
- */
- public static void setTestCommands() throws Exception {
- getLogWriter().info("setTestCommands invoked");
- Map testCommands = new HashMap();
- testCommands.putAll((Map)CommandInitializer.ALL_COMMANDS
- .get(Version.GFE_57));
- CommandInitializer.testSetCommands(testCommands);
- getLogWriter().info("end of setTestCommands");
- }
-
- /*
- * Prepare to write TEST_VERSION byte from client to server during
- * handshake.
- */
- public static void setHandshakeVersionForTesting() throws Exception {
- HandShake.setVersionForTesting(clientVersionForTesting);
- }
-
- /*
- * Prepare to test that Server detected and created ClientHandshake as
- * requested.
- */
- public static void setTestVersionAfterHandshake() throws Exception {
- ServerConnection.TEST_VERSION_AFTER_HANDSHAKE_FLAG = true;
- ServerConnection.testVersionAfterHandshake = clientVersionForTesting;
- }
-
- /*
- * Prepare to revert back version byte to current client version for
- * client-to-server handshake.
- */
- public static void unsetHandshakeVersionForTesting() throws Exception {
- HandShake.setVersionForTesting(currentClientVersion);
- }
-
- /*
- * Prepare to revert back Server testing of ClientHandshake as requested.
- */
- public static void unsetTestVersionAfterHandshake() throws Exception {
- ServerConnection.TEST_VERSION_AFTER_HANDSHAKE_FLAG = false;
- ServerConnection.testVersionAfterHandshake = (currentClientVersion);
- }
- /*
- * public static void destroyRegion() { try { Region r = cache.getRegion("/" +
- * REGION_NAME); assertNotNull(r); r.destroyRegion(); } catch (Exception ex) {
- * fail("failed while destroy region ", ex); } }
- */
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
index 7979fe1..35010c0 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.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;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -116,7 +116,7 @@ public class BackwardCompatibilityHigherVersionClientDUnitTest extends
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/BackwardCompatibilityMessageDUnitDisabledTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityMessageDUnitDisabledTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityMessageDUnitDisabledTest.java
deleted file mode 100755
index d308b00..0000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityMessageDUnitDisabledTest.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.internal.cache.tier.sockets;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.Cache;
-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.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.Assert;
-import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.internal.cache.BridgeObserver;
-import com.gemstone.gemfire.internal.cache.BridgeObserverAdapter;
-import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
-import com.gemstone.gemfire.internal.cache.tier.ConnectionProxy;
-import com.gemstone.gemfire.cache.Region.Entry;
-import com.gemstone.gemfire.cache.client.PoolManager;
-import com.gemstone.gemfire.cache.client.internal.PoolImpl;
-import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
-
-/**
- * @author Pallavi
- *
- * Test to verify that server serves different versioned clients with their
- * respective client-versions of messages (after execution of a command) .
- */
-
-public class BackwardCompatibilityMessageDUnitDisabledTest extends DistributedTestCase {
- /** the cache */
- private static Cache cache = null;
-
- private static VM server1 = null;
-
- private static VM client1 = null;
-
- private static VM client2 = null;
-
- private static VM client3 = null;
-
- /** name of the test region */
- private static final String REGION_NAME = "BackwardCompatibilityMessageDUnitTest_Region";
-
- static int CLIENT_ACK_INTERVAL = 5000;
-
- private static final String k1 = "k1";
-
- private static final String k2 = "k2";
-
- private static final String client_k1 = "client-k1";
-
- private static final String client_k2 = "client-k2";
-
- /** constructor */
- public BackwardCompatibilityMessageDUnitDisabledTest(String name) {
- super(name);
- }
-
- public void setUp() throws Exception {
- super.setUp();
- final Host host = Host.getHost(0);
- server1 = host.getVM(0);
- client1 = host.getVM(1);
- client2 = host.getVM(2);
- client3 = host.getVM(3);
- }
-
- private void createCache(Properties props) throws Exception {
- DistributedSystem ds = getSystem(props);
- ds.disconnect();
- ds = getSystem(props);
- assertNotNull(ds);
- cache = CacheFactory.create(ds);
- assertNotNull(cache);
- }
-
- public static void createClientCache(String host, Integer port1)
- throws Exception {
- new BackwardCompatibilityMessageDUnitDisabledTest("temp");
- Properties props = new Properties();
- props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
- props.setProperty(DistributionConfig.LOCATORS_NAME, "");
- new BackwardCompatibilityMessageDUnitDisabledTest("temp").createCache(props);
- PoolImpl p = (PoolImpl)PoolManager.createFactory().addServer(host,
- port1.intValue()).setSubscriptionEnabled(true)
- .setSubscriptionRedundancy(1).setThreadLocalConnections(true)
- .setMinConnections(6).setReadTimeout(20000).setPingInterval(10000)
- .setRetryAttempts(1).setSubscriptionAckInterval(CLIENT_ACK_INTERVAL)
- .create("BackwardCompatibilityMessageDUnitTest");
-
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.DISTRIBUTED_ACK);
- factory.setPoolName(p.getName());
-
- RegionAttributes attrs = factory.create();
- Region region = cache.createRegion(REGION_NAME, attrs);
- region.registerInterest("ALL_KEYS");
-
- }
-
- public static Integer createServerCache(String host) throws Exception {
- new BackwardCompatibilityMessageDUnitDisabledTest("temp")
- .createCache(new Properties());
- AttributesFactory factory = new AttributesFactory();
- factory.setScope(Scope.DISTRIBUTED_ACK);
- factory.setDataPolicy(DataPolicy.REPLICATE);
- RegionAttributes attrs = factory.create();
- cache.createRegion(REGION_NAME, attrs);
- int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
- BridgeServer server1 = cache.addBridgeServer();
- server1.setBindAddress(host);
- server1.setPort(port);
- server1.setNotifyBySubscription(true);
- server1.start();
- return new Integer(server1.getPort());
- }
-
- public void tearDown2() throws Exception {
- super.tearDown2();
- client2.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class,
- "unsetHandshakeVersionForTesting");
- client3.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class,
- "unsetHandshakeVersionForTesting");
- server1.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class,
- "unsetBridgeObserverForAfterMessageCreation");
- // close the clients first
- client1.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class, "closeCache");
- client2.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class, "closeCache");
- client3.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class, "closeCache");
- // then close the servers
- server1.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class, "closeCache");
- }
-
- public static void closeCache() {
- CacheClientProxy.AFTER_MESSAGE_CREATION_FLAG = false;
- if (cache != null && !cache.isClosed()) {
- cache.close();
- cache.getDistributedSystem().disconnect();
- }
- }
-
- /**
- * Verify that server serves different versioned clients with their respective
- * client-versions of messages (after execution of a command) .
- */
- public void testMessage() throws Exception {
- String serverHostName = getServerHostName(server1.getHost());
- server1.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class,
- "setTestCommands");
- Integer port1 = ((Integer)server1.invoke(
- BackwardCompatibilityMessageDUnitDisabledTest.class, "createServerCache",
- new Object[] { serverHostName }));
-
- client1.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class,
- "createClientCache", new Object[] { serverHostName, port1 });
-
- client2.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class,
- "setHandshakeVersionForTesting");
- client2.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class,
- "createClientCache", new Object[] { serverHostName, port1 });
-
- client3.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class,
- "setHandshakeVersionForTesting");
- client3.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class,
- "createClientCache", new Object[] { serverHostName, port1 });
-
- server1.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class,
- "setBridgeObserverForAfterMessageCreation");
- client2.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class, "put");
- Thread.sleep(10 * 1000);
-
- client1.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class, "checkCache");
- client3.invoke(BackwardCompatibilityMessageDUnitDisabledTest.class, "checkCache");
- }
-
- /*
- * Add commands for TEST_VERSION to CommandInitializer.ALL_COMMANDS.
- */
- public static void setTestCommands() throws Exception {
- getLogWriter().info("setTestCommands invoked");
- Map testCommands = new HashMap();
- testCommands.putAll((Map)CommandInitializer.ALL_COMMANDS
- .get(Version.GFE_57));
- CommandInitializer.testSetCommands(testCommands);
- getLogWriter().info("end of setTestCommands");
- }
-
- /*
- * Prepare to write TEST_VERSION byte from client to server during handshake.
- */
- public static void setHandshakeVersionForTesting() throws Exception {
- HandShake.setVersionForTesting(Version.TEST_VERSION.ordinal());
- }
-
- private static BridgeObserver origObserver;
-
- /*
- * Prepare to test that ClientMessage created at server is valid for current
- * client.
- */
- public static void setBridgeObserverForAfterMessageCreation()
- throws Exception {
- CacheClientProxy.AFTER_MESSAGE_CREATION_FLAG = true;
- origObserver = BridgeObserverHolder
- .setInstance(new BridgeObserverAdapter() {
- public void afterMessageCreation(Message msg) {
- getLogWriter().info("afterMessageCreation invoked");
- Assert.assertTrue((msg != null),
- "Valid Message not created for current client");
-
- getLogWriter().info("end of afterMessageCreation");
- }
- });
- }
-
- public static void put() {
- try {
- Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
- assertNotNull(r1);
-
- r1.put(k1, client_k1);
- assertEquals(r1.getEntry(k1).getValue(), client_k1);
- r1.put(k2, client_k2);
- assertEquals(r1.getEntry(k2).getValue(), client_k2);
- }
- catch (Exception ex) {
- fail("failed while put", ex);
- }
- }
-
- public static void checkCache() {
- try {
- final Region r1 = cache.getRegion(Region.SEPARATOR + REGION_NAME);
- assertNotNull(r1);
- WaitCriterion ev = new WaitCriterion() {
- public boolean done() {
- Entry e = r1.getEntry(k1);
- return e != null;
- }
- public String description() {
- return null;
- }
- };
- DistributedTestCase.waitForCriterion(ev, 120 * 1000, 200, true);
- Entry e = r1.getEntry(k1);
- assertEquals(e.getValue(), client_k1);
-
- ev = new WaitCriterion() {
- public boolean done() {
- Entry e2 = r1.getEntry(k2);
- return e2 != null;
- }
- public String description() {
- return null;
- }
- };
- DistributedTestCase.waitForCriterion(ev, 120 * 1000, 200, true);
- e = r1.getEntry(k2);
- assertEquals(e.getValue(), client_k2);
- }
- catch (Exception ex) {
- fail("failed while checkCache", ex);
- }
- }
-
- /*
- * Prepare to write revert back to original version from client to server
- * during handshake.
- */
- public static void unsetHandshakeVersionForTesting() throws Exception {
- HandShake.setVersionForTesting(ConnectionProxy.VERSION.ordinal());
- }
-
- /*
- * Prepare to revert back testing ClientMessage created at server.
- */
- public static void unsetBridgeObserverForAfterMessageCreation()
- throws Exception {
- CacheClientProxy.AFTER_MESSAGE_CREATION_FLAG = false;
- }
-}