http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java index e8afdb2..0c99033 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java @@ -17,24 +17,6 @@ package com.gemstone.gemfire.internal.cache.tier.sockets; -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; -import java.io.IOException; -import java.net.InetAddress; -import java.net.Socket; -import java.nio.ByteBuffer; -import java.nio.channels.SelectableChannel; -import java.nio.channels.SelectionKey; -import java.nio.channels.Selector; -import java.security.Principal; -import java.util.Map; -import java.util.Properties; -import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.LinkedBlockingQueue; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelException; import com.gemstone.gemfire.DataSerializer; import com.gemstone.gemfire.SystemFailure; @@ -49,12 +31,7 @@ import com.gemstone.gemfire.internal.HeapDataOutputStream; import com.gemstone.gemfire.internal.Version; import com.gemstone.gemfire.internal.cache.EventID; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.tier.Acceptor; -import com.gemstone.gemfire.internal.cache.tier.CachedRegionHelper; -import com.gemstone.gemfire.internal.cache.tier.ClientHandShake; -import com.gemstone.gemfire.internal.cache.tier.Command; -import com.gemstone.gemfire.internal.cache.tier.InternalClientMembership; -import com.gemstone.gemfire.internal.cache.tier.MessageType; +import com.gemstone.gemfire.internal.cache.tier.*; import com.gemstone.gemfire.internal.cache.tier.sockets.command.Default; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.InternalLogWriter; @@ -66,6 +43,23 @@ import com.gemstone.gemfire.internal.util.Breadcrumbs; import com.gemstone.gemfire.security.AuthenticationFailedException; import com.gemstone.gemfire.security.AuthenticationRequiredException; import com.gemstone.gemfire.security.GemFireSecurityException; +import org.apache.logging.log4j.Logger; + +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.IOException; +import java.net.InetAddress; +import java.net.Socket; +import java.nio.ByteBuffer; +import java.nio.channels.SelectableChannel; +import java.nio.channels.SelectionKey; +import java.nio.channels.Selector; +import java.security.Principal; +import java.util.Map; +import java.util.Properties; +import java.util.Random; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.LinkedBlockingQueue; /** * Provides an implementation for the server socket end of the hierarchical
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/TXFailoverCommand.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/TXFailoverCommand.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/TXFailoverCommand.java index 789b312..c31d9cf 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/TXFailoverCommand.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/TXFailoverCommand.java @@ -16,30 +16,20 @@ */ package com.gemstone.gemfire.internal.cache.tier.sockets.command; -import java.io.IOException; - import com.gemstone.gemfire.cache.TransactionDataNodeHasDepartedException; -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.distributed.internal.ReplyException; import com.gemstone.gemfire.distributed.internal.WaitForViewInstallation; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.cache.FindRemoteTXMessage; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.PeerTXStateStub; -import com.gemstone.gemfire.internal.cache.TXId; -import com.gemstone.gemfire.internal.cache.TXManagerImpl; -import com.gemstone.gemfire.internal.cache.TXState; -import com.gemstone.gemfire.internal.cache.TXStateProxy; -import com.gemstone.gemfire.internal.cache.TXStateProxyImpl; +import com.gemstone.gemfire.internal.cache.*; import com.gemstone.gemfire.internal.cache.FindRemoteTXMessage.FindRemoteTXMessageReplyProcessor; import com.gemstone.gemfire.internal.cache.tier.Command; import com.gemstone.gemfire.internal.cache.tier.sockets.BaseCommand; import com.gemstone.gemfire.internal.cache.tier.sockets.Message; import com.gemstone.gemfire.internal.cache.tier.sockets.ServerConnection; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; + +import java.io.IOException; /** * Used for bootstrapping txState/PeerTXStateStub on the server. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tx/ClientTXStateStub.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tx/ClientTXStateStub.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tx/ClientTXStateStub.java index 88e4ed8..855297f 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tx/ClientTXStateStub.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tx/ClientTXStateStub.java @@ -24,29 +24,22 @@ import com.gemstone.gemfire.cache.client.internal.ServerRegionDataAccess; import com.gemstone.gemfire.cache.client.internal.ServerRegionProxy; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.internal.DM; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.ServerLocation; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.TXCommitMessage; -import com.gemstone.gemfire.internal.cache.TXLockRequest; -import com.gemstone.gemfire.internal.cache.TXRegionLockRequestImpl; -import com.gemstone.gemfire.internal.cache.TXStateProxy; -import com.gemstone.gemfire.internal.cache.TXStateStub; +import com.gemstone.gemfire.internal.cache.*; import com.gemstone.gemfire.internal.cache.locks.TXRegionLockRequest; import com.gemstone.gemfire.internal.cache.tx.TransactionalOperation.ServerRegionOperation; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; +import org.apache.logging.log4j.Logger; +import javax.transaction.Status; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import javax.transaction.Status; - -import org.apache.logging.log4j.Logger; - public class ClientTXStateStub extends TXStateStub { private static final Logger logger = LogService.getLogger(); @@ -75,7 +68,7 @@ public class ClientTXStateStub extends TXStateStub { /** * System property to disable conflict checks on clients. */ - private static final boolean DISABLE_CONFLICT_CHECK_ON_CLIENT = Boolean.getBoolean("gemfire.disableConflictChecksOnClient"); + private static final boolean DISABLE_CONFLICT_CHECK_ON_CLIENT = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "disableConflictChecksOnClient"); /** * @return true if transactional operation recording is enabled (test hook) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionVector.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionVector.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionVector.java index d9180a2..2f02422 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionVector.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/RegionVersionVector.java @@ -16,28 +16,10 @@ */ package com.gemstone.gemfire.internal.cache.versions; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.util.Collections; -import java.util.ConcurrentModificationException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.ReentrantReadWriteLock; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelCriterion; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.internal.DM; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.MembershipListener; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; @@ -51,6 +33,17 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.logging.log4j.LogMarker; +import org.apache.logging.log4j.Logger; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.ReentrantReadWriteLock; /** * RegionVersionVector tracks the highest region-level version number of @@ -60,18 +53,18 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker; public abstract class RegionVersionVector<T extends VersionSource<?>> implements DataSerializableFixedID, MembershipListener { private static final Logger logger = LogService.getLogger(); - - public static boolean DEBUG = Boolean.getBoolean("gemfire.VersionVector.VERBOSE"); //TODO:LOG:CONVERT: REMOVE THIS + + public static boolean DEBUG = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "VersionVector.VERBOSE"); //TODO:LOG:CONVERT: REMOVE THIS //////////////////// The following statics exist for unit testing. //////////////////////////// /** maximum ms wait time while waiting for dominance to be achieved */ - public static long MAX_DOMINANCE_WAIT_TIME = Long.getLong("gemfire.max-dominance-wait-time", 5000); + public static long MAX_DOMINANCE_WAIT_TIME = Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "max-dominance-wait-time", 5000); /** maximum ms pause time while waiting for dominance to be achieved */ - public static long DOMINANCE_PAUSE_TIME = Math.min(Long.getLong("gemfire.dominance-pause-time", 300), MAX_DOMINANCE_WAIT_TIME); + public static long DOMINANCE_PAUSE_TIME = Math.min(Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "dominance-pause-time", 300), MAX_DOMINANCE_WAIT_TIME); private static int INITIAL_CAPACITY = 2; private static int CONCURRENCY_LEVEL = 2; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java index 3c70a4b..c57aebc 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java @@ -16,41 +16,15 @@ */ package com.gemstone.gemfire.internal.cache.wan; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelException; import com.gemstone.gemfire.GemFireException; import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.EntryEvent; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionDestroyedException; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.wan.GatewayEventFilter; import com.gemstone.gemfire.cache.wan.GatewayQueueEvent; import com.gemstone.gemfire.cache.wan.GatewaySender; -import com.gemstone.gemfire.internal.cache.BucketRegion; -import com.gemstone.gemfire.internal.cache.Conflatable; -import com.gemstone.gemfire.internal.cache.DistributedRegion; -import com.gemstone.gemfire.internal.cache.EntryEventImpl; -import com.gemstone.gemfire.internal.cache.EnumListenerEvent; -import com.gemstone.gemfire.internal.cache.EventID; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.PartitionedRegion; -import com.gemstone.gemfire.internal.cache.RegionQueue; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.cache.*; import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderQueue; import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderQueue; import com.gemstone.gemfire.internal.cache.wan.serial.SerialGatewaySenderQueue; @@ -59,6 +33,13 @@ import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.pdx.internal.PeerTypeRegistration; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.util.*; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; /** * EventProcessor responsible for peeking from queue and handling over the events @@ -353,13 +334,13 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread { * practice. */ protected static final int FAILURE_MAP_MAXSIZE = Integer.getInteger( - "gemfire.GatewaySender.FAILURE_MAP_MAXSIZE", 1000000); + DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.FAILURE_MAP_MAXSIZE", 1000000); /** * The maximum interval for logging failures of the same event in millis. */ protected static final int FAILURE_LOG_MAX_INTERVAL = Integer.getInteger( - "gemfire.GatewaySender.FAILURE_LOG_MAX_INTERVAL", 300000); + DistributionConfig.GEMFIRE_PREFIX + "GatewaySender.FAILURE_LOG_MAX_INTERVAL", 300000); public final boolean skipFailureLogging(Integer batchId) { boolean skipLogging = false; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java index 5c26bfe..b516ca1 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java @@ -16,51 +16,14 @@ */ package com.gemstone.gemfire.internal.cache.wan.serial; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Deque; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.PriorityQueue; -import java.util.Set; -import java.util.concurrent.LinkedBlockingDeque; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicReference; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelException; import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.AttributesMutator; -import com.gemstone.gemfire.cache.CacheException; -import com.gemstone.gemfire.cache.CacheListener; -import com.gemstone.gemfire.cache.CacheWriterException; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.cache.EvictionAction; -import com.gemstone.gemfire.cache.EvictionAttributes; -import com.gemstone.gemfire.cache.Operation; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionAttributes; -import com.gemstone.gemfire.cache.RegionDestroyedException; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.TimeoutException; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.asyncqueue.AsyncEvent; import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.internal.cache.CachedDeserializable; -import com.gemstone.gemfire.internal.cache.Conflatable; -import com.gemstone.gemfire.internal.cache.DistributedRegion; -import com.gemstone.gemfire.internal.cache.EntryEventImpl; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.InternalRegionArguments; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.RegionEventImpl; -import com.gemstone.gemfire.internal.cache.RegionQueue; -import com.gemstone.gemfire.internal.cache.Token; +import com.gemstone.gemfire.internal.cache.*; import com.gemstone.gemfire.internal.cache.versions.RegionVersionVector; import com.gemstone.gemfire.internal.cache.versions.VersionSource; import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender; @@ -70,8 +33,14 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.offheap.OffHeapRegionEntryHelper; -import com.gemstone.gemfire.internal.offheap.annotations.Unretained; import com.gemstone.gemfire.pdx.internal.PeerTypeRegistration; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.util.*; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; /** * @since GemFire 7.0 @@ -164,7 +133,7 @@ public class SerialGatewaySenderQueue implements RegionQueue { * Whether the <code>Gateway</code> queue should be no-ack instead of ack. */ private static final boolean NO_ACK = Boolean - .getBoolean("gemfire.gateway-queue-no-ack"); + .getBoolean(DistributionConfig.GEMFIRE_PREFIX + "gateway-queue-no-ack"); private volatile long lastDispatchedKey = -1; @@ -200,7 +169,7 @@ public class SerialGatewaySenderQueue implements RegionQueue { } else { this.isDiskSynchronous = false; } - if (Boolean.getBoolean("gemfire.gateway-queue-sync")) { + if (Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "gateway-queue-sync")) { this.keyPutNoSync = false; this.maxPendingPuts = 0; this.pendingPuts = null; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java index d2ff280..e3c5438 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java @@ -16,21 +16,16 @@ */ package com.gemstone.gemfire.internal.cache.xmlcache; -import java.io.IOException; -import java.io.InputStream; -import java.util.ServiceLoader; - -import org.xml.sax.Attributes; -import org.xml.sax.ErrorHandler; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.SAXNotRecognizedException; -import org.xml.sax.SAXParseException; -import org.xml.sax.ext.EntityResolver2; - import com.gemstone.gemfire.cache.CacheXmlException; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.ClassPathLoader; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.xml.sax.*; +import org.xml.sax.ext.EntityResolver2; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ServiceLoader; /** * The abstract superclass of classes that convert XML into a {@link @@ -696,7 +691,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler { /** The name of the <code>overflow-directory</code> attribute */ protected static final String OVERFLOW_DIRECTORY = "overflow-directory"; /** The name of the <code>socket-buffer-size</code> attribute */ - protected static final String SOCKET_BUFFER_SIZE = "socket-buffer-size"; + protected static final String SOCKET_BUFFER_SIZE = DistributionConfig.SOCKET_BUFFER_SIZE_NAME; /** The name of the <code>socket-read-timeout</code> attribute */ protected static final String SOCKET_READ_TIMEOUT = "socket-read-timeout"; /** The name of the <code>maximum-queue-memory</code> attribute */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/Atomics.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/Atomics.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/Atomics.java index f922416..8940a69 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/Atomics.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/Atomics.java @@ -17,15 +17,16 @@ package com.gemstone.gemfire.internal.concurrent; -import java.util.concurrent.atomic.AtomicLong; - import com.gemstone.gemfire.Statistics; import com.gemstone.gemfire.StatisticsType; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.LocalStatisticsImpl; import com.gemstone.gemfire.internal.StatisticsManager; import com.gemstone.gemfire.internal.StatisticsTypeImpl; import com.gemstone.gemfire.internal.stats50.Atomic50StatisticsImpl; +import java.util.concurrent.atomic.AtomicLong; + public class Atomics { private Atomics() { } @@ -33,7 +34,7 @@ public class Atomics { * Whether per-thread stats are used. Striping is disabled for the * IBM JVM due to bug 38226 */ - private static final boolean STRIPED_STATS_DISABLED = Boolean.getBoolean("gemfire.STRIPED_STATS_DISABLED") + private static final boolean STRIPED_STATS_DISABLED = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "STRIPED_STATS_DISABLED") || "IBM Corporation".equals(System.getProperty("java.vm.vendor", "unknown")); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/jndi/JNDIInvoker.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/jndi/JNDIInvoker.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/jndi/JNDIInvoker.java index 2743537..82165a7 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/jndi/JNDIInvoker.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/jndi/JNDIInvoker.java @@ -16,22 +16,8 @@ */ package com.gemstone.gemfire.internal.jndi; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NameNotFoundException; -import javax.naming.NamingException; -import javax.naming.NoInitialContextException; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; - import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.i18n.LogWriterI18n; import com.gemstone.gemfire.internal.ClassPathLoader; import com.gemstone.gemfire.internal.datasource.AbstractDataSource; @@ -43,6 +29,15 @@ import com.gemstone.gemfire.internal.jta.TransactionManagerImpl; import com.gemstone.gemfire.internal.jta.TransactionUtils; import com.gemstone.gemfire.internal.jta.UserTransactionImpl; +import javax.naming.*; +import javax.transaction.SystemException; +import javax.transaction.TransactionManager; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.List; +import java.util.Map; + /** * <p> * Utility class for binding DataSources and Transactional resources to JNDI @@ -111,7 +106,7 @@ public class JNDIInvoker { * as a JTA transaction manager. Also region operations will <b>not</b> participate in * an ongoing JTA transaction. */ - private static Boolean IGNORE_JTA = Boolean.getBoolean("gemfire.ignoreJTA"); + private static Boolean IGNORE_JTA = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "ignoreJTA"); /** * Bind the transaction resources. Bind UserTransaction and @@ -221,7 +216,7 @@ public class JNDIInvoker { } } dataSourceList.clear(); - IGNORE_JTA = Boolean.getBoolean("gemfire.ignoreJTA"); + IGNORE_JTA = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "ignoreJTA"); } /* http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogConfig.java index edd66c2..5100fc4 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogConfig.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogConfig.java @@ -16,8 +16,6 @@ */ package com.gemstone.gemfire.internal.logging; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; - import java.io.File; public interface LogConfig { @@ -27,7 +25,7 @@ public interface LogConfig { * * @see com.gemstone.gemfire.internal.logging.LogWriterImpl */ - public int getLogLevel(); + int getLogLevel(); /** * Returns the value of the <a * href="../DistributedSystem.html#log-file">"log-file"</a> property @@ -35,19 +33,19 @@ public interface LogConfig { * @return <code>null</code> if logging information goes to standard * out */ - public File getLogFile(); + File getLogFile(); /** * Returns the value of the <a * href="../DistributedSystem.html#log-file-size-limit">"log-file-size-limit"</a> * property */ - public int getLogFileSizeLimit(); + int getLogFileSizeLimit(); /** * Returns the value of the <a * href="../DistributedSystem.html#log-disk-space-limit">"log-disk-space-limit"</a> * property */ - public int getLogDiskSpaceLimit(); + int getLogDiskSpaceLimit(); /** * Returns the value of the <a @@ -59,7 +57,7 @@ public interface LogConfig { * <p> The default value is: {@link DistributionConfig#DEFAULT_NAME}. * @return the system's name. */ - public String getName(); - - public String toLoggerString(); + String getName(); + + String toLoggerString(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java index 63ed4b0..cdc5e81 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java @@ -16,7 +16,6 @@ */ package com.gemstone.gemfire.internal.logging; - import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.InternalLocator; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java index b4e32c0..353813c 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java @@ -16,28 +16,21 @@ */ package com.gemstone.gemfire.internal.logging; -import java.io.File; -import java.io.FileOutputStream; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintStream; -import java.io.PrintWriter; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Date; -import java.util.regex.Pattern; - +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.i18n.LogWriterI18n; import com.gemstone.gemfire.internal.FileUtil; import com.gemstone.gemfire.internal.OSProcess; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.log4j.AlertAppender; -import com.gemstone.gemfire.internal.logging.log4j.LogWriterLogger; import com.gemstone.gemfire.internal.util.LogFileUtils; +import java.io.*; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Date; +import java.util.regex.Pattern; + /** * Implementation of {@link LogWriterI18n} for distributed system members. * Its just like {@link LocalLogWriter} except it has support for rolling @@ -47,7 +40,7 @@ import com.gemstone.gemfire.internal.util.LogFileUtils; */ public class ManagerLogWriter extends LocalLogWriter { - public static final String TEST_FILE_SIZE_LIMIT_IN_KB_PROPERTY = "gemfire.logging.test.fileSizeLimitInKB"; + public static final String TEST_FILE_SIZE_LIMIT_IN_KB_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "logging.test.fileSizeLimitInKB"; private final boolean fileSizeLimitInKB; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogConfig.java index f915994..fdb7a87 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogConfig.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogConfig.java @@ -16,10 +16,10 @@ */ package com.gemstone.gemfire.internal.logging; -import java.io.File; - import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import java.io.File; + /** * LogConfig implementation for Security logging configuration that delegates * to a DistributionConfig. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogWriter.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogWriter.java index b94c2ad..80a2c79 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogWriter.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogWriter.java @@ -16,6 +16,7 @@ */ package com.gemstone.gemfire.internal.logging; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.i18n.StringId; /** @@ -32,7 +33,7 @@ import com.gemstone.gemfire.i18n.StringId; */ public final class SecurityLogWriter extends LogWriterImpl implements InternalLogWriter { - public static final String SECURITY_PREFIX = "security-"; + public static final String SECURITY_PREFIX = DistributionConfig.SECURITY_PREFIX_NAME; private final int logLevel; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityManagerLogWriter.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityManagerLogWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityManagerLogWriter.java index d051cef..9dde226 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityManagerLogWriter.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityManagerLogWriter.java @@ -16,10 +16,9 @@ */ package com.gemstone.gemfire.internal.logging; -import java.io.PrintStream; - import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.i18n.StringId; + +import java.io.PrintStream; /** * A log writer for security related logs. This will prefix all messages with http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/AppenderContext.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/AppenderContext.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/AppenderContext.java index 4e9cf88..f8e65b3 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/AppenderContext.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/AppenderContext.java @@ -16,12 +16,12 @@ */ package com.gemstone.gemfire.internal.logging.log4j; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.logging.LogService; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.LoggerConfig; -import com.gemstone.gemfire.internal.logging.LogService; - /** * Provides the LoggerContext and LoggerConfig for GemFire appenders to attach * to. These appenders include AlertAppender and LogWriterAppender. @@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.logging.LogService; public class AppenderContext { /** "com.gemstone" is a good alternative for limiting alerts to just gemstone packages, otherwise ROOT is used */ - public static final String LOGGER_PROPERTY = "gemfire.logging.appenders.LOGGER"; + public static final String LOGGER_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "logging.appenders.LOGGER"; public AppenderContext() { this(System.getProperty(LOGGER_PROPERTY, "")); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterAppenders.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterAppenders.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterAppenders.java index 263527e..a050269 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterAppenders.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterAppenders.java @@ -16,40 +16,26 @@ */ package com.gemstone.gemfire.internal.logging.log4j; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; - -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.config.AppenderRef; -import org.apache.logging.log4j.core.config.LoggerConfig; - import com.gemstone.gemfire.GemFireIOException; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.OSProcess; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.InternalLogWriter; -import com.gemstone.gemfire.internal.logging.LogConfig; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.ManagerLogWriter; -import com.gemstone.gemfire.internal.logging.SecurityManagerLogWriter; +import com.gemstone.gemfire.internal.logging.*; import com.gemstone.gemfire.internal.process.ProcessLauncherContext; import com.gemstone.gemfire.internal.util.LogFileUtils; +import java.io.*; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + /** * Holds on to one or many instances of LogWriterAppender and provides * convenience methods for controlling their lifecycles. * */ public class LogWriterAppenders { - public final static String APPEND_TO_LOG_FILE = "gemfire.append-log"; + public final static String APPEND_TO_LOG_FILE = DistributionConfig.GEMFIRE_PREFIX + "append-log"; private static final boolean ALLOW_REDIRECT = true; public enum Identifier { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterLogger.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterLogger.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterLogger.java index dc36f95..a17f8c7 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterLogger.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterLogger.java @@ -16,8 +16,14 @@ */ package com.gemstone.gemfire.internal.logging.log4j; -import java.util.logging.Handler; - +import com.gemstone.gemfire.LogWriter; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.i18n.LogWriterI18n; +import com.gemstone.gemfire.i18n.StringId; +import com.gemstone.gemfire.internal.logging.GemFireHandler; +import com.gemstone.gemfire.internal.logging.InternalLogWriter; +import com.gemstone.gemfire.internal.logging.LogService; +import com.gemstone.gemfire.internal.logging.log4j.message.GemFireParameterizedMessageFactory; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -26,13 +32,7 @@ import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.spi.AbstractLogger; import org.apache.logging.log4j.spi.ExtendedLoggerWrapper; -import com.gemstone.gemfire.LogWriter; -import com.gemstone.gemfire.i18n.LogWriterI18n; -import com.gemstone.gemfire.i18n.StringId; -import com.gemstone.gemfire.internal.logging.GemFireHandler; -import com.gemstone.gemfire.internal.logging.InternalLogWriter; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.log4j.message.GemFireParameterizedMessageFactory; +import java.util.logging.Handler; /** * Implements GemFireLogger with custom levels while also bridging LogWriter @@ -47,7 +47,7 @@ implements InternalLogWriter, GemFireLogger { private static final long serialVersionUID = 446081244292135L; // TODO:LOG:SECURITY: need to use this either here if isSecure==true or in the security LogWriterAppender's PatternLayout but not both places - public static final String SECURITY_PREFIX = "security-"; + public static final String SECURITY_PREFIX = DistributionConfig.SECURITY_PREFIX_NAME; private final ExtendedLoggerWrapper logWrapper; private final String connectionName; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/FreeListManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/FreeListManager.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/FreeListManager.java index 9940b7d..ffd5b0a 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/FreeListManager.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/FreeListManager.java @@ -16,24 +16,18 @@ */ package com.gemstone.gemfire.internal.offheap; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.NavigableSet; +import com.gemstone.gemfire.OutOfOffHeapMemoryException; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.logging.LogService; +import org.apache.logging.log4j.Logger; + +import java.util.*; import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReferenceArray; -import org.apache.logging.log4j.Logger; - -import com.gemstone.gemfire.OutOfOffHeapMemoryException; -import com.gemstone.gemfire.internal.logging.LogService; - /** * Manages the free lists and slabs for a MemoryAllocator */ @@ -273,7 +267,7 @@ public class FreeListManager { * Set this to "true" to perform data integrity checks on allocated and reused Chunks. This may clobber * performance so turn on only when necessary. */ - final boolean validateMemoryWithFill = Boolean.getBoolean("gemfire.validateOffHeapWithFill"); + final boolean validateMemoryWithFill = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "validateOffHeapWithFill"); /** * Every allocated chunk smaller than TINY_MULTIPLE*TINY_FREE_LIST_COUNT will allocate a chunk of memory that is a multiple of this value. * Sizes are always rounded up to the next multiple of this constant @@ -282,14 +276,14 @@ public class FreeListManager { * This does not account for the additional internal fragmentation caused by the off-heap header * which currently is always 8 bytes. */ - public final static int TINY_MULTIPLE = Integer.getInteger("gemfire.OFF_HEAP_ALIGNMENT", 8); + public final static int TINY_MULTIPLE = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "OFF_HEAP_ALIGNMENT", 8); static { verifyOffHeapAlignment(TINY_MULTIPLE); } /** * Number of free lists to keep for tiny allocations. */ - public final static int TINY_FREE_LIST_COUNT = Integer.getInteger("gemfire.OFF_HEAP_FREE_LIST_COUNT", 16384); + public final static int TINY_FREE_LIST_COUNT = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "OFF_HEAP_FREE_LIST_COUNT", 16384); static { verifyOffHeapFreeListCount(TINY_FREE_LIST_COUNT); } @@ -507,16 +501,16 @@ public class FreeListManager { static void verifyOffHeapAlignment(int tinyMultiple) { if (tinyMultiple <= 0 || (tinyMultiple & 3) != 0) { - throw new IllegalStateException("gemfire.OFF_HEAP_ALIGNMENT must be a multiple of 8."); + throw new IllegalStateException(DistributionConfig.GEMFIRE_PREFIX + "OFF_HEAP_ALIGNMENT must be a multiple of 8."); } if (tinyMultiple > 256) { // this restriction exists because of the dataSize field in the object header. - throw new IllegalStateException("gemfire.OFF_HEAP_ALIGNMENT must be <= 256 and a multiple of 8."); + throw new IllegalStateException(DistributionConfig.GEMFIRE_PREFIX + "OFF_HEAP_ALIGNMENT must be <= 256 and a multiple of 8."); } } static void verifyOffHeapFreeListCount(int tinyFreeListCount) { if (tinyFreeListCount <= 0) { - throw new IllegalStateException("gemfire.OFF_HEAP_FREE_LIST_COUNT must be >= 1."); + throw new IllegalStateException(DistributionConfig.GEMFIRE_PREFIX + "OFF_HEAP_FREE_LIST_COUNT must be >= 1."); } } static void verifyHugeMultiple(int hugeMultiple) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorImpl.java index 71603f4..318130e 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorImpl.java @@ -16,30 +16,18 @@ */ package com.gemstone.gemfire.internal.offheap; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.cache.CacheClosedException; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionService; -import com.gemstone.gemfire.internal.cache.BucketRegion; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.PartitionedRegion; -import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore; -import com.gemstone.gemfire.internal.cache.RegionEntry; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.cache.*; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier; import com.gemstone.gemfire.internal.offheap.annotations.Unretained; +import org.apache.logging.log4j.Logger; + +import java.util.*; +import java.util.concurrent.atomic.AtomicBoolean; /** * This allocator is somewhat like an Arena allocator. @@ -55,8 +43,8 @@ import com.gemstone.gemfire.internal.offheap.annotations.Unretained; public class MemoryAllocatorImpl implements MemoryAllocator { static final Logger logger = LogService.getLogger(); - - public static final String FREE_OFF_HEAP_MEMORY_PROPERTY = "gemfire.free-off-heap-memory"; + + public static final String FREE_OFF_HEAP_MEMORY_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "free-off-heap-memory"; private volatile OffHeapMemoryStats stats; @@ -82,7 +70,7 @@ public class MemoryAllocatorImpl implements MemoryAllocator { return result; } - private static final boolean DO_EXPENSIVE_VALIDATION = Boolean.getBoolean("gemfire.OFF_HEAP_DO_EXPENSIVE_VALIDATION"); + private static final boolean DO_EXPENSIVE_VALIDATION = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "OFF_HEAP_DO_EXPENSIVE_VALIDATION"); public static MemoryAllocator create(OutOfOffHeapMemoryListener ooohml, OffHeapMemoryStats stats, int slabCount, long offHeapMemorySize, long maxSlabSize) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapStorage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapStorage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapStorage.java index 2f2bf1a..47f25b0 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapStorage.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapStorage.java @@ -16,15 +16,10 @@ */ package com.gemstone.gemfire.internal.offheap; -import java.lang.reflect.Method; - -import com.gemstone.gemfire.StatisticDescriptor; -import com.gemstone.gemfire.Statistics; -import com.gemstone.gemfire.StatisticsFactory; -import com.gemstone.gemfire.StatisticsType; -import com.gemstone.gemfire.StatisticsTypeFactory; +import com.gemstone.gemfire.*; import com.gemstone.gemfire.cache.CacheException; import com.gemstone.gemfire.distributed.DistributedSystem; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionStats; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.distributed.internal.InternalLocator; @@ -32,13 +27,15 @@ import com.gemstone.gemfire.internal.ClassPathLoader; import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import java.lang.reflect.Method; + /** * Enables off-heap storage by creating a MemoryAllocator. * * @since Geode 1.0 */ public class OffHeapStorage implements OffHeapMemoryStats { - public static final String STAY_CONNECTED_ON_OUTOFOFFHEAPMEMORY_PROPERTY = "gemfire.offheap.stayConnectedOnOutOfOffHeapMemory"; + public static final String STAY_CONNECTED_ON_OUTOFOFFHEAPMEMORY_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "offheap.stayConnectedOnOutOfOffHeapMemory"; // statistics type private static final StatisticsType statsType; @@ -125,7 +122,7 @@ public class OffHeapStorage implements OffHeapMemoryStats { } public static long calcMaxSlabSize(long offHeapMemorySize) { - final String offHeapSlabConfig = System.getProperty("gemfire.OFF_HEAP_SLAB_SIZE"); + final String offHeapSlabConfig = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "OFF_HEAP_SLAB_SIZE"); long result = 0; if (offHeapSlabConfig != null && !offHeapSlabConfig.equals("")) { result = parseLongWithUnits(offHeapSlabConfig, MAX_SLAB_SIZE, 1024*1024); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/ReferenceCountHelper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/ReferenceCountHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/ReferenceCountHelper.java index 563ba4d..283a0cf 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/ReferenceCountHelper.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/ReferenceCountHelper.java @@ -17,6 +17,8 @@ package com.gemstone.gemfire.internal.offheap; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; + import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -27,9 +29,9 @@ import java.util.concurrent.atomic.AtomicInteger; * To enable free operation tracking set: -Dgemfire.trackOffHeapFreedRefCounts=true. */ public class ReferenceCountHelper { - - public static final String TRACK_OFFHEAP_REFERENCES = "gemfire.trackOffHeapRefCounts"; - public static final String TRACK_OFFHEAP_FREES = "gemfire.trackOffHeapFreedRefCounts"; + + public static final String TRACK_OFFHEAP_REFERENCES = DistributionConfig.GEMFIRE_PREFIX + "trackOffHeapRefCounts"; + public static final String TRACK_OFFHEAP_FREES = DistributionConfig.GEMFIRE_PREFIX + "trackOffHeapFreedRefCounts"; private static final ReferenceCountHelperImpl inst = new ReferenceCountHelperImpl(Boolean.getBoolean(TRACK_OFFHEAP_REFERENCES), Boolean.getBoolean(TRACK_OFFHEAP_FREES)); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileProcessController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileProcessController.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileProcessController.java index 84440e2..6b4108c 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileProcessController.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileProcessController.java @@ -16,6 +16,13 @@ */ package com.gemstone.gemfire.internal.process; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import com.gemstone.gemfire.internal.logging.LogService; +import com.gemstone.gemfire.internal.process.ControlFileWatchdog.ControlRequestHandler; +import com.gemstone.gemfire.lang.AttachAPINotFoundException; +import org.apache.logging.log4j.Logger; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -24,13 +31,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; -import org.apache.logging.log4j.Logger; - -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.process.ControlFileWatchdog.ControlRequestHandler; -import com.gemstone.gemfire.lang.AttachAPINotFoundException; - /** * Controls a {@link ControllableProcess} using files to communicate between * processes. @@ -40,7 +40,7 @@ import com.gemstone.gemfire.lang.AttachAPINotFoundException; public class FileProcessController implements ProcessController { private static final Logger logger = LogService.getLogger(); - public static final String STATUS_TIMEOUT_PROPERTY = "gemfire.FileProcessController.STATUS_TIMEOUT"; + public static final String STATUS_TIMEOUT_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "FileProcessController.STATUS_TIMEOUT"; private final long statusTimeoutMillis; private final FileControllerParameters arguments; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessLauncher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessLauncher.java index b7cd708..e6d614a 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessLauncher.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessLauncher.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.internal.process; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; + import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -36,7 +38,7 @@ import java.io.IOException; */ public final class LocalProcessLauncher { - public static final String PROPERTY_IGNORE_IS_PID_ALIVE = "gemfire.test.LocalProcessLauncher.ignoreIsPidAlive"; + public static final String PROPERTY_IGNORE_IS_PID_ALIVE = DistributionConfig.GEMFIRE_PREFIX + "test.LocalProcessLauncher.ignoreIsPidAlive"; private final int pid; private final File pidFile; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerFactory.java index 693c676..6625cc0 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerFactory.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerFactory.java @@ -16,18 +16,13 @@ */ package com.gemstone.gemfire.internal.process; -import java.io.BufferedReader; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; + import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.FilenameFilter; import java.io.IOException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import com.gemstone.gemfire.internal.util.IOUtils; -import com.gemstone.gemfire.internal.util.StopWatch; - /** * Manages which implementation of {@link ProcessController} will be used and * constructs the instance. @@ -36,7 +31,7 @@ import com.gemstone.gemfire.internal.util.StopWatch; */ public final class ProcessControllerFactory { - public static final String PROPERTY_DISABLE_ATTACH_API = "gemfire.test.ProcessControllerFactory.DisableAttachApi"; + public static final String PROPERTY_DISABLE_ATTACH_API = DistributionConfig.GEMFIRE_PREFIX + "test.ProcessControllerFactory.DisableAttachApi"; private final boolean disableAttachApi; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessLauncherContext.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessLauncherContext.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessLauncherContext.java index 336207c..30e0fa8 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessLauncherContext.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessLauncherContext.java @@ -17,16 +17,13 @@ package com.gemstone.gemfire.internal.process; -import java.io.BufferedOutputStream; -import java.io.FileDescriptor; -import java.io.FileOutputStream; -import java.io.OutputStream; -import java.io.PrintStream; -import java.util.Properties; - +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.io.TeeOutputStream; import com.gemstone.gemfire.internal.io.TeePrintStream; +import java.io.*; +import java.util.Properties; + /** * Thread based context for launching a process. GemFire internals can acquire * optional configuration details from a process launcher via this context. @@ -35,7 +32,7 @@ import com.gemstone.gemfire.internal.io.TeePrintStream; */ public final class ProcessLauncherContext { - public static final String OVERRIDDEN_DEFAULTS_PREFIX = "gemfire.default."; + public static final String OVERRIDDEN_DEFAULTS_PREFIX = DistributionConfig.GEMFIRE_PREFIX + "default."; /** * Default value for {@link #isRedirectingOutput()} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessType.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessType.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessType.java index 17e5dd5..ea79c93 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessType.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessType.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.internal.process; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; + /** * Enumeration of GemFire {@link ControllableProcess} types and the file names * associated with controlling its lifecycle. @@ -26,7 +28,7 @@ public enum ProcessType { LOCATOR ("LOCATOR", "vf.gf.locator"), SERVER ("SERVER", "vf.gf.server"); - public static final String TEST_PREFIX_PROPERTY = "gemfire.test.ProcessType.TEST_PREFIX"; + public static final String TEST_PREFIX_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "test.ProcessType.TEST_PREFIX"; private static final String SUFFIX_PID = "pid"; private static final String SUFFIX_STOP_REQUEST = "stop.cmd"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java index f8da7a8..892bff8 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java @@ -17,11 +17,6 @@ package com.gemstone.gemfire.internal.security; -import java.security.AccessController; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.Callable; - import com.gemstone.gemfire.cache.operations.OperationContext; import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode; import com.gemstone.gemfire.cache.operations.OperationContext.Resource; @@ -34,7 +29,6 @@ import com.gemstone.gemfire.management.internal.security.ResourceOperationContex import com.gemstone.gemfire.security.AuthenticationFailedException; import com.gemstone.gemfire.security.GemFireSecurityException; import com.gemstone.gemfire.security.NotAuthorizedException; - import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.Logger; import org.apache.shiro.SecurityUtils; @@ -49,6 +43,11 @@ import org.apache.shiro.realm.Realm; import org.apache.shiro.subject.Subject; import org.apache.shiro.util.ThreadContext; +import java.security.AccessController; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.Callable; + public class GeodeSecurityUtil { private static Logger logger = LogService.getLogger(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java index cb2b66b..4a29dd3 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java @@ -16,19 +16,6 @@ */ package com.gemstone.gemfire.internal.security.shiro; -import static com.gemstone.gemfire.management.internal.security.ResourceConstants.*; - -import java.lang.reflect.Method; -import java.security.AccessControlContext; -import java.security.AccessController; -import java.security.Principal; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import javax.management.remote.JMXPrincipal; -import javax.security.auth.Subject; - import com.gemstone.gemfire.cache.operations.OperationContext; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.ClassLoadUtil; @@ -37,19 +24,27 @@ import com.gemstone.gemfire.internal.lang.StringUtils; import com.gemstone.gemfire.management.internal.security.ResourceConstants; import com.gemstone.gemfire.security.AccessControl; import com.gemstone.gemfire.security.Authenticator; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.shiro.authc.AuthenticationException; -import org.apache.shiro.authc.AuthenticationInfo; -import org.apache.shiro.authc.AuthenticationToken; -import org.apache.shiro.authc.SimpleAuthenticationInfo; -import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.authc.*; import org.apache.shiro.authz.AuthorizationInfo; import org.apache.shiro.authz.Permission; import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.subject.PrincipalCollection; +import javax.management.remote.JMXPrincipal; +import javax.security.auth.Subject; +import java.lang.reflect.Method; +import java.security.AccessControlContext; +import java.security.AccessController; +import java.security.Principal; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +import static com.gemstone.gemfire.management.internal.security.ResourceConstants.ACCESS_DENIED_MESSAGE; + public class CustomAuthRealm extends AuthorizingRealm{ public static final String REALM_NAME = "CUSTOMAUTHREALM"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/sequencelog/EntryLogger.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/sequencelog/EntryLogger.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/sequencelog/EntryLogger.java index e025c7d..e3475ef 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/sequencelog/EntryLogger.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/sequencelog/EntryLogger.java @@ -16,15 +16,10 @@ */ package com.gemstone.gemfire.internal.sequencelog; -import java.util.UUID; - +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.internal.cache.CachedDeserializable; +import com.gemstone.gemfire.internal.cache.*; import com.gemstone.gemfire.internal.cache.DiskEntry.RecoveredEntry; -import com.gemstone.gemfire.internal.cache.EntryEventImpl; -import com.gemstone.gemfire.internal.cache.LocalRegion; -import com.gemstone.gemfire.internal.cache.PlaceHolderDiskRegion; -import com.gemstone.gemfire.internal.cache.Token; import com.gemstone.gemfire.internal.cache.persistence.DiskStoreID; import com.gemstone.gemfire.internal.offheap.StoredObject; import com.gemstone.gemfire.internal.offheap.annotations.Unretained; @@ -41,8 +36,8 @@ public class EntryLogger { private static final SequenceLogger GRAPH_LOGGER = SequenceLoggerImpl.getInstance(); private static ThreadLocal<String> SOURCE = new ThreadLocal<String>(); private static ThreadLocal<String> SOURCE_TYPE = new ThreadLocal<String>(); - - public static final String TRACK_VALUES_PROPERTY = "gemfire.EntryLogger.TRACK_VALUES"; + + public static final String TRACK_VALUES_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "EntryLogger.TRACK_VALUES"; private static final boolean TRACK_VALUES = Boolean.getBoolean(TRACK_VALUES_PROPERTY); public static void clearSource() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/sequencelog/SequenceLoggerImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/sequencelog/SequenceLoggerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/sequencelog/SequenceLoggerImpl.java index 678bc11..8353e8e 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/sequencelog/SequenceLoggerImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/sequencelog/SequenceLoggerImpl.java @@ -16,25 +16,25 @@ */ package com.gemstone.gemfire.internal.sequencelog; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.OSProcess; +import com.gemstone.gemfire.internal.sequencelog.io.OutputStreamAppender; + import java.io.File; import java.io.FileNotFoundException; import java.util.EnumSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; -import com.gemstone.gemfire.internal.OSProcess; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.sequencelog.io.OutputStreamAppender; - /** * */ public class SequenceLoggerImpl implements SequenceLogger { private static final SequenceLoggerImpl INSTANCE; - - public static final String ENABLED_TYPES_PROPERTY = "gemfire.SequenceLoggerImpl.ENABLED_TYPES"; - + + public static final String ENABLED_TYPES_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "GraphLoggerImpl.ENABLED_TYPES"; + private final EnumSet<GraphType> enabledTypes; static { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/size/ObjectGraphSizer.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/size/ObjectGraphSizer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/size/ObjectGraphSizer.java index a058015..0bbe279 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/size/ObjectGraphSizer.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/size/ObjectGraphSizer.java @@ -16,6 +16,10 @@ */ package com.gemstone.gemfire.internal.size; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.ClassPathLoader; +import com.gemstone.gemfire.internal.size.ObjectTraverser.Visitor; + import java.lang.ref.SoftReference; import java.lang.ref.WeakReference; import java.util.HashMap; @@ -23,12 +27,10 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import com.gemstone.gemfire.internal.ClassPathLoader; -import com.gemstone.gemfire.internal.size.ObjectTraverser.Visitor; - public class ObjectGraphSizer { - private static final String SIZE_OF_CLASS_NAME = System.getProperty("gemfire.ObjectSizer.SIZE_OF_CLASS", ReflectionSingleObjectSizer.class.getName()); + private static final String SIZE_OF_CLASS_NAME = System + .getProperty(DistributionConfig.GEMFIRE_PREFIX + "ObjectSizer.SIZE_OF_CLASS", ReflectionSingleObjectSizer.class.getName()); static final SingleObjectSizer SIZE_OF_UTIL; private static ObjectFilter NULL_FILTER = new ObjectFilter() { @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandler.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandler.java index 659d4b2..5c5154a 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandler.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandler.java @@ -16,25 +16,25 @@ */ package com.gemstone.gemfire.internal.statistics; +import com.gemstone.gemfire.SystemFailure; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.internal.logging.LogService; +import com.gemstone.gemfire.internal.logging.log4j.LogMarker; +import org.apache.logging.log4j.Logger; + import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.SynchronousQueue; -import org.apache.logging.log4j.Logger; - -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.log4j.LogMarker; - /** * @since GemFire 7.0 */ public class StatMonitorHandler implements SampleHandler { private static final Logger logger = LogService.getLogger(); - - static final String ENABLE_MONITOR_THREAD = "gemfire.stats.enableMonitorThread"; + + static final String ENABLE_MONITOR_THREAD = DistributionConfig.GEMFIRE_PREFIX + "stats.enableMonitorThread"; static final boolean enableMonitorThread = Boolean.getBoolean(ENABLE_MONITOR_THREAD); /** The registered monitors */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/VMStats50.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/VMStats50.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/VMStats50.java index d611326..53d8f0e 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/VMStats50.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/VMStats50.java @@ -16,33 +16,16 @@ */ package com.gemstone.gemfire.internal.stats50; -import java.lang.management.ClassLoadingMXBean; -import java.lang.management.GarbageCollectorMXBean; -import java.lang.management.ManagementFactory; -import java.lang.management.MemoryMXBean; -import java.lang.management.MemoryPoolMXBean; -import java.lang.management.MemoryUsage; -import java.lang.management.OperatingSystemMXBean; -import java.lang.management.ThreadInfo; -import java.lang.management.ThreadMXBean; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import com.gemstone.gemfire.StatisticDescriptor; -import com.gemstone.gemfire.Statistics; -import com.gemstone.gemfire.StatisticsFactory; -import com.gemstone.gemfire.StatisticsType; -import com.gemstone.gemfire.StatisticsTypeFactory; -import com.gemstone.gemfire.SystemFailure; +import com.gemstone.gemfire.*; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.ClassPathLoader; import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl; import com.gemstone.gemfire.internal.VMStatsContract; +import java.lang.management.*; +import java.lang.reflect.Method; +import java.util.*; + /** * Statistics related to a Java VM. * This version is hardcoded to use 1.5 MXBean stats from java.lang.management. @@ -109,7 +92,7 @@ public class VMStats50 implements VMStatsContract { private long threadStartCount = 0; private long[] allThreadIds = null; - private final static boolean THREAD_STATS_ENABLED = Boolean.getBoolean("gemfire.enableThreadStats"); + private final static boolean THREAD_STATS_ENABLED = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "enableThreadStats"); private final Map<Long,ThreadStatInfo> threadMap = THREAD_STATS_ENABLED ? new HashMap<Long,ThreadStatInfo>() : null; private final static StatisticsType threadType; private final static int thread_blockedId; @@ -175,14 +158,14 @@ public class VMStats50 implements VMStatsContract { if (THREAD_STATS_ENABLED) { if (threadBean.isThreadCpuTimeSupported()) { if (!threadBean.isThreadCpuTimeEnabled()) { - if (Boolean.getBoolean("gemfire.enableCpuTime")) { + if (Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "enableCpuTime")) { threadBean.setThreadCpuTimeEnabled(true); } } } if (threadBean.isThreadContentionMonitoringSupported()) { if (!threadBean.isThreadContentionMonitoringEnabled()) { - if (Boolean.getBoolean("gemfire.enableContentionTime")) { + if (Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "enableContentionTime")) { threadBean.setThreadContentionMonitoringEnabled(true); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java index ed20f21..d19c59f 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java @@ -16,67 +16,18 @@ */ package com.gemstone.gemfire.internal.tcp; -import java.io.BufferedInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InterruptedIOException; -import java.io.OutputStream; -import java.net.ConnectException; -import java.net.Inet6Address; -import java.net.InetSocketAddress; -import java.net.Socket; -import java.net.SocketException; -import java.net.SocketTimeoutException; -import java.nio.ByteBuffer; -import java.nio.channels.CancelledKeyException; -import java.nio.channels.ClosedChannelException; -import java.nio.channels.ClosedSelectorException; -import java.nio.channels.SocketChannel; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Semaphore; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicLong; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelException; import com.gemstone.gemfire.SystemFailure; import com.gemstone.gemfire.cache.CacheClosedException; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; -import com.gemstone.gemfire.distributed.internal.ConflationKey; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DMStats; -import com.gemstone.gemfire.distributed.internal.DirectReplyProcessor; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.distributed.internal.DistributionStats; -import com.gemstone.gemfire.distributed.internal.ReplyException; -import com.gemstone.gemfire.distributed.internal.ReplyMessage; -import com.gemstone.gemfire.distributed.internal.ReplyProcessor21; -import com.gemstone.gemfire.distributed.internal.ReplySender; +import com.gemstone.gemfire.distributed.internal.*; import com.gemstone.gemfire.distributed.internal.direct.DirectChannel; import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; import com.gemstone.gemfire.i18n.StringId; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.ByteArrayDataInput; -import com.gemstone.gemfire.internal.DSFIDFactory; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.SocketCreator; -import com.gemstone.gemfire.internal.SystemTimer; +import com.gemstone.gemfire.internal.*; import com.gemstone.gemfire.internal.SystemTimer.SystemTimerTask; -import com.gemstone.gemfire.internal.Version; import com.gemstone.gemfire.internal.i18n.LocalizedStrings; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; @@ -84,6 +35,19 @@ import com.gemstone.gemfire.internal.logging.log4j.AlertAppender; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.tcp.MsgReader.Header; import com.gemstone.gemfire.internal.util.concurrent.ReentrantSemaphore; +import org.apache.logging.log4j.Logger; + +import java.io.*; +import java.net.*; +import java.nio.ByteBuffer; +import java.nio.channels.CancelledKeyException; +import java.nio.channels.ClosedChannelException; +import java.nio.channels.ClosedSelectorException; +import java.nio.channels.SocketChannel; +import java.util.*; +import java.util.concurrent.Semaphore; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicLong; /** <p>Connection is a socket holder that sends and receives serialized message objects. A Connection may be closed to preserve system @@ -116,7 +80,7 @@ public class Connection implements Runnable { * Small buffer used for send socket buffer on receiver connections * and receive buffer on sender connections. */ - public final static int SMALL_BUFFER_SIZE = Integer.getInteger("gemfire.SMALL_BUFFER_SIZE",4096).intValue(); + public final static int SMALL_BUFFER_SIZE = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "SMALL_BUFFER_SIZE", 4096).intValue(); /** counter to give connections a unique id */ private static AtomicLong idCounter = new AtomicLong(1); @@ -1002,7 +966,7 @@ public class Connection implements Runnable { /** time between connection attempts*/ private static final int RECONNECT_WAIT_TIME - = Integer.getInteger("gemfire.RECONNECT_WAIT_TIME", 2000).intValue(); + = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "RECONNECT_WAIT_TIME", 2000).intValue(); /** creates a new connection to a remote server. * We are initiating this connection; the other side must accept us http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamer.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamer.java index 7a2b356..1aeecda 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamer.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamer.java @@ -16,9 +16,17 @@ */ package com.gemstone.gemfire.internal.tcp; +import com.gemstone.gemfire.DataSerializer; +import com.gemstone.gemfire.distributed.internal.DMStats; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import com.gemstone.gemfire.distributed.internal.DistributionMessage; +import com.gemstone.gemfire.internal.*; +import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import com.gemstone.gemfire.internal.logging.LogService; import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectIterator; +import org.apache.logging.log4j.Logger; import java.io.IOException; import java.io.OutputStream; @@ -28,20 +36,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.logging.log4j.Logger; - -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.internal.DMStats; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.ByteBufferWriter; -import com.gemstone.gemfire.internal.HeapDataOutputStream; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.ObjToByteArraySerializer; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LogService; - /** <p>MsgStreamer supports streaming a message to a tcp Connection * in chunks. This allows us to send a message without needing to * perserialize it completely in memory thus saving buffer memory. @@ -752,7 +746,7 @@ public class MsgStreamer extends OutputStream implements * Use -Dgemfire.ASCII_STRINGS=true if all String instances contain * ASCII characters. Setting this to true gives a performance improvement. */ - private static final boolean ASCII_STRINGS = Boolean.getBoolean("gemfire.ASCII_STRINGS"); + private static final boolean ASCII_STRINGS = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "ASCII_STRINGS"); /** * Writes two bytes of length information
