http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java index ac4c24f..ed570c1 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java @@ -16,42 +16,12 @@ */ package com.gemstone.gemfire.internal.tcp; -import java.io.IOException; -import java.net.Inet6Address; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.ServerSocket; -import java.net.Socket; -import java.net.SocketException; -import java.nio.channels.ClosedByInterruptException; -import java.nio.channels.ClosedChannelException; -import java.nio.channels.ServerSocketChannel; -import java.nio.channels.SocketChannel; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.RejectedExecutionHandler; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - -import javax.net.ssl.SSLException; - -import org.apache.logging.log4j.Logger; - import com.gemstone.gemfire.CancelCriterion; import com.gemstone.gemfire.CancelException; import com.gemstone.gemfire.SystemFailure; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; -import com.gemstone.gemfire.distributed.internal.DM; -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.distributed.internal.LonerDistributionManager; +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; @@ -62,6 +32,18 @@ import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; import com.gemstone.gemfire.internal.logging.log4j.AlertAppender; import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; import com.gemstone.gemfire.internal.logging.log4j.LogMarker; +import org.apache.logging.log4j.Logger; + +import javax.net.ssl.SSLException; +import java.io.IOException; +import java.net.*; +import java.nio.channels.ClosedByInterruptException; +import java.nio.channels.ClosedChannelException; +import java.nio.channels.ServerSocketChannel; +import java.nio.channels.SocketChannel; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.*; /** <p>TCPConduit manages a server socket and a collection of connections to other systems. Connections are identified by DistributedMember IDs.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Breadcrumbs.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Breadcrumbs.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Breadcrumbs.java index 19128aa..d2371d6 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Breadcrumbs.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Breadcrumbs.java @@ -16,8 +16,8 @@ */ package com.gemstone.gemfire.internal.util; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.i18n.StringId; -import com.gemstone.gemfire.internal.cache.EntryEventImpl; import com.gemstone.gemfire.internal.cache.EventID; /** @@ -29,9 +29,9 @@ import com.gemstone.gemfire.internal.cache.EventID; */ public class Breadcrumbs { - private static ThreadLocal<EventID> EventIDs = new ThreadLocal<EventID>(); - - public static boolean ENABLED = Boolean.getBoolean("gemfire.enable-breadcrumbs"); + private static ThreadLocal<EventID> EventIDs = new ThreadLocal<EventID>(); + + public static boolean ENABLED = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "enable-breadcrumbs"); /** delimiter for crumb numbers */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/util/JavaCommandBuilder.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/JavaCommandBuilder.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/JavaCommandBuilder.java index 233ab83..d6ff609 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/JavaCommandBuilder.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/JavaCommandBuilder.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.internal.util; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; + import java.io.File; import java.util.ArrayList; import java.util.List; @@ -81,7 +83,7 @@ public class JavaCommandBuilder { private static String getDashServerArg(final File javaBinDir) { // the gemfire.vmarg.dashserver property allows customers to add a custom argument in place of -server - final String altDashServerArg = System.getProperty("gemfire.vmarg.dashserver", null); + final String altDashServerArg = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "vmarg.dashserver", null); return (altDashServerArg != null ? altDashServerArg : (omitDashServerArg(javaBinDir) ? null : "-server")); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/StoppableCountDownLatch.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/StoppableCountDownLatch.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/StoppableCountDownLatch.java index 36506fb..35376c0 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/StoppableCountDownLatch.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/StoppableCountDownLatch.java @@ -16,12 +16,13 @@ */ package com.gemstone.gemfire.internal.util.concurrent; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - import com.gemstone.gemfire.CancelCriterion; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.Assert; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + /** * This class is a "stoppable" cover for {@link CountDownLatch}. */ @@ -30,7 +31,7 @@ public class StoppableCountDownLatch { /** * This is how often waiters will wake up to check for cancellation */ - static final long RETRY_TIME = Long.getLong("gemfire.stoppable-retry-interval", 2000).longValue(); + static final long RETRY_TIME = Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "stoppable-retry-interval", 2000).longValue(); /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationType.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationType.java b/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationType.java index 28984e0..4726583 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationType.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationType.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.management; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; + /** * Enumerated type for JMX notification types emitted by GemFire management * system. This types can be matched with @@ -33,7 +35,7 @@ public interface JMXNotificationType { * The value of this type string is * <CODE>gemfire.distributedsystem.cache.region.created</CODE>. */ - public static final String REGION_CREATED = "gemfire.distributedsystem.cache.region.created"; + public static final String REGION_CREATED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.region.created"; /** * Notification type which indicates that a region has been closed/destroyed @@ -41,35 +43,35 @@ public interface JMXNotificationType { * The value of this type string is * <CODE>gemfire.distributedsystem.cache.region.closed</CODE>. */ - public static final String REGION_CLOSED = "gemfire.distributedsystem.cache.region.closed"; + public static final String REGION_CLOSED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.region.closed"; /** * Notification type which indicates that a disk store has been created <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.cache.disk.created</CODE>. */ - public static final String DISK_STORE_CREATED = "gemfire.distributedsystem.cache.disk.created"; + public static final String DISK_STORE_CREATED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.disk.created"; /** * Notification type which indicates that a disk store has been closed. <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.cache.disk.closed</CODE>. */ - public static final String DISK_STORE_CLOSED = "gemfire.distributedsystem.cache.disk.closed"; + public static final String DISK_STORE_CLOSED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.disk.closed"; /** * Notification type which indicates that a lock service has been created. <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.cache.lockservice.created</CODE>. */ - public static final String LOCK_SERVICE_CREATED = "gemfire.distributedsystem.cache.lockservice.created"; + public static final String LOCK_SERVICE_CREATED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.lockservice.created"; /** * Notification type which indicates that a lock service has been closed. <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.cache.lockservice.closed</CODE>. */ - public static final String LOCK_SERVICE_CLOSED = "gemfire.distributedsystem.cache.lockservice.closed"; + public static final String LOCK_SERVICE_CLOSED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.lockservice.closed"; /** * Notification type which indicates that a member has been added to the @@ -77,7 +79,7 @@ public interface JMXNotificationType { * The value of this type string is * <CODE>gemfire.distributedsystem.cache.created</CODE>. */ - public static final String CACHE_MEMBER_JOINED = "gemfire.distributedsystem.cache.member.joined"; + public static final String CACHE_MEMBER_JOINED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.member.joined"; /** * Notification type which indicates that a member has departed from the @@ -85,84 +87,84 @@ public interface JMXNotificationType { * The value of this type string is * <CODE>gemfire.distributedsystem.cache.created</CODE>. */ - public static final String CACHE_MEMBER_DEPARTED = "gemfire.distributedsystem.cache.member.departed"; + public static final String CACHE_MEMBER_DEPARTED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.member.departed"; /** * Notification type which indicates that a member is suspected. <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.cache.created</CODE>. */ - public static final String CACHE_MEMBER_SUSPECT = "gemfire.distributedsystem.cache.member.suspect"; + public static final String CACHE_MEMBER_SUSPECT = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.member.suspect"; /** * Notification type which indicates that a client has joined <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.cacheserver.client.joined</CODE>. */ - public static final String CLIENT_JOINED = "gemfire.distributedsystem.cacheserver.client.joined"; + public static final String CLIENT_JOINED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cacheserver.client.joined"; /** * Notification type which indicates that a client has left <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.cacheserver.client.left</CODE>. */ - public static final String CLIENT_LEFT = "gemfire.distributedsystem.cacheserver.client.left"; + public static final String CLIENT_LEFT = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cacheserver.client.left"; /** * Notification type which indicates that a client has crashed <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.cacheserver.client.crashed</CODE>. */ - public static final String CLIENT_CRASHED = "gemfire.distributedsystem.cacheserver.client.crashed"; + public static final String CLIENT_CRASHED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cacheserver.client.crashed"; /** * Notification type which indicates that a gateway receiver is created <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.gateway.receiver.created</CODE>. */ - public static final String GATEWAY_RECEIVER_CREATED = "gemfire.distributedsystem.gateway.receiver.created"; + public static final String GATEWAY_RECEIVER_CREATED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.gateway.receiver.created"; /** * Notification type which indicates that a gateway sender is created <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.gateway.sender.created</CODE>. */ - public static final String GATEWAY_SENDER_CREATED = "gemfire.distributedsystem.gateway.sender.created"; + public static final String GATEWAY_SENDER_CREATED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.gateway.sender.created"; /** * Notification type which indicates that a gateway sender is started <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.gateway.sender.started</CODE>. */ - public static final String GATEWAY_SENDER_STARTED = "gemfire.distributedsystem.gateway.sender.started"; + public static final String GATEWAY_SENDER_STARTED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.gateway.sender.started"; /** * Notification type which indicates that a gateway sender is stopped <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.gateway.sender.stopped</CODE>. */ - public static final String GATEWAY_SENDER_STOPPED = "gemfire.distributedsystem.gateway.sender.stopped"; + public static final String GATEWAY_SENDER_STOPPED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.gateway.sender.stopped"; /** * Notification type which indicates that a gateway sender is paused <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.gateway.sender.paused</CODE>. */ - public static final String GATEWAY_SENDER_PAUSED = "gemfire.distributedsystem.gateway.sender.paused"; + public static final String GATEWAY_SENDER_PAUSED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.gateway.sender.paused"; /** * Notification type which indicates that a gateway sender is resumed <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.gateway.sender.resumed</CODE>. */ - public static final String GATEWAY_SENDER_RESUMED = "gemfire.distributedsystem.gateway.sender.resumed"; + public static final String GATEWAY_SENDER_RESUMED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.gateway.sender.resumed"; /** * Notification type which indicates that an async queue is created <BR> * The value of this type string is * <CODE>ggemfire.distributedsystem.asycn.event.queue.created</CODE>. */ - public static final String ASYNC_EVENT_QUEUE_CREATED = "gemfire.distributedsystem.asycn.event.queue.created"; + public static final String ASYNC_EVENT_QUEUE_CREATED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.asycn.event.queue.created"; /** * Notification type which indicates a GemFire system generated alert <BR> @@ -175,33 +177,33 @@ public interface JMXNotificationType { * The value of this type string is * <CODE>gemfire.distributedsystem.cache.server.started</CODE>. */ - public static final String CACHE_SERVER_STARTED = "gemfire.distributedsystem.cache.server.started"; + public static final String CACHE_SERVER_STARTED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.server.started"; /** * Notification type which indicates that cache server is stopped <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.cache.server.stopped</CODE>. */ - public static final String CACHE_SERVER_STOPPED = "gemfire.distributedsystem.cache.server.stopped"; + public static final String CACHE_SERVER_STOPPED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.server.stopped"; /** * Notification type which indicates that a gateway receiver is started <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.gateway.receiver.started</CODE>. */ - public static final String GATEWAY_RECEIVER_STARTED = "gemfire.distributedsystem.gateway.receiver.started"; + public static final String GATEWAY_RECEIVER_STARTED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.gateway.receiver.started"; /** * Notification type which indicates that a gateway receiver is stopped <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.gateway.receiver.stopped</CODE>. */ - public static final String GATEWAY_RECEIVER_STOPPED = "gemfire.distributedsystem.gateway.receiver.stopped"; + public static final String GATEWAY_RECEIVER_STOPPED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.gateway.receiver.stopped"; /** * Notification type which indicates that locator is started <BR> * The value of this type string is * <CODE>gemfire.distributedsystem.locator.started</CODE>. */ - public static final String LOCATOR_STARTED = "gemfire.distributedsystem.locator.started"; + public static final String LOCATOR_STARTED = DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.locator.started"; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java index 8ce84ad..59c398e 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/AgentUtil.java @@ -17,13 +17,13 @@ package com.gemstone.gemfire.management.internal; -import java.io.File; -import java.net.URL; - -import org.apache.logging.log4j.Logger; - +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.lang.StringUtils; import com.gemstone.gemfire.internal.logging.LogService; +import org.apache.logging.log4j.Logger; + +import java.io.File; +import java.net.URL; /** * Hosts common utility methods needed by the management package @@ -116,7 +116,7 @@ public class AgentUtil { // Check for empty variable. if empty, then log message and exit HTTP server // startup if (StringUtils.isBlank(gemFireHome)) { - gemFireHome = System.getProperty("gemfire.home"); + gemFireHome = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "home"); logger.info("Reading gemfire.home System Property -> {}", gemFireHome); if (StringUtils.isBlank(gemFireHome)) { logger.info("GEMFIRE environment variable not set; HTTP service will not start."); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisee.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisee.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisee.java index c82ce06..3af34e1 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisee.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisee.java @@ -16,20 +16,16 @@ */ package com.gemstone.gemfire.management.internal; -import java.net.UnknownHostException; - import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DistributionAdvisee; -import com.gemstone.gemfire.distributed.internal.DistributionAdvisor; +import com.gemstone.gemfire.distributed.internal.*; import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.Profile; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.SocketCreator; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.management.ManagementService; import com.gemstone.gemfire.management.internal.JmxManagerAdvisor.JmxManagerProfile; +import java.net.UnknownHostException; + /** * * @since GemFire 7.0 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java index 2d95993..9807456 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java @@ -16,34 +16,6 @@ */ package com.gemstone.gemfire.management.internal; -import java.io.IOException; -import java.io.Serializable; -import java.lang.management.ManagementFactory; -import java.net.InetAddress; -import java.net.ServerSocket; -import java.net.Socket; -import java.net.UnknownHostException; -import java.rmi.AlreadyBoundException; -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; -import java.rmi.server.RMIClientSocketFactory; -import java.rmi.server.RMIServerSocketFactory; -import java.rmi.server.UnicastRemoteObject; -import java.util.HashMap; -import java.util.Set; -import javax.management.InstanceAlreadyExistsException; -import javax.management.MBeanRegistrationException; -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.NotCompliantMBeanException; -import javax.management.ObjectName; -import javax.management.remote.JMXConnectorServer; -import javax.management.remote.JMXServiceURL; -import javax.management.remote.rmi.RMIConnectorServer; -import javax.management.remote.rmi.RMIJRMPServerImpl; -import javax.management.remote.rmi.RMIServerImpl; -import javax.rmi.ssl.SslRMIClientSocketFactory; - import com.gemstone.gemfire.GemFireConfigException; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.distributed.internal.DistributionConfig; @@ -53,6 +25,7 @@ import com.gemstone.gemfire.internal.SocketCreator; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.lang.StringUtils; import com.gemstone.gemfire.internal.logging.LogService; +import com.gemstone.gemfire.internal.security.shiro.JMXShiroAuthenticator; import com.gemstone.gemfire.internal.tcp.TCPConduit; import com.gemstone.gemfire.management.ManagementException; import com.gemstone.gemfire.management.ManagementService; @@ -61,12 +34,33 @@ import com.gemstone.gemfire.management.internal.security.AccessControlMBean; import com.gemstone.gemfire.management.internal.security.MBeanServerWrapper; import com.gemstone.gemfire.management.internal.security.ResourceConstants; import com.gemstone.gemfire.management.internal.unsafe.ReadOpFileAccessController; -import com.gemstone.gemfire.internal.security.shiro.JMXShiroAuthenticator; - import org.apache.logging.log4j.Logger; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; +import javax.management.*; +import javax.management.remote.JMXConnectorServer; +import javax.management.remote.JMXServiceURL; +import javax.management.remote.rmi.RMIConnectorServer; +import javax.management.remote.rmi.RMIJRMPServerImpl; +import javax.management.remote.rmi.RMIServerImpl; +import javax.rmi.ssl.SslRMIClientSocketFactory; +import java.io.IOException; +import java.io.Serializable; +import java.lang.management.ManagementFactory; +import java.net.InetAddress; +import java.net.ServerSocket; +import java.net.Socket; +import java.net.UnknownHostException; +import java.rmi.AlreadyBoundException; +import java.rmi.registry.LocateRegistry; +import java.rmi.registry.Registry; +import java.rmi.server.RMIClientSocketFactory; +import java.rmi.server.RMIServerSocketFactory; +import java.rmi.server.UnicastRemoteObject; +import java.util.HashMap; +import java.util.Set; + /** * Agent implementation that controls the JMX server end points for JMX clients * to connect, such as an RMI server. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementConstants.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementConstants.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementConstants.java index 925d9bd..8598104 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementConstants.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementConstants.java @@ -16,13 +16,12 @@ */ package com.gemstone.gemfire.management.internal; -import java.util.concurrent.TimeUnit; - -import javax.management.ObjectName; - import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.management.internal.beans.QueryDataFunction; +import javax.management.ObjectName; +import java.util.concurrent.TimeUnit; + /** * Management Related Constants are defined here http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/BeanUtilFuncs.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/BeanUtilFuncs.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/BeanUtilFuncs.java index 5556c4d..b802648 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/BeanUtilFuncs.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/BeanUtilFuncs.java @@ -16,17 +16,6 @@ */ package com.gemstone.gemfire.management.internal.beans; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.RandomAccessFile; -import java.util.Set; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.distributed.DistributedMember; @@ -34,6 +23,11 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.management.GemFireProperties; import com.gemstone.gemfire.management.internal.cli.CliUtil; +import java.io.*; +import java.util.Set; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; + /** * Various Utility Functions to be used by MBeans * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java index 98258e8..89cc4f0 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/beans/MemberMBeanBridge.java @@ -16,29 +16,6 @@ */ package com.gemstone.gemfire.management.internal.beans; -import java.io.File; -import java.io.IOException; -import java.lang.management.ManagementFactory; -import java.lang.management.MemoryMXBean; -import java.lang.management.MemoryUsage; -import java.lang.management.OperatingSystemMXBean; -import java.lang.management.RuntimeMXBean; -import java.lang.management.ThreadInfo; -import java.lang.management.ThreadMXBean; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import javax.management.JMRuntimeException; -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; - import com.gemstone.gemfire.Statistics; import com.gemstone.gemfire.StatisticsType; import com.gemstone.gemfire.cache.CacheClosedException; @@ -51,36 +28,11 @@ import com.gemstone.gemfire.cache.wan.GatewaySender; import com.gemstone.gemfire.distributed.Locator; import com.gemstone.gemfire.distributed.LocatorLauncher; import com.gemstone.gemfire.distributed.ServerLauncher; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.DistributionStats; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; +import com.gemstone.gemfire.distributed.internal.*; import com.gemstone.gemfire.distributed.internal.locks.DLockService; import com.gemstone.gemfire.distributed.internal.locks.DLockStats; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.GemFireStatSampler; -import com.gemstone.gemfire.internal.GemFireVersion; -import com.gemstone.gemfire.internal.HostStatHelper; -import com.gemstone.gemfire.internal.LinuxSystemStats; -import com.gemstone.gemfire.internal.ProcessStats; -import com.gemstone.gemfire.internal.PureJavaMode; -import com.gemstone.gemfire.internal.SocketCreator; -import com.gemstone.gemfire.internal.SolarisSystemStats; -import com.gemstone.gemfire.internal.StatSamplerStats; -import com.gemstone.gemfire.internal.VMStatsContract; -import com.gemstone.gemfire.internal.WindowsSystemStats; -import com.gemstone.gemfire.internal.cache.CachePerfStats; -import com.gemstone.gemfire.internal.cache.CacheServerLauncher; -import com.gemstone.gemfire.internal.cache.DirectoryHolder; -import com.gemstone.gemfire.internal.cache.DiskDirectoryStats; -import com.gemstone.gemfire.internal.cache.DiskRegion; -import com.gemstone.gemfire.internal.cache.DiskStoreImpl; -import com.gemstone.gemfire.internal.cache.DiskStoreStats; -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.PartitionedRegionStats; +import com.gemstone.gemfire.internal.*; +import com.gemstone.gemfire.internal.cache.*; import com.gemstone.gemfire.internal.cache.control.ResourceManagerStats; import com.gemstone.gemfire.internal.cache.execute.FunctionServiceStats; import com.gemstone.gemfire.internal.cache.lru.LRUStatistics; @@ -97,37 +49,34 @@ import com.gemstone.gemfire.internal.process.PidUnavailableException; import com.gemstone.gemfire.internal.process.ProcessUtils; import com.gemstone.gemfire.internal.stats50.VMStats50; import com.gemstone.gemfire.internal.tcp.ConnectionTable; -import com.gemstone.gemfire.management.DependenciesNotFoundException; -import com.gemstone.gemfire.management.DiskBackupResult; -import com.gemstone.gemfire.management.GemFireProperties; -import com.gemstone.gemfire.management.JVMMetrics; -import com.gemstone.gemfire.management.ManagementException; -import com.gemstone.gemfire.management.OSMetrics; +import com.gemstone.gemfire.management.*; import com.gemstone.gemfire.management.cli.CommandService; import com.gemstone.gemfire.management.cli.CommandServiceException; import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.internal.ManagementConstants; import com.gemstone.gemfire.management.internal.ManagementStrings; import com.gemstone.gemfire.management.internal.SystemManagementService; -import com.gemstone.gemfire.management.internal.beans.stats.AggregateRegionStatsMonitor; -import com.gemstone.gemfire.management.internal.beans.stats.GCStatsMonitor; -import com.gemstone.gemfire.management.internal.beans.stats.MBeanStatsMonitor; -import com.gemstone.gemfire.management.internal.beans.stats.MemberLevelDiskMonitor; -import com.gemstone.gemfire.management.internal.beans.stats.StatType; -import com.gemstone.gemfire.management.internal.beans.stats.StatsAverageLatency; -import com.gemstone.gemfire.management.internal.beans.stats.StatsKey; -import com.gemstone.gemfire.management.internal.beans.stats.StatsLatency; -import com.gemstone.gemfire.management.internal.beans.stats.StatsRate; -import com.gemstone.gemfire.management.internal.beans.stats.VMStatsMonitor; +import com.gemstone.gemfire.management.internal.beans.stats.*; import com.gemstone.gemfire.management.internal.cli.CommandResponseBuilder; import com.gemstone.gemfire.management.internal.cli.remote.CommandExecutionContext; import com.gemstone.gemfire.management.internal.cli.remote.MemberCommandService; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.result.ResultBuilder; import com.gemstone.gemfire.management.internal.cli.shell.Gfsh; - import org.apache.logging.log4j.Logger; +import javax.management.JMRuntimeException; +import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; +import java.io.File; +import java.io.IOException; +import java.lang.management.*; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.*; +import java.util.concurrent.TimeUnit; + /** * This class acts as an Bridge between MemberMBean and GemFire Cache and * Distributed System http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java index 1b5c1d3..690280b 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java @@ -16,44 +16,25 @@ */ package com.gemstone.gemfire.management.internal.cli; -import java.io.IOException; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Properties; -import java.util.ServiceConfigurationError; -import java.util.ServiceLoader; -import java.util.Set; -import java.util.StringTokenizer; -import java.util.TreeMap; - -import org.springframework.shell.core.CommandMarker; -import org.springframework.shell.core.Converter; -import org.springframework.shell.core.annotation.CliAvailabilityIndicator; -import org.springframework.shell.core.annotation.CliCommand; -import org.springframework.shell.core.annotation.CliOption; - import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.ClassPathLoader; import com.gemstone.gemfire.management.cli.CliMetaData; import com.gemstone.gemfire.management.internal.cli.annotation.CliArgument; import com.gemstone.gemfire.management.internal.cli.help.CliTopic; -import com.gemstone.gemfire.management.internal.cli.parser.Argument; -import com.gemstone.gemfire.management.internal.cli.parser.AvailabilityTarget; -import com.gemstone.gemfire.management.internal.cli.parser.CommandTarget; -import com.gemstone.gemfire.management.internal.cli.parser.GfshMethodTarget; -import com.gemstone.gemfire.management.internal.cli.parser.GfshOptionParser; -import com.gemstone.gemfire.management.internal.cli.parser.Option; +import com.gemstone.gemfire.management.internal.cli.parser.*; import com.gemstone.gemfire.management.internal.cli.parser.jopt.JoptOptionParser; import com.gemstone.gemfire.management.internal.cli.util.ClasspathScanLoadHelper; +import org.springframework.shell.core.CommandMarker; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.annotation.CliAvailabilityIndicator; +import org.springframework.shell.core.annotation.CliCommand; +import org.springframework.shell.core.annotation.CliOption; + +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.*; +import java.util.Map.Entry; /** * @@ -66,7 +47,7 @@ public class CommandManager { private static final Object INSTANCE_LOCK = new Object(); private static CommandManager INSTANCE = null; - public static final String USER_CMD_PACKAGES_PROPERTY = "gemfire." + DistributionConfig.USER_COMMAND_PACKAGES; + public static final String USER_CMD_PACKAGES_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.USER_COMMAND_PACKAGES; public static final String USER_CMD_PACKAGES_ENV_VARIABLE = "GEMFIRE_USER_COMMAND_PACKAGES"; private Properties cacheProperties; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java index 8c89838..4ba8c36 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java @@ -35,13 +35,8 @@ import com.gemstone.gemfire.management.internal.cli.functions.CliFunctionResult; import com.gemstone.gemfire.management.internal.cli.functions.ExportConfigFunction; import com.gemstone.gemfire.management.internal.cli.functions.GetMemberConfigInformationFunction; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; -import com.gemstone.gemfire.management.internal.cli.result.CommandResultException; -import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData; +import com.gemstone.gemfire.management.internal.cli.result.*; import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData.SectionResultData; -import com.gemstone.gemfire.management.internal.cli.result.ErrorResultData; -import com.gemstone.gemfire.management.internal.cli.result.InfoResultData; -import com.gemstone.gemfire.management.internal.cli.result.ResultBuilder; -import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; import com.gemstone.gemfire.management.internal.cli.shell.Gfsh; import com.gemstone.gemfire.management.internal.configuration.SharedConfigurationWriter; import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity; @@ -53,15 +48,7 @@ import org.springframework.shell.core.annotation.CliOption; import java.io.File; import java.io.IOException; -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 java.util.Properties; -import java.util.Set; -import java.util.TreeSet; +import java.util.*; import static com.gemstone.gemfire.cache.operations.OperationContext.OperationCode; import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
