You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2015/09/03 01:58:14 UTC
[09/17] incubator-geode git commit: renamed BridgeServerCacheLoader
to CacheServerCacheLoader
renamed BridgeServerCacheLoader to CacheServerCacheLoader
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9ea8f35d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9ea8f35d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9ea8f35d
Branch: refs/heads/feature/GEODE-243
Commit: 9ea8f35d77f076cabd36f998d7ddbcbcecc998c2
Parents: 09eac4d
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Wed Sep 2 11:45:34 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed Sep 2 11:45:34 2015 -0700
----------------------------------------------------------------------
.../gemfire/cache30/ClientServerTestCase.java | 28 ++++++++++----------
.../internal/cache/Bug41957DUnitTest.java | 2 +-
.../cache/ClientServerGetAllDUnitTest.java | 6 ++---
3 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ea8f35d/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
index 7a546a1..c645549 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
@@ -305,20 +305,9 @@ public class ClientServerTestCase extends CacheTestCase {
return system.getProperties();
}
- /**
- * Create a bridgeserver that has a value for every key queried and a unique
- * key/value in the specified Region that uniquely identifies each instance.
- *
- * @param vm
- * the VM on which to create the BridgeServer
- * @param rName
- * the name of the Region to create on the BridgeServerf
- * @param port
- * the TCP port on which the BridgeServer should listen
- */
- public static class BridgeServerCacheLoader extends TestCacheLoader implements Declarable {
+ public static class CacheServerCacheLoader extends TestCacheLoader implements Declarable {
- public BridgeServerCacheLoader() {}
+ public CacheServerCacheLoader() {}
@Override
public Object load2(LoaderHelper helper) {
@@ -343,6 +332,17 @@ public class ClientServerTestCase extends CacheTestCase {
}
public final static String BridgeServerKey = "BridgeServerKey";
+ /**
+ * Create a server that has a value for every key queried and a unique
+ * key/value in the specified Region that uniquely identifies each instance.
+ *
+ * @param vm
+ * the VM on which to create the server
+ * @param rName
+ * the name of the Region to create on the server
+ * @param port
+ * the TCP port on which the server should listen
+ */
public void createBridgeServer(VM vm, final String rName, final int port) {
vm.invoke(new CacheSerializableRunnable("Create Region on Server") {
@Override
@@ -350,7 +350,7 @@ public class ClientServerTestCase extends CacheTestCase {
try {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK); // can't be local since used with registerInterest
- factory.setCacheLoader(new BridgeServerCacheLoader());
+ factory.setCacheLoader(new CacheServerCacheLoader());
beginCacheXml();
createRootRegion(rName, factory.create());
startBridgeServer(port);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ea8f35d/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
index 1285f3e..81fdadb 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
@@ -79,7 +79,7 @@ import java.util.*;
// Create Region
AttributesFactory factory = new AttributesFactory();
- factory.setCacheLoader(new BridgeServerCacheLoader());
+ factory.setCacheLoader(new CacheServerCacheLoader());
if (createPR) {
factory.setDataPolicy(DataPolicy.PARTITION);
factory.setPartitionAttributes((new PartitionAttributesFactory()).create());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ea8f35d/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
index d27f524..8716ccb 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
@@ -663,9 +663,9 @@ import java.util.*;
factory.setOffHeap(true);
}
if (expectCallback) {
- factory.setCacheLoader(new CallbackBridgeServerCacheLoader());
+ factory.setCacheLoader(new CallbackCacheServerCacheLoader());
} else {
- factory.setCacheLoader(new BridgeServerCacheLoader());
+ factory.setCacheLoader(new CacheServerCacheLoader());
}
if (createPR) {
factory.setDataPolicy(DataPolicy.PARTITION);
@@ -694,7 +694,7 @@ import java.util.*;
private static final String CALLBACK_ARG = "ClientServerGetAllDUnitTestCB";
- private static class CallbackBridgeServerCacheLoader extends BridgeServerCacheLoader {
+ private static class CallbackCacheServerCacheLoader extends CacheServerCacheLoader {
@Override
public Object load2(LoaderHelper helper) {
if (helper.getArgument() instanceof String) {