Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 696E9200B43 for ; Wed, 8 Jun 2016 02:05:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 67CA5160A5C; Wed, 8 Jun 2016 00:05:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id F3B91160A5F for ; Wed, 8 Jun 2016 02:05:22 +0200 (CEST) Received: (qmail 9649 invoked by uid 500); 8 Jun 2016 00:05:22 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 9537 invoked by uid 99); 8 Jun 2016 00:05:22 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jun 2016 00:05:22 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 8732F1A10BB for ; Wed, 8 Jun 2016 00:05:21 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 3w7vijkAEs9J for ; Wed, 8 Jun 2016 00:04:49 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id D73AA5F23F for ; Wed, 8 Jun 2016 00:04:42 +0000 (UTC) Received: (qmail 3543 invoked by uid 99); 8 Jun 2016 00:04:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jun 2016 00:04:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DC907E0571; Wed, 8 Jun 2016 00:04:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Wed, 08 Jun 2016 00:05:31 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [54/90] [abbrv] incubator-geode git commit: GEODE-1377: Renaming SystemConfigurationProperties to DistributedSystemConfigProperties archived-at: Wed, 08 Jun 2016 00:05:25 -0000 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java index c20f5df..fdaa75d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java @@ -17,7 +17,6 @@ package com.gemstone.gemfire.management.internal.security; -import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.management.cli.Result.Status; import com.gemstone.gemfire.management.internal.cli.HeadlessGfsh; @@ -42,7 +41,7 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; import static org.junit.Assert.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; @Category({ DistributedTest.class, SecurityTest.class }) public class MultiUserDUnitTest extends CliCommandTestBase { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java index 2887195..c0efddd 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java @@ -18,12 +18,11 @@ package com.gemstone.gemfire.management.internal.security; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import org.junit.rules.ExternalResource; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; public class ShiroCacheStartRule extends ExternalResource { private Cache cache; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java index 7a463d6..5a3d0a8 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java @@ -45,8 +45,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java index a9419cc..98aa90d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java @@ -30,7 +30,7 @@ import java.net.InetSocketAddress; import java.util.concurrent.Future; import java.util.logging.Logger; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static org.junit.Assert.*; @Category(IntegrationTest.class) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java index d9f3077..dc6bc07 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java @@ -39,7 +39,7 @@ import java.util.concurrent.Future; import java.util.logging.Logger; import java.util.logging.StreamHandler; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static org.junit.Assert.*; @Category(IntegrationTest.class) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java index 0d60e81..63e7b3f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java @@ -29,7 +29,7 @@ import java.net.InetSocketAddress; import java.util.Properties; import java.util.concurrent.Future; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import static org.junit.Assert.*; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java index 37ab246..fccfbcf 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java @@ -43,7 +43,7 @@ import java.net.URLClassLoader; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static org.junit.Assert.*; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java index 4ae62da..90f51d9 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java @@ -38,7 +38,7 @@ import com.gemstone.gemfire.test.dunit.*; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java index 6ae9d88..f1adbce 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java @@ -16,7 +16,6 @@ */ package com.gemstone.gemfire.pdx; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionManager; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.AvailablePortHelper; @@ -24,7 +23,7 @@ import com.gemstone.gemfire.test.dunit.*; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; public class DistributedSystemIdDUnitTest extends DistributedTestCase { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java index 35739ff..40a1071 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java @@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category; import java.text.SimpleDateFormat; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static org.junit.Assert.fail; @Category(IntegrationTest.class) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java index 1c4db64..0800dde 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java @@ -43,7 +43,7 @@ import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java index 4c0a2aa..4547e9c 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java @@ -36,7 +36,7 @@ import java.io.File; import java.io.FilenameFilter; import java.io.IOException; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static org.junit.Assert.assertEquals; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java index 5f5465f..d029557 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java @@ -34,7 +34,7 @@ import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java index de3a3bf..6027565 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java @@ -35,7 +35,7 @@ import org.junit.experimental.categories.Category; import java.io.*; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static org.junit.Assert.*; @Category(IntegrationTest.class) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java index 0ae185a..aba891e 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java @@ -37,7 +37,7 @@ import java.lang.reflect.InvocationTargetException; import java.math.BigInteger; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import static org.junit.Assert.*; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java index b56bb01..418a819 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java @@ -37,7 +37,7 @@ import java.io.*; import java.nio.ByteBuffer; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static org.junit.Assert.*; @Category(IntegrationTest.class) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java index f847c19..f8b3806 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java @@ -32,7 +32,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java index a1e8e04..6c64663 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java @@ -18,7 +18,7 @@ package com.gemstone.gemfire.redis; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.distributed.SystemConfigurationProperties; +import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; @@ -32,7 +32,7 @@ import redis.clients.jedis.exceptions.JedisDataException; import java.io.IOException; import java.util.Random; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import static org.junit.Assert.*; @Category(IntegrationTest.class) @@ -64,7 +64,7 @@ public class AuthJUnitTest { cf.set(LOG_LEVEL, "error"); cf.set(MCAST_PORT, "0"); cf.set(LOCATORS, ""); - cf.set(SystemConfigurationProperties.REDIS_PASSWORD, PASSWORD); + cf.set(DistributedSystemConfigProperties.REDIS_PASSWORD, PASSWORD); cache = cf.create(); server = new GemFireRedisServer("localhost", port); server.start(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java index 6b91763..45bd1dd 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java @@ -29,8 +29,8 @@ import org.junit.Test; import org.junit.contrib.java.lang.system.RestoreSystemProperties; import org.junit.experimental.categories.Category; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static org.junit.Assert.assertFalse; @Category(IntegrationTest.class) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java index 9c94abf..8b095a0 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java @@ -30,7 +30,7 @@ import redis.clients.jedis.Jedis; import java.io.IOException; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import static org.junit.Assert.*; @Category(IntegrationTest.class) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java index 6c9fcdc..4bfef66 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java @@ -32,7 +32,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import static org.junit.Assert.*; @Category(IntegrationTest.class) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java index 2ed26cf..f4a7308 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java @@ -17,7 +17,7 @@ package com.gemstone.gemfire.redis; import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.distributed.SystemConfigurationProperties; +import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.SocketCreator; import com.gemstone.gemfire.test.dunit.*; @@ -27,7 +27,7 @@ import redis.clients.jedis.Jedis; import java.util.Random; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; public class RedisDistDUnitTest extends DistributedTestCase { @@ -80,8 +80,8 @@ public class RedisDistDUnitTest extends DistributedTestCase { CacheFactory cF = new CacheFactory(); String locator = SocketCreator.getLocalHost().getHostName() + "[" + locatorPort + "]"; cF.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel()); - cF.set(SystemConfigurationProperties.REDIS_BIND_ADDRESS, localHost); - cF.set(SystemConfigurationProperties.REDIS_PORT, "" + port); + cF.set(DistributedSystemConfigProperties.REDIS_BIND_ADDRESS, localHost); + cF.set(DistributedSystemConfigProperties.REDIS_PORT, "" + port); cF.set(MCAST_PORT, "0"); cF.set(LOCATORS, locator); cF.create(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java index 850e68f..02a9d9f 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java @@ -33,7 +33,7 @@ import java.util.HashSet; import java.util.Random; import java.util.Set; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java index 06c8596..7885fdf 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java @@ -32,7 +32,7 @@ import java.io.IOException; import java.util.*; import java.util.Map.Entry; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import static org.junit.Assert.*; @Category(IntegrationTest.class) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java index 54eeeee..600af1b 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java @@ -30,7 +30,7 @@ import redis.clients.jedis.Jedis; import java.io.IOException; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import static org.junit.Assert.*; @Category(IntegrationTest.class) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java index 1ee8768..c02a8bb 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java @@ -20,7 +20,7 @@ import com.gemstone.gemfire.cache.Region; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.SECURITY_CLIENT_AUTHENTICATOR; import static com.gemstone.gemfire.security.SecurityTestUtils.*; import static org.junit.Assert.assertNotNull; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java index 4131fd4..56dbd14 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java @@ -39,7 +39,7 @@ import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase; import java.util.*; import java.util.concurrent.Callable; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import static com.gemstone.gemfire.internal.AvailablePort.SOCKET; import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort; import static com.gemstone.gemfire.security.SecurityTestUtils.*; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java index cd11c7a..b9d2d2d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java @@ -19,8 +19,8 @@ package com.gemstone.gemfire.security; import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties; import com.gemstone.gemfire.distributed.Locator; -import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; import com.gemstone.gemfire.distributed.internal.membership.gms.MembershipManagerHelper; @@ -43,7 +43,7 @@ import org.junit.experimental.categories.Category; import javax.net.ssl.SSLHandshakeException; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import static com.gemstone.gemfire.internal.AvailablePort.SOCKET; import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort; import static com.gemstone.gemfire.security.SecurityTestUtils.startLocator; @@ -92,9 +92,9 @@ public class P2PAuthenticationDUnitTest extends JUnit4DistributedTestCase { Properties props = new Properties(); props.setProperty(MCAST_PORT, "26753"); - props.setProperty(SystemConfigurationProperties.LOCATORS, getIPLiteral() + "[" + port + "]"); - props.setProperty(SystemConfigurationProperties.SECURITY_PEER_AUTH_INIT, UserPasswordAuthInit.class.getName() + ".create"); - props.setProperty(SystemConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "false"); + props.setProperty(DistributedSystemConfigProperties.LOCATORS, getIPLiteral() + "[" + port + "]"); + props.setProperty(DistributedSystemConfigProperties.SECURITY_PEER_AUTH_INIT, UserPasswordAuthInit.class.getName() + ".create"); + props.setProperty(DistributedSystemConfigProperties.ENABLE_CLUSTER_CONFIGURATION, "false"); try { Locator.startLocatorAndDS(port, null, null, props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java index 56da24a..71a0e55 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java @@ -53,7 +53,7 @@ import java.util.*; import java.util.concurrent.Callable; import static com.gemstone.gemfire.cache30.ClientServerTestCase.configureConnectionPoolWithNameAndFactory; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import static com.gemstone.gemfire.internal.AvailablePort.SOCKET; import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort; import static com.gemstone.gemfire.test.dunit.Assert.*; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java index 582d084..502b765 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java @@ -29,7 +29,7 @@ import java.security.Principal; import java.util.Properties; import java.util.Random; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; public class LdapUserCredentialGenerator extends CredentialGenerator { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java index ab8890b..a15a3e3 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java @@ -16,7 +16,6 @@ */ package com.gemstone.gemfire.security.generator; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.security.AuthenticationFailedException; import org.apache.logging.log4j.Logger; @@ -26,7 +25,7 @@ import java.io.IOException; import java.security.Principal; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; public class SSLCredentialGenerator extends CredentialGenerator { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java index f4a5897..bc967db 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java @@ -29,7 +29,7 @@ import java.util.Properties; import static org.junit.Assert.assertEquals; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * DistributedTestUtils provides static utility methods that http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java index 373797c..425bd64 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java @@ -16,7 +16,7 @@ */ package com.gemstone.gemfire.test.dunit; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import com.gemstone.gemfire.LogWriter; import com.gemstone.gemfire.distributed.internal.DistributionConfig; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java index ea8e02c..bc74ec1 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java @@ -42,7 +42,7 @@ import java.util.Arrays; import java.util.Map; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; /** * This class is the base class for all distributed tests using JUnit 4 that http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java index 8bb9b78..705fa4e 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java @@ -16,7 +16,7 @@ */ package com.gemstone.gemfire.test.dunit.internal; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import com.gemstone.gemfire.admin.internal.AdminDistributedSystemImpl; import com.gemstone.gemfire.cache.Cache; @@ -54,8 +54,8 @@ import java.io.Serializable; import java.text.DecimalFormat; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static org.junit.Assert.assertNotNull; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java index 99990be..cb517bb 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java @@ -50,7 +50,7 @@ import java.rmi.server.UnicastRemoteObject; import java.util.List; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * A class to build a fake test configuration and launch some DUnit VMS. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java index 4245baa..b191013 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java @@ -33,7 +33,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java index ed6fe0c..62feeb9 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java @@ -23,7 +23,7 @@ import org.junit.experimental.categories.Category; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static com.gemstone.gemfire.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java index bde503b..2bd1f75 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java @@ -20,7 +20,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java index deb3e76..5915eb7 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java @@ -16,7 +16,7 @@ */ package com.gemstone.gemfire.test.golden; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.test.process.ProcessWrapper; @@ -29,7 +29,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; /** * Test framework for launching processes and comparing output to expected golden output. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java b/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java index 02169be..645dd30 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java @@ -16,7 +16,7 @@ */ package com.gemstone.gemfire.test.process; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import com.gemstone.gemfire.internal.logging.LogService; import org.apache.logging.log4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java index 1ba65ce..51c4d0d 100644 --- a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java +++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java @@ -24,7 +24,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig; import java.util.Set; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * This is a member representing site 1 who wants to send data to site 2 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java index c002a2c..afe22bb 100644 --- a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java +++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java @@ -16,7 +16,7 @@ */ package com.main; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import com.gemstone.gemfire.distributed.Locator; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -24,7 +24,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig; import java.io.IOException; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; /** * This is a stand alone locator with a distributed-system-id = -1 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java index b2d14b9..7f82750 100644 --- a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java +++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java @@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.wan.GatewayReceiver; import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * This is a member representing site 2 who wants to receive data from site 1 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java index 8abaa9e..467af82 100644 --- a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java +++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java @@ -22,7 +22,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig; import java.io.IOException; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * This is a stand alone locator with a distributed-system-id = -2 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java index f71e51b..ce67542 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java @@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; @Category(IntegrationTest.class) public class CQJUnitTest extends TestCase { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java index 15dbbf6..b94c7e4 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java @@ -41,7 +41,7 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * This class tests the ContiunousQuery mechanism in GemFire. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java index e2f5d99..5c993ce 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java @@ -37,8 +37,8 @@ import com.gemstone.gemfire.test.dunit.*; import java.io.IOException; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; /** * This class tests the ContiunousQuery mechanism in GemFire. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java index faa7433..a4842de 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java @@ -40,8 +40,8 @@ import com.gemstone.gemfire.test.dunit.*; import java.io.IOException; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; /** * This class tests the ContiunousQuery mechanism in GemFire. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java index 5f51611..b69d9ae 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java @@ -19,7 +19,6 @@ package com.gemstone.gemfire.cache.query.cq.dunit; import com.gemstone.gemfire.cache.query.CqQuery; import com.gemstone.gemfire.cache.query.dunit.CloseCacheAuthorization; import com.gemstone.gemfire.cache.query.dunit.HelperTestCase; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.security.templates.DummyAuthenticator; import com.gemstone.gemfire.security.templates.UserPasswordAuthInit; @@ -27,7 +26,7 @@ import com.gemstone.gemfire.test.dunit.*; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; public class CqStateDUnitTest extends HelperTestCase { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java index 3afa0a4..acede33 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java @@ -33,7 +33,7 @@ import hydra.Log; import java.io.IOException; import java.util.HashSet; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * Test class for Partitioned Region and CQs http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java index 86a8324..ab4c203 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java @@ -41,8 +41,8 @@ import com.gemstone.gemfire.test.dunit.VM; import java.io.IOException; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; public abstract class PdxQueryCQTestBase extends CacheTestCase { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java index 9d6c3cb..9d487dc 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java @@ -40,7 +40,7 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable; import java.io.File; import java.util.concurrent.atomic.AtomicBoolean; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; public class ClientSnapshotDUnitTest extends CacheTestCase { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java index cc7c7a1..8614a80 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java @@ -42,8 +42,8 @@ import java.io.DataOutput; import java.io.IOException; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; /** * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java index a9ad6e5..c4d2a44 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java @@ -41,8 +41,8 @@ import java.io.IOException; import java.io.Serializable; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; /** * Tests putAll for c/s. Also tests removeAll http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java index 8e36e92..5c2f723 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java @@ -44,7 +44,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java index 43090f4..7e6d760 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java @@ -39,8 +39,8 @@ import java.io.File; import java.io.IOException; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; /** * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java index a39543b..9837cf6 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java @@ -43,8 +43,8 @@ import java.io.IOException; import java.util.Iterator; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static com.gemstone.gemfire.internal.AvailablePort.SOCKET; import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort; import static com.gemstone.gemfire.test.dunit.Assert.*; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java index 17e85ec..1da4e96 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java @@ -40,7 +40,7 @@ import java.io.DataOutput; import java.io.IOException; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * Test client to server flow for delta propogation http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java index 76aa0d9..acb4094 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java @@ -36,8 +36,8 @@ import com.gemstone.gemfire.test.dunit.*; import java.util.List; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; /** * @@ -232,7 +232,7 @@ public class DeltaPropagationWithCQDUnitTest extends DistributedTestCase { cache = CacheFactory.create(ds); assertNotNull(cache); // Properties props = new Properties(); - // props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10333"); + // props.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "10333"); // cache = new CacheFactory(props).create(); RegionFactory rf = ((Cache)cache) .createRegionFactory(RegionShortcut.REPLICATE); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java index 160a460..1488bce 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java @@ -33,8 +33,8 @@ import com.gemstone.gemfire.test.dunit.*; import java.util.Iterator; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; /** * This tests the flag setting for region ( DataPolicy as Empty ) for * Delta propogation for a client while registering CQ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java index c1680f5..840f593 100755 --- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java @@ -41,7 +41,7 @@ import java.util.*; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * Class DurableClientTestCase tests durable client http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java index bc83d7d..cab3849 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java @@ -24,7 +24,6 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqService; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.Locator; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; @@ -41,7 +40,7 @@ import java.net.UnknownHostException; import java.util.Collections; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * Cache Server related management test cases http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java index 453ef21..129c146 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java @@ -58,7 +58,7 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.concurrent.TimeUnit; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import static com.gemstone.gemfire.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.getDUnitLocatorPort; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java index 3042e76..c51f875 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java @@ -41,7 +41,7 @@ import org.junit.experimental.categories.Category; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import static com.gemstone.gemfire.test.dunit.Assert.assertTrue; import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.getDUnitLocatorPort; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java index 8f8a2a7..2015ee4 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java @@ -19,7 +19,7 @@ package com.gemstone.gemfire.security; import com.gemstone.gemfire.DataSerializable; import com.gemstone.gemfire.Instantiator; import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode; -import com.gemstone.gemfire.distributed.SystemConfigurationProperties; +import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.security.FilterPostAuthorization; import com.gemstone.gemfire.internal.security.FilterPreAuthorization; @@ -212,13 +212,13 @@ public class ClientAuthzObjectModDUnitTest extends ClientAuthorizationTestCase { private Properties buildProperties(final String authenticator, final Properties extraProps, final String preAccessor, final String postAccessor) { Properties authProps = new Properties(); if (authenticator != null) { - authProps.setProperty(SystemConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator); + authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator); } if (preAccessor != null) { - authProps.setProperty(SystemConfigurationProperties.SECURITY_CLIENT_ACCESSOR, preAccessor); + authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_ACCESSOR, preAccessor); } if (postAccessor != null) { - authProps.setProperty(SystemConfigurationProperties.SECURITY_CLIENT_ACCESSOR_PP, postAccessor); + authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_ACCESSOR_PP, postAccessor); } if (extraProps != null) { authProps.putAll(extraProps); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java index 28b3707..3ed8c1b 100644 --- a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java +++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java @@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.query.CqAttributesFactory; import com.gemstone.gemfire.cache.query.CqException; import com.gemstone.gemfire.cache.query.CqQuery; import com.gemstone.gemfire.cache.query.Query; -import com.gemstone.gemfire.distributed.SystemConfigurationProperties; +import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.PoolManagerImpl; import com.gemstone.gemfire.security.generator.CredentialGenerator; @@ -297,7 +297,7 @@ public class MultiUserAPIDUnitTest extends ClientAuthorizationTestCase { } if (authenticator != null) { - authProps.setProperty(SystemConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator); + authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator); } return SecurityTestUtils.createCacheServer(authProps, javaProps, dsPort, locatorString, 0, NO_EXCEPTION); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java index 9867325..7f26156 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java @@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.lucene; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.RegionShortcut; import com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities; -import com.gemstone.gemfire.distributed.SystemConfigurationProperties; +import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.offheap.MemoryAllocatorImpl; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; @@ -49,7 +49,7 @@ public class LuceneIndexCreationOffHeapIntegrationTest extends LuceneIntegration @Override protected CacheFactory getCacheFactory() { CacheFactory factory = super.getCacheFactory(); - factory.set(SystemConfigurationProperties.OFF_HEAP_MEMORY_SIZE, "100m"); + factory.set(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, "100m"); return factory; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java index cb51ff5..ff91873 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java @@ -23,11 +23,11 @@ import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionShortcut; -import com.gemstone.gemfire.distributed.SystemConfigurationProperties; +import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties; import org.junit.After; import org.junit.Before; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; public class LuceneIntegrationTest { @@ -53,8 +53,8 @@ public class LuceneIntegrationTest { protected CacheFactory getCacheFactory() { CacheFactory cf = new CacheFactory(); cf.set(MCAST_PORT, "0"); - cf.set(SystemConfigurationProperties.LOCATORS, ""); - cf.set(SystemConfigurationProperties.LOG_LEVEL, System.getProperty("logLevel", "info")); + cf.set(DistributedSystemConfigProperties.LOCATORS, ""); + cf.set(DistributedSystemConfigProperties.LOG_LEVEL, System.getProperty("logLevel", "info")); return cf; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java index 1362a19..65e296d 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java @@ -39,7 +39,7 @@ import org.junit.experimental.categories.Category; import java.io.IOException; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java index 67853f9..9ecaaa3 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java @@ -35,7 +35,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java index 98675d0..da9735f 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java @@ -56,7 +56,7 @@ import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; /** * Microbenchmark of the IndexRepository to compare an http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java index 28a364d..8329a47 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java @@ -36,7 +36,7 @@ import java.io.ByteArrayOutputStream; import java.io.PrintWriter; import java.nio.charset.Charset; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT; import static org.junit.Assert.*; @Category(IntegrationTest.class) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java index 3205dd3..e88a3ee 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java @@ -47,7 +47,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java index dbac007..ce338d6 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java index 4d9e959..39c934d 100644 --- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java +++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java @@ -44,7 +44,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*; public class Server { private static final String DEFAULT_HOST = "127.0.0.1"; //"localhost"