From 65b0793a03fe9da6b6f8ed36737f70f557fdb3c3 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 11 Aug 2014 19:21:33 -0700 Subject: [PATCH] Additional changes for SGF-226 supporting cluster-based configuration in GemFire 8 based on latest changes to the shared, persistent cluster configuration service in preparation for the 8.0 release. The recent changes in SDG for the shared, persistent cluster-based configuration feature are based on GemFire RC build number r48398. --- ...CacheClusterConfigurationIntegrationTest.java | 2 +- .../data/gemfire/fork/LocatorProcess.java | 6 +++--- src/test/resources/cluster_config.zip | Bin 0 -> 1131 bytes ...st-cache.xml => clusterconfig-test-cache.xml} | 0 ...eUsingClusterConfigurationIntegrationTest.xml | 2 +- ...singLocalOnlyConfigurationIntegrationTest.xml | 2 +- src/test/resources/shared_config.zip | Bin 1083 -> 0 bytes 7 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 src/test/resources/cluster_config.zip rename src/test/resources/{sharedconfig-test-cache.xml => clusterconfig-test-cache.xml} (100%) delete mode 100644 src/test/resources/shared_config.zip diff --git a/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java index ffcd5b00..a9ca17dd 100644 --- a/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/CacheClusterConfigurationIntegrationTest.java @@ -75,7 +75,7 @@ public class CacheClusterConfigurationIntegrationTest { assertTrue(locatorWorkingDirectory.isDirectory() || locatorWorkingDirectory.mkdirs()); - ZipUtils.unzip(new ClassPathResource("/shared_config.zip"), locatorWorkingDirectory); + ZipUtils.unzip(new ClassPathResource("/cluster_config.zip"), locatorWorkingDirectory); List arguments = new ArrayList(); diff --git a/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java b/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java index a69f0f91..24b383c5 100644 --- a/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java +++ b/src/test/java/org/springframework/data/gemfire/fork/LocatorProcess.java @@ -72,13 +72,13 @@ public class LocatorProcess { DEFAULT_HOSTNAME_FOR_CLIENTS)) .setPort(Integer.getInteger("spring.gemfire.locator-port", DEFAULT_LOCATOR_PORT)) .setRedirectOutput(false) - .set(DistributionConfig.ENABLE_SHARED_CONFIGURATION_NAME, String.valueOf(Boolean.getBoolean( + .set(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, String.valueOf(Boolean.getBoolean( "spring.gemfire.enable-cluster-configuration"))) .set(DistributionConfig.HTTP_SERVICE_PORT_NAME, System.getProperty("spring.gemfire.http-service-port", DEFAULT_HTTP_SERVICE_PORT)) .set(DistributionConfig.JMX_MANAGER_NAME, String.valueOf(Boolean.TRUE)) .set(DistributionConfig.JMX_MANAGER_START_NAME, String.valueOf(Boolean.FALSE)) - .set(DistributionConfig.LOAD_SHARED_CONFIG_FROM_DIR_NAME, String.valueOf(Boolean.getBoolean( + .set(DistributionConfig.LOAD_CLUSTER_CONFIG_FROM_DIR_NAME, String.valueOf(Boolean.getBoolean( "spring.gemfire.load-cluster-configuration"))) .set(DistributionConfig.LOG_LEVEL_NAME, System.getProperty("spring.gemfire.log-level", DEFAULT_LOG_LEVEL)) .build(); @@ -86,7 +86,7 @@ public class LocatorProcess { private static boolean isClusterConfigurationEnabled(final InternalLocator locator) { return (locator != null && Boolean.valueOf(locator.getDistributedSystem().getProperties().getProperty( - DistributionConfig.ENABLE_SHARED_CONFIGURATION_NAME))); + DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME))); } private static void registerShutdownHook() { diff --git a/src/test/resources/cluster_config.zip b/src/test/resources/cluster_config.zip new file mode 100644 index 0000000000000000000000000000000000000000..8d334323a95d765aa9bceb3ac49c1f7e977835b7 GIT binary patch literal 1131 zcmWIWW@h1H0D%h=xLv^vD8bJl!;qX)T3nJ^6rY@*mzJ5X9~#2Rz&t(UW$+~+F0J5Z zU}X8m$iToN0@M-!H|Q3cLE@MOLCu92xSEiG29tlfTu6;?QUF>5!kV}Zgc__@P?TSg zT2zvmS`2n`5A)^VGnj5x=2CVm%2ebQi52rY8? z^5A68-NKb+(UGnoD7MZD!2W?)Kl_ zH-!%${1>;sxG?&Ty`TGn!1J8T_@7TMWOULhb^Y42S9wORQm`z4!kdz7FQ%&r#7x*G zG2v|2f{X`o*Fv*OlpW5@6kqPO_WJ8JUN64Q^!Xh%HD=YZ72mI%z2ussyye`r*XEg= z%1d{+Yvw6$Sb0+4Qe54$v&Hdz{g%ghLcUWbI?XZ>*UwPqyim7s;=Pj&5p|s>*%#cO zD0J?W(7P30*^LvI&XRH8vCO1@N^WpQH{a_iOE#P~snOU|Z5Z0UHNV!}D~0b_nsHb%Ne7>b#) zkq!04G!&7}frf+9IUd6?Q#r(NV2Wc{(l`sZ;n>nV&^l0>$7&s}6pd`1EYMc80D}1i bW*sR4( literal 0 HcmV?d00001 diff --git a/src/test/resources/sharedconfig-test-cache.xml b/src/test/resources/clusterconfig-test-cache.xml similarity index 100% rename from src/test/resources/sharedconfig-test-cache.xml rename to src/test/resources/clusterconfig-test-cache.xml diff --git a/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml b/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml index 96ffde25..326689e0 100644 --- a/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml +++ b/src/test/resources/org/springframework/data/gemfire/cacheUsingClusterConfigurationIntegrationTest.xml @@ -17,7 +17,7 @@ + use-cluster-configuration="true" cache-xml-location="/clusterconfig-test-cache.xml" lazy-init="false"/> diff --git a/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml b/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml index a0243fab..69d42189 100644 --- a/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml +++ b/src/test/resources/org/springframework/data/gemfire/cacheUsingLocalOnlyConfigurationIntegrationTest.xml @@ -17,7 +17,7 @@ + use-cluster-configuration="false" cache-xml-location="/clusterconfig-test-cache.xml" lazy-init="false"/> diff --git a/src/test/resources/shared_config.zip b/src/test/resources/shared_config.zip deleted file mode 100644 index 6537f261944e2a72a7da1e8f209fad20d25d3e9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1083 zcmWIWW@h1H00D!^KV85KD8a`d!%&=&Sd^L)pPZkUmYJ>}8p6rI+{1i1_!AJ9R&X;g zvV3D?U|IlGTju3`9i8(nWm~|mFzDWUS0|cYH31k)!>lGB`7o--IWTqCwUHJ&p zmC9VoZbg|2UZpt-My3je7FI^4R>npO0WKj5Mh1o^Tp(Y7e8T|_jqW=$_XYz!Xv)OE zAc@r%Ae$?4bKq7U#Wbm3xVR>z4%+&7o-`+Qc4os04zRmRc9W^y()v*=dubjQ)nxnks+_l%{nViZ?cercjDQ{SL zQr}Ws-LtdB@qGQ3$9Y1&QzkmiG7;C$Q0BZ)w{haVlMWGeohR8B+@C0P?v&8G6<*nm z6PM1Cao@4bq<>0oa7H)Z>nTe%oHnV^*i&s7+PyWu*4!(F?^)$Zk%ca9J3m}|;j1Sm zapQx&f@1!biMMv2VC;Q-Prb_uRnGF2G`q3|Jc({)^xwyQqvY@@N|sJcvd!`>lj#oun=g#7GQ>8 GU;qGr?@!wR