You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2015/10/12 20:43:37 UTC
[09/30] 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/RedundancyLevelTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
index 6f2dfae..5ff95f0 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
@@ -24,15 +24,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.RegisterInterestTracker;
-import com.gemstone.gemfire.cache.util.BridgeServer;
-import com.gemstone.gemfire.cache.util.BridgeWriter;
+import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.ServerLocation;
import com.gemstone.gemfire.internal.AvailablePort;
-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.BridgeServerImpl;
+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.CacheServerImpl;
import dunit.DistributedTestCase;
import dunit.Host;
@@ -77,7 +76,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
static PoolImpl pool = null;
- static BridgeObserver oldBo = null;
+ static ClientServerObserver oldBo = null;
static boolean FailOverDetectionByCCU = false;
@@ -151,12 +150,12 @@ public class RedundancyLevelTestBase extends DistributedTestCase
public static void verifyDispatcherIsAlive()
{
try {
-// assertEquals("More than one BridgeServer", 1, cache.getBridgeServers()
+// assertEquals("More than one BridgeServer", 1, cache.getCacheServers()
// .size());
WaitCriterion wc = new WaitCriterion() {
String excuse;
public boolean done() {
- return cache.getBridgeServers().size() == 1;
+ return cache.getCacheServers().size() == 1;
}
public String description() {
return excuse;
@@ -164,7 +163,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
};
DistributedTestCase.waitForCriterion(wc, 3 * 60 * 1000, 1000, true);
- BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers()
+ CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers()
.iterator().next();
assertNotNull(bs);
assertNotNull(bs.getAcceptor());
@@ -211,11 +210,11 @@ public class RedundancyLevelTestBase extends DistributedTestCase
{
try {
// assertEquals("More than one BridgeServer", 1,
- // cache.getBridgeServers().size());
+ // cache.getCacheServers().size());
WaitCriterion wc = new WaitCriterion() {
String excuse;
public boolean done() {
- return cache.getBridgeServers().size() == 1;
+ return cache.getCacheServers().size() == 1;
}
public String description() {
return excuse;
@@ -223,7 +222,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
};
DistributedTestCase.waitForCriterion(wc, 3 * 60 * 1000, 1000, true);
- BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers()
+ CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers()
.iterator().next();
assertNotNull(bs);
assertNotNull(bs.getAcceptor());
@@ -351,9 +350,9 @@ public class RedundancyLevelTestBase extends DistributedTestCase
public static void verifyNoCCP()
{
- assertEquals("More than one BridgeServer", 1, cache.getBridgeServers()
+ assertEquals("More than one BridgeServer", 1, cache.getCacheServers()
.size());
- BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers()
+ CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers()
.iterator().next();
assertNotNull(bs);
assertNotNull(bs.getAcceptor());
@@ -369,7 +368,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
WaitCriterion wc = new WaitCriterion() {
String excuse;
public boolean done() {
- return cache.getBridgeServers().size() == 1;
+ return cache.getCacheServers().size() == 1;
}
public String description() {
return excuse;
@@ -377,7 +376,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
};
DistributedTestCase.waitForCriterion(wc, 3 * 60 * 1000, 1000, true);
- BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers()
+ CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers()
.iterator().next();
assertNotNull(bs);
@@ -406,16 +405,16 @@ public class RedundancyLevelTestBase extends DistributedTestCase
try {
WaitCriterion wc = new WaitCriterion() {
public boolean done() {
- return cache.getBridgeServers().size() == 1;
+ return cache.getCacheServers().size() == 1;
}
public String description() {
return "Number of bridge servers ("
- + cache.getBridgeServers().size() + ") never became 1";
+ + cache.getCacheServers().size() + ") never became 1";
}
};
DistributedTestCase.waitForCriterion(wc, 180 * 1000, 2000, true);
- BridgeServerImpl bs = (BridgeServerImpl)cache.getBridgeServers()
+ CacheServerImpl bs = (CacheServerImpl)cache.getCacheServers()
.iterator().next();
assertNotNull(bs);
assertNotNull(bs.getAcceptor());
@@ -475,9 +474,9 @@ public class RedundancyLevelTestBase extends DistributedTestCase
public static void stopServer()
{
try {
- Iterator iter = cache.getBridgeServers().iterator();
+ Iterator iter = cache.getCacheServers().iterator();
if (iter.hasNext()) {
- BridgeServer server = (BridgeServer)iter.next();
+ CacheServer server = (CacheServer)iter.next();
server.stop();
}
}
@@ -490,7 +489,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
{
try {
Cache c = CacheFactory.getAnyInstance();
- BridgeServerImpl bs = (BridgeServerImpl)c.getBridgeServers().iterator()
+ CacheServerImpl bs = (CacheServerImpl)c.getCacheServers().iterator()
.next();
assertNotNull(bs);
bs.start();
@@ -526,7 +525,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
if(!FailOverDetectionByCCU)
{
- oldBo = BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ oldBo = ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeFailoverByCacheClientUpdater(ServerLocation epFailed)
{
try {
@@ -580,7 +579,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
RegionAttributes attrs = factory.createRegionAttributes();
cache.createVMRegion(REGION_NAME, attrs);
- BridgeServer server1 = cache.addBridgeServer();
+ CacheServer server1 = cache.addCacheServer();
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
server1.setMaximumTimeBetweenPings(180000);
@@ -618,7 +617,7 @@ public class RedundancyLevelTestBase extends DistributedTestCase
super.tearDown2();
if(!FailOverDetectionByCCU)
- BridgeObserverHolder.setInstance(oldBo);
+ ClientServerObserverHolder.setInstance(oldBo);
FailOverDetectionByCCU = false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
index d6f950b..d4bfac7 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
@@ -16,12 +16,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.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.tier.sockets.CacheClientProxy;
import com.gemstone.gemfire.cache.client.*;
@@ -125,7 +125,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase
factory.setDataPolicy(DataPolicy.REPLICATE);
RegionAttributes attrs = factory.create();
cache.createRegion(REGION_NAME, attrs);
- BridgeServer server = cache.addBridgeServer();
+ CacheServer server = cache.addCacheServer();
assertNotNull(server);
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
server.setPort(port);
@@ -137,10 +137,10 @@ public class RegionCloseDUnitTest extends DistributedTestCase
public static void VerifyClientProxyOnServerBeforeClose()
{
Cache c = CacheFactory.getAnyInstance();
- assertEquals("More than one BridgeServer", 1, c.getBridgeServers().size());
+ assertEquals("More than one CacheServer", 1, c.getCacheServers().size());
- final BridgeServerImpl bs = (BridgeServerImpl) c.getBridgeServers().iterator().next();
+ final CacheServerImpl bs = (CacheServerImpl) c.getCacheServers().iterator().next();
WaitCriterion ev = new WaitCriterion() {
public boolean done() {
return bs.getAcceptor().getCacheClientNotifier().getClientProxies().size() == 1;
@@ -182,7 +182,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase
final Cache c = CacheFactory.getAnyInstance();
WaitCriterion ev = new WaitCriterion() {
public boolean done() {
- return c.getBridgeServers().size() == 1;
+ return c.getCacheServers().size() == 1;
}
public String description() {
return null;
@@ -190,7 +190,7 @@ public class RegionCloseDUnitTest extends DistributedTestCase
};
DistributedTestCase.waitForCriterion(ev, 40 * 1000, 200, true);
- final BridgeServerImpl bs = (BridgeServerImpl)c.getBridgeServers().iterator()
+ final CacheServerImpl bs = (CacheServerImpl)c.getCacheServers().iterator()
.next();
ev = new WaitCriterion() {
public boolean done() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
index 722f370..75fcfc6 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.Scope;
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.cache.client.*;
@@ -214,7 +214,7 @@ public class RegisterInterestBeforeRegionCreationDUnitTest extends DistributedTe
RegionAttributes attrs = factory.createRegionAttributes();
cache.createVMRegion(REGION_NAME, attrs);
}
- BridgeServerImpl server = (BridgeServerImpl)cache.addBridgeServer();
+ CacheServerImpl server = (CacheServerImpl)cache.addCacheServer();
assertNotNull(server);
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
server.setPort(port);
@@ -267,4 +267,4 @@ public class RegisterInterestBeforeRegionCreationDUnitTest extends DistributedTe
cache.getDistributedSystem().disconnect();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
index 299e157..27e254d 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
@@ -10,7 +10,7 @@ package com.gemstone.gemfire.internal.cache.tier.sockets;
import java.util.*;
import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.cache.util.BridgeServer;
+import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -171,7 +171,7 @@ public class RegisterInterestKeysDUnitTest extends DistributedTestCase
RegionAttributes attrs = impl.createServerCacheAttributes();
cache.createRegion(REGION_NAME, attrs);
- BridgeServer server = cache.addBridgeServer();
+ CacheServer server = cache.addCacheServer();
assertNotNull(server);
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
server.setPort(port);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
index 987182c..13f8d21 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
@@ -21,13 +21,13 @@ import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import com.gemstone.gemfire.cache.client.internal.QueueStateImpl.SequenceIdAndExpirationObject;
-import com.gemstone.gemfire.cache.util.BridgeServer;
+import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
-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.ha.HAHelper;
import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
import com.gemstone.gemfire.internal.cache.ha.ThreadIdentifier;
@@ -101,7 +101,7 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase
public void testPeriodicAckSendByClientPrimaryFailover() throws Exception {
addExpectedException("java.net.ConnectException");
createEntries();
- setBridgeObserverForBeforeSendingClientAck();
+ setClientServerObserverForBeforeSendingClientAck();
server1.invoke(ReliableMessagingDUnitTest.class, "putOnServer");
getLogWriter().info("Entering waitForServerUpdate");
waitForServerUpdate();
@@ -249,9 +249,9 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase
public static void stopServer()
{
try {
- Iterator iter = cache.getBridgeServers().iterator();
+ Iterator iter = cache.getCacheServers().iterator();
if (iter.hasNext()) {
- BridgeServer server = (BridgeServer)iter.next();
+ CacheServer server = (CacheServer)iter.next();
server.stop();
}
}
@@ -279,10 +279,10 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase
}
}
- public static void setBridgeObserverForBeforeSendingClientAck() throws Exception
+ public static void setClientServerObserverForBeforeSendingClientAck() throws Exception
{
PoolImpl.BEFORE_SENDING_CLIENT_ACK_CALLBACK_FLAG = true;
- origObserver = BridgeObserverHolder.setInstance(new BridgeObserverAdapter() {
+ origObserver = ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
public void beforeSendingClientAck()
{
getLogWriter().info("beforeSendingClientAck invoked");
@@ -357,7 +357,7 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase
cache.setMessageSyncInterval(25);
cache.createRegion(REGION_NAME, attrs);
- BridgeServer server = cache.addBridgeServer();
+ CacheServer server = cache.addCacheServer();
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
server.setPort(port);
server.setNotifyBySubscription(true);
@@ -418,10 +418,10 @@ public class ReliableMessagingDUnitTest extends DistributedTestCase
}
}
- private static BridgeObserver origObserver;
+ private static ClientServerObserver origObserver;
public static void resetCallBack() {
- BridgeObserverHolder.setInstance(origObserver);
+ ClientServerObserverHolder.setInstance(origObserver);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/TestPut.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/TestPut.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/TestPut.java
deleted file mode 100755
index a9e8861..0000000
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/TestPut.java
+++ /dev/null
@@ -1,53 +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.io.IOException;
-
-import com.gemstone.gemfire.internal.cache.tier.Command;
-import com.gemstone.gemfire.internal.cache.tier.MessageType;
-import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ServerConnection;
-import com.gemstone.gemfire.internal.cache.tier.sockets.BaseCommand;
-
-/**
- * @author Pallavi
- *
- * TestPut is a dummy command to verify Command handling in BackwardCompatibilityComamndDUnitTest.
- */
-
- public class TestPut implements Command {
-
- public TestPut() {
- }
-
- final public void execute(Message msg, ServerConnection servConn) {
- // set flag true - to be checked in test
- BackwardCompatibilityCommandDUnitDisabledTest.TEST_PUT_COMMAND_INVOKED = true;
-
- // write reply to clients
- servConn.setAsTrue(REQUIRES_RESPONSE);
- writeReply(msg, servConn);
- servConn.setAsTrue(RESPONDED);
- }
-
- private void writeReply(Message origMsg, ServerConnection servConn) {
- Message replyMsg = servConn.getReplyMessage();
- replyMsg.setMessageType(MessageType.REPLY);
- replyMsg.setNumberOfParts(1);
- replyMsg.setTransactionId(origMsg.getTransactionId());
- replyMsg.addBytesPart(BaseCommand.OK_BYTES);
- try {
- replyMsg.send();
- }
- catch (IOException ioe){
- ioe.printStackTrace();
- }
- }
- }
-
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
index 1eb3ae3..30c0f1b 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache.client.internal.Connection;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
import com.gemstone.gemfire.cache.client.internal.ServerRegionProxy;
-import com.gemstone.gemfire.cache.util.BridgeServer;
+import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -402,9 +402,9 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
public static void killServer(Integer port )
{
try {
- Iterator iter = cache.getBridgeServers().iterator();
+ Iterator iter = cache.getCacheServers().iterator();
if (iter.hasNext()) {
- BridgeServer server = (BridgeServer)iter.next();
+ CacheServer server = (CacheServer)iter.next();
if(server.getPort() == port.intValue()){
server.stop();
}
@@ -419,7 +419,7 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
public static void startServer(Integer port)
{
try {
- BridgeServer server1 = cache.addBridgeServer();
+ CacheServer server1 = cache.addCacheServer();
server1.setPort(port.intValue());
server1.setNotifyBySubscription(true);
server1.start();
@@ -498,7 +498,7 @@ public class UpdatePropagationDUnitTest extends DistributedTestCase
new UpdatePropagationDUnitTest("temp").createCache(new Properties());
RegionAttributes attrs = impl.createCacheServerAttributes();
cache.createRegion(REGION_NAME, attrs);
- BridgeServer server = cache.addBridgeServer();
+ CacheServer server = cache.addCacheServer();
assertNotNull(server);
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
server.setPort(port);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
index 9eca096..a850b21 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
@@ -17,7 +17,7 @@ import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache.util.BridgeServer;
+import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
@@ -191,7 +191,7 @@ public class VerifyUpdatesFromNonInterestEndPointDUnitTest extends DistributedTe
factory.setDataPolicy(DataPolicy.REPLICATE);
RegionAttributes attrs = factory.create();
cache.createRegion(REGION_NAME, attrs);
- BridgeServer server1 = cache.addBridgeServer();
+ CacheServer server1 = cache.addCacheServer();
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET) ;
server1.setPort(port);
server1.setNotifyBySubscription(true);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
index 54867d1..c90e68f 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -23,14 +23,14 @@ import com.gemstone.gemfire.cache.Scope;
import com.gemstone.gemfire.cache.client.PoolManager;
import com.gemstone.gemfire.cache.client.ServerConnectivityException;
import com.gemstone.gemfire.cache.client.internal.PoolImpl;
-import com.gemstone.gemfire.cache30.BridgeTestCase;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
import com.gemstone.gemfire.distributed.DistributedMember;
import com.gemstone.gemfire.distributed.DurableClientAttributes;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.cache.tier.InternalBridgeMembership;
+import com.gemstone.gemfire.internal.cache.tier.InternalClientMembership;
import com.gemstone.gemfire.internal.cache.tier.sockets.ServerConnection;
import com.gemstone.gemfire.internal.logging.InternalLogWriter;
import com.gemstone.gemfire.internal.logging.LocalLogWriter;
@@ -52,7 +52,7 @@ import dunit.VM;
* @since 4.2.1
*/
-public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase {
+public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTestCase {
protected static final boolean CLIENT = true;
protected static final boolean SERVER = false;
@@ -81,7 +81,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase
@Override
public void tearDown2() throws Exception {
super.tearDown2();
- InternalBridgeMembership.unregisterAllListeners();
+ InternalClientMembership.unregisterAllListeners();
}
/**
@@ -115,7 +115,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase
};
DistributedMember clientJoined = new TestDistributedMember("clientJoined");
- InternalBridgeMembership.notifyJoined(clientJoined, true);
+ InternalClientMembership.notifyJoined(clientJoined, true);
synchronized(listener) {
if (!fired[0]) {
listener.wait(SYNC_ASYNC_EVENT_WAIT_MILLIS);
@@ -173,7 +173,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase
DistributedMember memberA = new TestDistributedMember("memberA");
// first join
- InternalBridgeMembership.notifyJoined(memberA, true);
+ InternalClientMembership.notifyJoined(memberA, true);
synchronized(listener) {
if (!fired[JOINED]) {
listener.wait(SYNC_ASYNC_EVENT_WAIT_MILLIS);
@@ -187,14 +187,14 @@ public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase
memberId[JOINED] = null;
// duplicate join
- InternalBridgeMembership.notifyJoined(memberA, true);
+ InternalClientMembership.notifyJoined(memberA, true);
pause(BRIEF_PAUSE_MILLIS);
assertFalse(fired[JOINED]);
assertNull(member[JOINED]);
assertNull(memberId[JOINED]);
// first left
- InternalBridgeMembership.notifyLeft(memberA, true);
+ InternalClientMembership.notifyLeft(memberA, true);
synchronized(listener) {
if (!fired[LEFT]) {
listener.wait(SYNC_ASYNC_EVENT_WAIT_MILLIS);
@@ -208,14 +208,14 @@ public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase
memberId[LEFT] = null;
// duplicate left
- InternalBridgeMembership.notifyLeft(memberA, true);
+ InternalClientMembership.notifyLeft(memberA, true);
pause(BRIEF_PAUSE_MILLIS);
assertFalse(fired[LEFT]);
assertNull(member[LEFT]);
assertNull(memberId[LEFT]);
// rejoin
- InternalBridgeMembership.notifyJoined(memberA, true);
+ InternalClientMembership.notifyJoined(memberA, true);
synchronized(listener) {
if (!fired[JOINED]) {
listener.wait(SYNC_ASYNC_EVENT_WAIT_MILLIS);
@@ -410,7 +410,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase
getSystem(config);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
}
@@ -870,7 +870,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase
assertFalse(getCache().isClosed());
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
}
@@ -1327,7 +1327,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase
* com.gemstone.gemfire.internal.cache.tier.Endpoint#getNumConnections
* Endpoint.getNumConnections()} to {@link
* com.gemstone.gemfire.internal.cache.tier.Endpoint}. Note: This probably
- * won't work if the BridgeLoader has more than one Endpoint.
+ * won't work if the pool has more than one Endpoint.
*/
protected void waitForClientToFullyConnect(final PoolImpl pool) {
getLogWriter().info("[waitForClientToFullyConnect]");
@@ -1864,7 +1864,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase
vm0.invoke(createBridgeServer);
- // gather details for later creation of BridgeLoader...
+ // gather details for later creation of pool...
assertEquals(ports[0],
vm0.invokeInt(UniversalMembershipListenerAdapterDUnitTest.class,
"getTestServerEventsInLonerClient_port"));
@@ -1880,7 +1880,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase
// create region which connects to bridge server
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
- BridgeTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
+ ClientServerTestCase.configureConnectionPool(factory, getServerHostName(host), ports, false, -1, -1, null);
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
@@ -2035,7 +2035,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends BridgeTestCase
// reconnect bridge client to test for crashed event
vm0.invoke(createBridgeServer);
- // gather details for later creation of BridgeLoader...
+ // gather details for later creation of pool...
assertEquals(ports[0],
vm0.invokeInt(UniversalMembershipListenerAdapterDUnitTest.class,
"getTestServerEventsInLonerClient_port"));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxFormatterPutGetJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxFormatterPutGetJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxFormatterPutGetJUnitTest.java
index 8a9bd0f..f70d2d2 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxFormatterPutGetJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/pdx/PdxFormatterPutGetJUnitTest.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.DataPolicy;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.cache.util.BridgeServer;
+import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.internal.Assert;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -47,7 +47,7 @@ public class PdxFormatterPutGetJUnitTest {
this.c = (GemFireCacheImpl) new CacheFactory().set("mcast-port", "0").setPdxReadSerialized(true).create();
//start cache-server
- BridgeServer server = c.addBridgeServer();
+ CacheServer server = c.addCacheServer();
final int serverPort = 40405;
server.setPort(serverPort);
server.start();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/java/dunit/DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/dunit/DistributedTestCase.java b/gemfire-core/src/test/java/dunit/DistributedTestCase.java
index c78510a..d9f88ca 100755
--- a/gemfire-core/src/test/java/dunit/DistributedTestCase.java
+++ b/gemfire-core/src/test/java/dunit/DistributedTestCase.java
@@ -63,7 +63,7 @@ import com.gemstone.gemfire.internal.cache.HARegion;
import com.gemstone.gemfire.internal.cache.InitialImageOperation;
import com.gemstone.gemfire.internal.cache.LocalRegion;
import com.gemstone.gemfire.internal.cache.PartitionedRegion;
-import com.gemstone.gemfire.internal.cache.tier.InternalBridgeMembership;
+import com.gemstone.gemfire.internal.cache.tier.InternalClientMembership;
import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
import com.gemstone.gemfire.internal.cache.tier.sockets.DataSerializerPropogationDUnitTest;
@@ -799,7 +799,7 @@ public abstract class DistributedTestCase extends TestCase implements java.io.Se
LogWrapper.close();
ClientProxyMembershipID.system = null;
MultiVMRegionTestCase.CCRegion = null;
- InternalBridgeMembership.unregisterAllListeners();
+ InternalClientMembership.unregisterAllListeners();
ClientStatsManager.cleanupForTests();
unregisterInstantiatorsInThisVM();
GemFireTracer.DEBUG = Boolean.getBoolean("DistributionManager.DEBUG_JAVAGROUPS");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt b/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt
index f24eff5..060a5ec 100644
--- a/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt
+++ b/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt
@@ -91,7 +91,7 @@ com/gemstone/gemfire/internal/shared/OSType$4
com/gemstone/gemfire/internal/shared/OSType$5
com/gemstone/gemfire/internal/shared/TCPSocketOptions
com/gemstone/gemfire/internal/process/SharedConfigurationNotAvailableException
-com/gemstone/gemfire/internal/cache/tier/InternalBridgeMembership$EventType
+com/gemstone/gemfire/internal/cache/tier/InternalClientMembership$EventType
com/gemstone/gemfire/internal/util/concurrent/StoppableReadWriteLock
com/gemstone/gemfire/rest/internal/web/exception.GemfireRestException
com/gemstone/gemfire/rest/internal/web/controllers/support/JSONTypes
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt b/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
index 79f5e22..490117f 100644
--- a/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
+++ b/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
@@ -34,7 +34,7 @@ com/gemstone/gemfire/cache/SubscriptionAttributes,2
fromData,14,2a2bb9000f0100b80010b50003b1
toData,14,2b2ab40003b4000db9000e0200b1
-com/gemstone/gemfire/cache/client/internal/BridgeServerLoadMessage,2
+com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage,2
fromData,52,2a2bb7000c2abb000d59b7000eb500022ab400022bb8000f2abb001059b70011b500032ab400032bb8000f2a2bb80012b50004b1
toData,30,2a2bb700132ab400022bb800142ab400032bb800142ab400042bb80015b1
@@ -844,11 +844,11 @@ com/gemstone/gemfire/internal/cache/AddCacheServerProfileMessage,2
fromData,16,2a2bb7002f2a2bb900300100b50007b1
toData,16,2a2bb7002d2b2ab40007b9002e0200b1
-com/gemstone/gemfire/internal/cache/BridgeRegionEventImpl,2
+com/gemstone/gemfire/internal/cache/ClientRegionEventImpl,2
fromData,14,2a2bb700132a2bb80014b60003b1
toData,14,2a2bb700112ab6000d2bb80012b1
-com/gemstone/gemfire/internal/cache/BridgeServerAdvisor$BridgeServerProfile,2
+com/gemstone/gemfire/internal/cache/CacheServerAdvisor$CacheServerProfile,2
fromData,53,2a2bb700102a2bb80011b500042a2bb900120100b500062abb001359b70014b500052ab400052bb800152a2bb900160100b60017b1
toData,42,2a2bb7000a2ab400042bb8000b2b2ab40006b9000c02002ab400052bb8000d2b2ab6000eb9000f0300b1
@@ -1164,8 +1164,8 @@ fromData,207,2a2bb9004f0100b500162a2bb900500100b80051b500032a2bb80052b500182a2bb
toData,178,2b2ab40016b9004602002b2ab40003b40047b9004802002ab400182bb800492b2ab40005b9004a02002b2ab4001fb9004a02002ab400042bb800492ab400082bb8004b2ab400092bb8004b2ab400072bb8004b2ab4000c2bb800492ab4000e2bb800492ab4000d2bb800492ab400102bb800492ab4000f2bb800492b2ab40006b9004a02002ab400112bb8004c2ab400142bb8004d2ab40001b9004e010099000b012bb8004ca7000b2ab400012bb8004cb1
com/gemstone/gemfire/internal/cache/PoolFactoryImpl$PoolAttributes,2
-fromData,153,2a2bb80033b500022a2bb80033b500042a2bb80033b500062a2bb80033b500082a2bb80033b500092a2bb80033b5000a2a2bb80033b5000e2a2bb80034b5000d2a2bb80034b500112a2bb80033b500152a2bb80033b500172a2bb80035b500072a2bb80035b500132a2bb80036b5001a2a2bb80037b5001e2a2bb80037b5001f2a2bb80035b500232a2bb80033b500122a2bb80035b5001bb1
-toData,153,2ab400022bb8002e2ab400042bb8002e2ab400062bb8002e2ab400082bb8002e2ab400092bb8002e2ab4000a2bb8002e2ab4000e2bb8002e2ab4000d2bb8002f2ab400112bb8002f2ab400152bb8002e2ab400172bb8002e2ab400072bb800302ab400132bb800302ab4001a2bb800312ab4001e2bb800322ab4001f2bb800322ab400232bb800302ab400122bb8002e2ab4001b2bb80030b1
+fromData,145,2a2bb80031b500022a2bb80031b500042a2bb80031b500062a2bb80031b500082a2bb80031b500092a2bb80031b5000a2a2bb80031b5000e2a2bb80032b5000d2a2bb80032b500112a2bb80031b500152a2bb80031b500172a2bb80033b500072a2bb80033b500132a2bb80034b5001a2a2bb80035b5001e2a2bb80035b5001f2a2bb80031b500122a2bb80033b5001bb1
+toData,145,2ab400022bb8002c2ab400042bb8002c2ab400062bb8002c2ab400082bb8002c2ab400092bb8002c2ab4000a2bb8002c2ab4000e2bb8002c2ab4000d2bb8002d2ab400112bb8002d2ab400152bb8002c2ab400172bb8002c2ab400072bb8002e2ab400132bb8002e2ab4001a2bb8002f2ab4001e2bb800302ab4001f2bb800302ab400122bb8002c2ab4001b2bb8002eb1
com/gemstone/gemfire/internal/cache/PreferBytesCachedDeserializable,2
fromData,9,2a2bb8000cb50002b1
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt b/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
index f272e4a..58ef0ab 100644
--- a/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
+++ b/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
@@ -218,15 +218,6 @@ com/gemstone/gemfire/cache/query/internal/utils/PDXUtils$1,false
com/gemstone/gemfire/cache/query/internal/utils/PDXUtils$2,false
com/gemstone/gemfire/cache/snapshot/SnapshotOptions$SnapshotFormat,false
com/gemstone/gemfire/cache/util/BoundedLinkedHashMap,true,-3419897166186852692,_maximumNumberOfEntries:int
-com/gemstone/gemfire/cache/util/BridgeWriterException,true,-295001316745954159
-com/gemstone/gemfire/cache/util/EndpointDoesNotExistException,true,1654241470788247283
-com/gemstone/gemfire/cache/util/EndpointException,false
-com/gemstone/gemfire/cache/util/EndpointExistsException,true,950617116786308012
-com/gemstone/gemfire/cache/util/EndpointInUseException,true,-4087729485272321469
-com/gemstone/gemfire/cache/util/IncompatibleVersionException,true,7008667865037538081
-com/gemstone/gemfire/cache/util/ServerRefusedConnectionException,true,-4996327025772566931
-com/gemstone/gemfire/cache/util/UnknownVersionException,true,7379530185697556990
-com/gemstone/gemfire/cache/util/VersionException,false
com/gemstone/gemfire/cache/wan/GatewaySender$OrderPolicy,false
com/gemstone/gemfire/cache/util/Gateway$OrderPolicy,false
com/gemstone/gemfire/compression/CompressionException,true,4118639654597191235
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2eb4e175/gemfire-core/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.xml
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.xml b/gemfire-core/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.xml
index 4e884d5..38ad448 100644
--- a/gemfire-core/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.xml
+++ b/gemfire-core/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.xml
@@ -6,25 +6,16 @@
-->
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 5.0//EN"
- "http://www.gemstone.com/dtd/cache5_0.dtd">
+ "-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
+ "http://www.gemstone.com/dtd/cache8_0.dtd">
<cache>
+ <pool name="clientPool" subscription-enabled="true" subscription-redundancy="6">
+ <server host="localhost" port="30303"/>
+ </pool>
<region name="root">
<region-attributes/>
<region name="exampleRegion">
- <region-attributes scope="distributed-ack">
- <cache-writer>
- <class-name>com.gemstone.gemfire.cache.util.BridgeWriter</class-name>
- <parameter name="endpoints">
- <string>server=localhost:30303</string>
- </parameter>
- <parameter name="establishCallbackConnection">
- <string>true</string>
- </parameter>
- <parameter name="redundancyLevel">
- <string>6</string>
- </parameter>
- </cache-writer>
+ <region-attributes scope="distributed-ack" pool-name="clientPool">
</region-attributes>
</region>
</region>