geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [49/50] [abbrv] incubator-geode git commit: Move Admin API to internal
Date Wed, 26 Oct 2016 21:54:53 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bd8ef7f/geode-core/src/main/java/org/apache/geode/admin/CacheVmConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheVmConfig.java b/geode-core/src/main/java/org/apache/geode/admin/CacheVmConfig.java
deleted file mode 100755
index e7068bc..0000000
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheVmConfig.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geode.admin;
-
-/**
- * Configuration for a GemFire cache server VM that is managed by the
- * administration API.  The VM may or may not be running.
- *
- * @see AdminDistributedSystem#addCacheVm()
- *
- * @since GemFire 5.7
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- */
-public interface CacheVmConfig extends ManagedEntityConfig {
-  /**
-   * Returns the <code>cache.xml</code> declarative caching
-   * initialization file used to configure this cache server VM.  By
-   * default, a cache server VM is started without an XML file.
-   */
-  public String getCacheXMLFile();
-
-  /**
-   * Sets the <code>cache.xml</code> declarative caching
-   * initialization file used to configure this cache server VM.
-   */
-  public void setCacheXMLFile(String cacheXml);
-
-  /**
-   * Returns the location(s) of user classes (such as cache loaders)
-   * required by the cache server VM.
-   */
-  public String getClassPath();
-
-  /**
-   * Sets the location(s) of user classes (such as cache loaders)
-   * required by the cache server VM.
-   */
-  public void setClassPath(String classpath);
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bd8ef7f/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java b/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java
deleted file mode 100755
index ff9b613..0000000
--- a/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geode.admin;
-
-/**
-* A single configuration parameter of a {@link SystemMember}.
- *
- * @since GemFire     3.5
- *
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- */
-public interface ConfigurationParameter {
-  
-  /** Gets the identifying name of this configuration parameter. */
-  public String getName();
-  
-  /** Gets the full description of this configuration parameter */
-  public String getDescription();
-  
-  /** Gets the current value */
-  public Object getValue();
-  
-  /** Gets the current value as a string */
-  public String getValueAsString();
-  
-  /** Gets the class type of the value */
-  public Class getValueType();
-  
-  /** True if this is modifiable; false if read-only */
-  public boolean isModifiable();
-  
-  /** Returns true if this config parameter uses a string array for value. */
-  public boolean isArray();
-  
-  /** Returns true if this config parameter represents an InetAddress value. */
-  public boolean isInetAddress();
-  
-  /** Returns true if this config parameter represents a File value. */
-  public boolean isFile();
-  
-  /** Returns true if this config parameter represents an octal value. */
-  public boolean isOctal();
-    
-  /** Returns true if this config parameter represents a string value. */
-  public boolean isString();
-  
-  /**
-   * Sets a new value for this configuration parameter.
-   *
-   * @param value   the new value which must be of type {@link #getValueType}
-   * @throws IllegalArgumentException
-   *         if value type does not match {@link #getValueType}
-   * @throws UnmodifiableConfigurationException
-   *         if attempting to set value when isModifiable is false
-   */
-  public void setValue(Object value) throws UnmodifiableConfigurationException;
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bd8ef7f/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java b/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java
deleted file mode 100755
index 67f8c7c..0000000
--- a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java
+++ /dev/null
@@ -1,642 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geode.admin;
-
-import org.apache.geode.admin.internal.InetAddressUtil;
-import org.apache.geode.distributed.internal.DistributionConfig;
-
-import java.util.Properties;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
-
-/**
- * Configuration for defining a GemFire distributed system to
- * administrate.  This configuration includes information about the
- * discovery mechanism used to find members of the distributed system
- * and information about {@linkplain ManagedEntity managed entities}
- * such as {@linkplain DistributionLocator distribution locators}
- * and {@linkplain CacheVm GemFire cache vms}
- * that can be {@linkplain AdminDistributedSystem#start started}.  
- *
- * <P>
- *
- * Detailed descriptions of many of these configuration attributes can
- * be found in the {@link
- * org.apache.geode.distributed.DistributedSystem
- * DistributedSystem} class.  Note that the default values of these
- * configuration attributes can be specified using Java system
- * properties.
- *
- * <P>
- *
- * A <code>DistributedSystemConfig</code> can be modified using a
- * number of mutator methods until the
- * <code>AdminDistributedSystem</code> that it configures {@linkplain
- * AdminDistributedSystem#connect connects} to the distributed system.
- * After that, attempts to modify most attributes in the
- * <code>DistributedSystemConfig</code> will result in an {@link
- * IllegalStateException} being thrown.  If you wish to use the same
- * <code>DistributedSystemConfig</code> to configure multiple
- * <code>AdminDistributedSystem</code>s, a copy of the
- * <code>DistributedSystemConfig</code> object can be made by invoking
- * the {@link #clone} method.
- *
- * @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
-*/
-public interface DistributedSystemConfig extends Cloneable {
-
-  /** The name of an XML file that specifies the configuration for the
-   * {@linkplain ManagedEntity managed entities} administered by the
-   * <code>DistributedSystem</code>.  The XML file must conform to a
-   * <a href="doc-files/ds5_0.dtd">dtd</a>. */
-  String ENTITY_CONFIG_XML_FILE_NAME =
-    "entity-config-xml-file";
-
-  /** The default value of the "entity-config-xml-file" property
-   * ("distributed-system.xml"). */
-  String DEFAULT_ENTITY_CONFIG_XML_FILE =
-    "distributed-system.xml";
-
-  /** The name of the "system-id" property */
-  String SYSTEM_ID_NAME = "system-id";
-
-  /** The default value of the "system-id" property ("") */
-  String DEFAULT_SYSTEM_ID = "Default System";
-
-  /** The name of the "name" property. See {@link #getSystemName()}. */
-  String NAME_NAME = NAME;
-
-  /** The default value of the "name" property (""). See {@link #getSystemName()}. */
-  String DEFAULT_NAME = "";
-
-  /** The name of the "mcastPort" property */
-  String MCAST_PORT_NAME = MCAST_PORT;
-
-  /** The default value of the "mcastPort" property (10334) */
-  int DEFAULT_MCAST_PORT =
-    DistributionConfig.DEFAULT_MCAST_PORT;
-
-  /** The minimum mcastPort (0) */
-  int MIN_MCAST_PORT = DistributionConfig.MIN_MCAST_PORT;
-
-  /** The maximum mcastPort (65535) */
-  int MAX_MCAST_PORT = DistributionConfig.MAX_MCAST_PORT;
-  
-  /** The name of the "mcastAddress" property */
-  String MCAST_ADDRESS_NAME = MCAST_ADDRESS;
-
-  /** The default value of the "mcastAddress" property (239.192.81.1). */
-  String DEFAULT_MCAST_ADDRESS = 
-      InetAddressUtil.toString(DistributionConfig.DEFAULT_MCAST_ADDRESS);
-  
-  /** The name of the "membership-port-range" property
-   * @since GemFire 6.5
-   */
-  String MEMBERSHIP_PORT_RANGE_NAME = MEMBERSHIP_PORT_RANGE;
-
-  /**
-   * The default membership-port-range.
-   * <p> Actual value is <code>[1024,65535]</code>.
-   * @since GemFire 6.5
-   */
-  int[] DEFAULT_MEMBERSHIP_PORT_RANGE = 
-    DistributionConfig.DEFAULT_MEMBERSHIP_PORT_RANGE;
-  
-  /** settings for tcp-port
-   * @since GemFire 6.5
-   */
-  String TCP_PORT_NAME = TCP_PORT;
-  /** The default value of the "tcpPort" property.
-   * <p> Actual value is <code>0</code>.
-   * @since GemFire 6.5
-   */
-  int DEFAULT_TCP_PORT = DistributionConfig.DEFAULT_TCP_PORT;
-
-  /**
-   * The default AckWaitThreshold.
-   * <p> Actual value of this constant is <code>15</code> seconds.
-   */
-  int DEFAULT_ACK_WAIT_THRESHOLD =
-    DistributionConfig.DEFAULT_ACK_WAIT_THRESHOLD;
-  /**
-   * The minimum AckWaitThreshold.
-   * <p> Actual value of this constant is <code>1</code> second.
-   */
-  int MIN_ACK_WAIT_THRESHOLD =
-    DistributionConfig.MIN_ACK_WAIT_THRESHOLD;
-  /**
-   * The maximum AckWaitThreshold.
-   * <p> Actual value of this constant is <code>MAX_INT</code> seconds.
-   */
-  int MAX_ACK_WAIT_THRESHOLD =
-    DistributionConfig.MIN_ACK_WAIT_THRESHOLD;
-  
-  /**
-   * The default ackSevereAlertThreshold.
-   * <p> Actual value of this constant is <code>0</code> seconds, which
-   * turns off forced disconnects based on ack wait periods.
-   */
-  int DEFAULT_ACK_SEVERE_ALERT_THRESHOLD =
-    DistributionConfig.DEFAULT_ACK_SEVERE_ALERT_THRESHOLD;
-  /**
-   * The minimum ackSevereAlertThreshold.
-   * <p> Actual value of this constant is <code>0</code> second,
-   * which turns off forced disconnects based on ack wait periods.
-   */
-  int MIN_ACK_SEVERE_ALERT_THRESHOLD =
-    DistributionConfig.MIN_ACK_SEVERE_ALERT_THRESHOLD;
-  /**
-   * The maximum ackSevereAlertThreshold.
-   * <p> Actual value of this constant is <code>MAX_INT</code> seconds.
-   */
-  int MAX_ACK_SEVERE_ALERT_THRESHOLD =
-    DistributionConfig.MAX_ACK_SEVERE_ALERT_THRESHOLD;
-
-  /** The name of the "locators" property (comma-delimited host[port] list) */
-  String LOCATORS_NAME = LOCATORS;
-
-  /** The default value of the "locators" property ("") */
-  String DEFAULT_LOCATORS =
-    DistributionConfig.DEFAULT_LOCATORS;
-
-  /** The name of the "bindAddress" property */
-  String BIND_ADDRESS_NAME = BIND_ADDRESS;
-
-  /** The default value of the "bindAddress" property */
-  String DEFAULT_BIND_ADDRESS =
-    DistributionConfig.DEFAULT_BIND_ADDRESS;
-
-  /** The name of the remote-command property */
-  String REMOTE_COMMAND_NAME = "remote-command";
-
-  /** The default value of the remote-command property */
-  String DEFAULT_REMOTE_COMMAND =
-    "rsh -n {HOST} {CMD}";
-
-  /** The default disable-tcp value (<code>false</code>) */
-  boolean DEFAULT_DISABLE_TCP = DistributionConfig.DEFAULT_DISABLE_TCP;
-  
-  /** The default enable-network-partition-detection setting (<code>false</code>) */
-  boolean DEFAULT_ENABLE_NETWORK_PARTITION_DETECTION = DistributionConfig.DEFAULT_ENABLE_NETWORK_PARTITION_DETECTION;
-  
-  /** The default disable-auto-reconnect setting (<code>false</code>) */
-  boolean DEFAULT_DISABLE_AUTO_RECONNECT = DistributionConfig.DEFAULT_DISABLE_AUTO_RECONNECT;
-
-  /** The default failure-detection timeout period for member heart-beat responses */
-  int DEFAULT_MEMBER_TIMEOUT = DistributionConfig.DEFAULT_MEMBER_TIMEOUT;
-  
-  /** The name of the "logFile" property */
-  String LOG_FILE_NAME = LOG_FILE;
-
-  /** The default log-file value ("" which directs logging to standard
-   * output) */
-  String DEFAULT_LOG_FILE = "";
-
-  /** The name of the "logLevel" property */
-  String LOG_LEVEL_NAME = LOG_LEVEL;
-
-  /** The default log level ("config") */
-  String DEFAULT_LOG_LEVEL = "config";
-
-  /** The name of the "LogDiskSpaceLimit" property */
-  String LOG_DISK_SPACE_LIMIT_NAME =
-      LOG_DISK_SPACE_LIMIT;
-
-  /** The default log disk space limit in megabytes (0) */
-  int DEFAULT_LOG_DISK_SPACE_LIMIT =
-    DistributionConfig.DEFAULT_LOG_DISK_SPACE_LIMIT;
-
-  /** The minimum log disk space limit in megabytes (0) */
-  int MIN_LOG_DISK_SPACE_LIMIT = 
-    DistributionConfig.MIN_LOG_DISK_SPACE_LIMIT;
-
-  /** The minimum log disk space limit in megabytes (1000000) */
-  int MAX_LOG_DISK_SPACE_LIMIT =
-    DistributionConfig.MAX_LOG_DISK_SPACE_LIMIT;
-    
-  /** The name of the "LogFileSizeLimit" property */
-  String LOG_FILE_SIZE_LIMIT_NAME = LOG_FILE_SIZE_LIMIT;
-
-  /** The default log file size limit in megabytes (0) */
-  int DEFAULT_LOG_FILE_SIZE_LIMIT =
-    DistributionConfig.DEFAULT_LOG_FILE_SIZE_LIMIT;
-
-  /** The minimum log file size limit in megabytes (0) */
-  int MIN_LOG_FILE_SIZE_LIMIT =
-    DistributionConfig.MIN_LOG_FILE_SIZE_LIMIT;
-
-  /** The minimum log file size limit in megabytes (1000000) */
-  int MAX_LOG_FILE_SIZE_LIMIT =
-    DistributionConfig.MAX_LOG_FILE_SIZE_LIMIT;
-
-  /**
-   * The name of the "refreshInterval" property which will apply to
-   * SystemMember, SystemMemberCache and StatisticResource refresh. This interval
-   * (in seconds) is used for auto-polling and updating AdminDistributedSystem
-   * constituents including SystemMember, CacheServer, SystemMemberCache and
-   * StatisticResource. This interval is read-only and retains the value set
-   * when the config is created. Note that the resource MBeans actually refresh
-   * and hit the DS only if there is an RMI client connected
-   * */
-  String REFRESH_INTERVAL_NAME =
-    "refresh-interval";
-
-  /**
-   * The default "refreshInterval" in seconds which will apply to
-   * REFRESH_INTERVAL_NAME property. The default value is 15 secs
-   * */
-  int DEFAULT_REFRESH_INTERVAL = 15;
-
-  //////////////////////  Instance Methods  //////////////////////
-
-  /**
-   * Returns the name of the XML file that specifies the configuration
-   * of the {@linkplain org.apache.geode.admin.ManagedEntity
-   * managed entities} administered by the
-   * <code>DistributedSystem</code>.  The XML file must conform to a
-   * <a href="doc-files/ds5_0.dtd">dtd</a>.
-   *
-   * @since GemFire 4.0
-   */
-  public String getEntityConfigXMLFile();
-
-  /**
-   * Sets the name of the XML file that specifies the configuration of
-   * managed entities administered by the
-   * <code>DistributedSystem</code>. 
-   */
-  public void setEntityConfigXMLFile(String xmlFile);
-
-  /** Returns the string identity for the system */
-  public String getSystemId();
-
-  /** Sets the string identity for the system */
-  public void setSystemId(String systemId);
-
-  /** Returns the optional non-unique name for the system */
-  public String getSystemName();
-
-  /** Sets the optional non-unique name for the system */
-  public void setSystemName(final String name);
-
-  /** Returns the multicast address for the system */
-  public String getMcastAddress();
-
-  /** Sets the multicast address for the system */
-  public void setMcastAddress(String mcastAddress);
-
-  /** Returns the multicast port for the system */
-  public int getMcastPort();
-  
-  /** Sets the multicast port for the system */
-  public void setMcastPort(int mcastPort);
-
-  /** Returns the ack-wait-threshold for the system */
-  public int getAckWaitThreshold();
-  
-  /** Sets the ack-wait-threshold for the system */
-  public void setAckWaitThreshold(int seconds);
-
-  /** Returns the ack-severe-alert-threshold for the system */
-  public int getAckSevereAlertThreshold();
-  
-  /** Sets the ack-severe-alert-threshold for the system */
-  public void setAckSevereAlertThreshold(int seconds);
-
-  /** Returns a comma-delimited list of locators for the system */
-  public String getLocators();
-
-  /** Sets the comma-delimited list of locators for the system */
-  public void setLocators(String locators);
-
-  /**
-   * Returns the membership-port-range property of the Distributed System. This 
-   * range is given as two numbers separated by a minus sign.
-   * @since GemFire 6.5
-   */
-  public String getMembershipPortRange();
-  
-  /**
-   * Sets the membership-port-range property of the Distributed System. This 
-   * range is given as two numbers separated by a minus sign.
-   * @since GemFire 6.5
-   */
-  public void setMembershipPortRange(String membershipPortRange);
-  
-  
-  /**
-   * Sets the primary communication port number for the Distributed System.
-   * @since GemFire 6.5
-   */
-  public void setTcpPort(int port);
-
-  /**
-   * Returns the primary communication port number for the Distributed System.
-   * @since GemFire 6.5
-   */
-  public int getTcpPort();
-
-
-  /** Sets the disable-tcp property for the system.  When tcp is disabled,
-      the cache uses udp for unicast messaging.   This must be consistent
-      across all members of the distributed system. The default is to enable
-      tcp. */
-  public void setDisableTcp(boolean flag);
-  
-  /** Returns the disable-tcp property for the system.  When tcp is
-      disabled, the cache uses udp for unicast messaging.  This must be
-      consistent across all members of the distributed system.  The default
-      is to enable tcp.
-   */
-  public boolean getDisableTcp();
-
-
-  /**
-   * Turns on network partition detection
-   */
-  public void setEnableNetworkPartitionDetection(boolean newValue);
-  /**
-   * Returns true if network partition detection is enabled.
-   */
-  public boolean getEnableNetworkPartitionDetection();
-  
-  /**
-   * Disables auto reconnect after being forced out of the distributed system
-   */
-  public void setDisableAutoReconnect(boolean newValue);
-  
-  /**
-   * Returns true if auto reconnect is disabled
-   */
-  public boolean getDisableAutoReconnect();
-  
-  
-
-  /**
-   * Returns the member-timeout millisecond value used in failure-detection
-   * protocols
-   */
-  public int getMemberTimeout();
-
-  /**
-   * Set the millisecond value of the member-timeout used in failure-detection
-   * protocols.  This timeout determines how long a member has to respond to
-   * a heartbeat request. The member is given three chances before being
-   * kicked out of the distributed system with a SystemConnectException.
-   */
-  public void setMemberTimeout(int value);
-
-  /**
-   * Returns the IP address to which the distributed system's server
-   * sockets are bound.
-   *
-   * @since GemFire 4.0
-   */
-  public String getBindAddress();
-
-  /**
-   * Sets the IP address to which the distributed system's server
-   * sockets are bound.
-   *
-   * @since GemFire 4.0
-   */
-  public void setBindAddress(String bindAddress);
-  
-  
-  /**
-   * Returns the IP address to which client/server server sockets are
-   * bound
-   */
-  public String getServerBindAddress();
-  
-  /**
-   * Sets the IP address to which a server cache will bind when listening
-   * for client cache connections. 
-   */
-  public void setServerBindAddress(String bindAddress);
-  
-
-  /** Returns the remote command setting to use for remote administration */
-  public String getRemoteCommand();
-
-  /** 
-   * Sets the remote command setting to use for remote administration.
-   * This attribute may be modified after this
-   * <code>DistributedSystemConfig</code> has been used to create an
-   * <codE>AdminDistributedSystem</code>.
-   */
-  public void setRemoteCommand(String command);
-
-  /** Returns the value of the "ssl-enabled" property. */
-  public boolean isSSLEnabled();
-
-  /** Sets the value of the "ssl-enabled" property. */
-  public void setSSLEnabled(boolean enabled);
-
-  /** Returns the value of the "ssl-protocols" property. */
-  public String getSSLProtocols();
-
-  /** Sets the value of the "ssl-protocols" property. */
-  public void setSSLProtocols(String protocols);
-
-  /** Returns the value of the "ssl-ciphers" property. */
-  public String getSSLCiphers();
-
-  /** Sets the value of the "ssl-ciphers" property. */
-  public void setSSLCiphers(String ciphers);
-
-  /** Returns the value of the "ssl-require-authentication" property. */
-  public boolean isSSLAuthenticationRequired();
-
-  /** Sets the value of the "ssl-require-authentication" property. */
-  public void setSSLAuthenticationRequired(boolean authRequired);
-  
-  /** Returns the provider-specific properties for SSL. */
-  public Properties getSSLProperties();
-
-  /** Sets the provider-specific properties for SSL. */
-  public void setSSLProperties(Properties sslProperties);
-
-  /** Adds an SSL property */
-  public void addSSLProperty(String key, String value);
-
-  /** Removes an SSL property */
-  public void removeSSLProperty(String key);
-  
-  /**
-   * Returns the name of the log file to which informational messages
-   * are written.
-   *
-   * @see org.apache.geode.i18n.LogWriterI18n
-   */
-  public String getLogFile();
-
-  /**
-   * Sets the name of the log file to which informational messages
-   * are written.
-   *
-   * @see org.apache.geode.i18n.LogWriterI18n
-   */
-  public void setLogFile(String logFile);
-
-  /**
-   * Returns the level at which informational messages are logged.
-   */
-  public String getLogLevel();
-
-  /**
-   * Sets the level at which information messages are logged.
-   */
-  public void setLogLevel(String logLevel);
-
-  /**
-   * Returns the log disk space limit in megabytes
-   */
-  public int getLogDiskSpaceLimit();
-
-  /**
-   * Sets the log disk space limit in megabytes
-   */
-  public void setLogDiskSpaceLimit(int limit);
-
-  /**
-   * Returns the log file size limit in megabytes
-   */
-  public int getLogFileSizeLimit();
-
-  /**
-   * Sets the log file size limit in megabytes
-   */
-  public void setLogFileSizeLimit(int limit);
-
-  /**
-   * Returns the refreshInterval in seconds used for auto-polling and updating
-   * AdminDistributedSystem constituents including SystemMember, CacheServer,
-   * SystemMemberCache and StatisticResource
-   * @since GemFire 6.0
-   */
-  public int getRefreshInterval();
-
-  /**
-   * Sets the refreshInterval in seconds
-   * @since GemFire 6.0
-   */
-  public void setRefreshInterval(int timeInSecs);
-
-  /** 
-   * Returns an array of configurations for statically known
-   * <code>CacheServers</code>.
-   * @deprecated as of 5.7 use {@link #getCacheVmConfigs} instead.
-   */ 
-  @Deprecated
-  public CacheServerConfig[] getCacheServerConfigs();
-
-  /** 
-   * Creates the configuration for a CacheServer
-   * @deprecated as of 5.7 use {@link #createCacheVmConfig} instead.
-   */
-  @Deprecated
-  public CacheServerConfig createCacheServerConfig();
-
-  /** 
-   * Removes the configuration for a CacheServer
-   * @deprecated as of 5.7 use {@link #removeCacheVmConfig} instead.
-   */
-  @Deprecated
-  public void removeCacheServerConfig(CacheServerConfig managerConfig);
-
-  /** 
-   * Returns an array of configurations for statically known
-   * {@link CacheVm}s.
-   * @since GemFire 5.7
-   */ 
-  public CacheVmConfig[] getCacheVmConfigs();
-
-  /** 
-   * Creates the configuration for a {@link CacheVm}.
-   * @since GemFire 5.7
-   */
-  public CacheVmConfig createCacheVmConfig();
-
-  /** 
-   * Removes the configuration for a {@link CacheVm}
-   * @since GemFire 5.7
-   */
-  public void removeCacheVmConfig(CacheVmConfig existing);
-
-  /**
-   * Returns configuration information about {@link
-   * DistributionLocator}s that are managed by an
-   * <code>AdminDistributedSystem</code>.
-   */
-  public DistributionLocatorConfig[] getDistributionLocatorConfigs();
-  
-  /**
-   * Creates a new <code>DistributionLocatorConfig</code> for a
-   * distribution locator that is managed in this distributed system.
-   * The default locator config is set to not use multicast
-   */
-  public DistributionLocatorConfig createDistributionLocatorConfig();
-
-  /**
-   * Removes a <code>DistributionLocatorConfig</code> from the
-   * distributed system.
-   */
-  public void removeDistributionLocatorConfig(DistributionLocatorConfig config);
-
-  /** Registers listener for notification of changes in this config. */
-  public void addListener(ConfigListener listener);
-
-  /** Removes previously registered listener of this config. */
-  public void removeListener(ConfigListener listener);
-
-  /**
-   * Validates that this distributed system configuration is correct
-   * and consistent.
-   *
-   * @throws IllegalStateException
-   *         If this config is not valid
-   * @throws AdminXmlException
-   *         If the {@linkplain #getEntityConfigXMLFile entity config
-   *         XML file} is not valid 
-   */
-  public void validate();
-
-  /**
-   * Returns a copy of this <code>DistributedSystemConfig</code>
-   * object whose configuration can be modified.  Note that this
-   * {@link DistributedSystemConfig.ConfigListener ConfigListener}s
-   * that are registered on this config object are not cloned.
-   *
-   * @since GemFire 4.0
-   */
-  public Object clone() throws CloneNotSupportedException;
-
-  ////////////////////// Inner Classes  //////////////////////
-
-  /** A listener whose callback methods are invoked when this config
-   * changes. */
-  public interface ConfigListener extends java.util.EventListener {
-
-    /** Invoked when this configurated is changed. */
-    public void configChanged(DistributedSystemConfig config);
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bd8ef7f/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemHealthConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemHealthConfig.java b/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemHealthConfig.java
deleted file mode 100644
index d9416ce..0000000
--- a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemHealthConfig.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geode.admin;
-
-/**
- * Provides configuration information relating to the health of an
- * entire GemFire distributed system.
- *
- * <P>
- *
- * If any of the following criteria is
- * true, then the distributed system is considered to be in
- * {@link GemFireHealth#OKAY_HEALTH OKAY_HEALTH}.
- *
- * <UL>
- *
- * </UL>
- *
- * If any of the following criteria is true, then the distributed
- * system is considered to be in {@link GemFireHealth#POOR_HEALTH
- * POOR_HEALTH}.
- *
- * <UL>
- *
- * <LI>Too many application members {@linkplain
- * #getMaxDepartedApplications unexpectedly leave} the distributed
- * system.</LI>
- *
- * <LI>Too many application members {@linkplain
- * #getMaxDepartedApplications unexpectedly leave} the distributed
- * system.</LI>
- *
- * </UL>
- *
- *
- * @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- * */
-public interface DistributedSystemHealthConfig {
-
-  /** The default maximum number of application members that can
-   * unexceptedly leave a healthy the distributed system. */
-  public static final long DEFAULT_MAX_DEPARTED_APPLICATIONS = 10;
-
-  ///////////////////////  Instance Methods  ///////////////////////
-
-  /**
-   * Returns the maximum number of application members that can
-   * unexceptedly leave a healthy the distributed system.
-   *
-   * @see #DEFAULT_MAX_DEPARTED_APPLICATIONS
-   */
-  public long getMaxDepartedApplications();
-
-  /**
-   * Sets the maximum number of application members that can
-   * unexceptedly leave a healthy the distributed system.
-   *
-   * @see #getMaxDepartedApplications
-   */
-  public void setMaxDepartedApplications(long maxDepartedApplications);
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bd8ef7f/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java b/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java
deleted file mode 100755
index da8864c..0000000
--- a/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geode.admin;
-
-/**
- * Represents a single distribution locator server, of which a
- * distributed system may use zero or many.  The distributed system
- * will be configured to use either multicast discovery or locator
- * service.
- *
- * @see DistributionLocatorConfig
- *
- * @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- */
-public interface DistributionLocator extends ManagedEntity {
-  
-  /** 
-   * Returns the identity name for this locator.
-   */
-  public String getId();
-  
-  /**
-   * Returns the configuration object for this distribution locator.
-   *
-   * @since GemFire 4.0
-   */
-  public DistributionLocatorConfig getConfig();
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bd8ef7f/geode-core/src/main/java/org/apache/geode/admin/DistributionLocatorConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributionLocatorConfig.java b/geode-core/src/main/java/org/apache/geode/admin/DistributionLocatorConfig.java
deleted file mode 100644
index 162f4f1..0000000
--- a/geode-core/src/main/java/org/apache/geode/admin/DistributionLocatorConfig.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geode.admin;
-import java.util.Properties;
-
-/**
- * Describes the configuration of a {@link DistributionLocator}
- * managed by the GemFire administration APIs.  
- *
- * <P>
- *
- * A <code>DistributionLocatorConfig</code> can be modified using a
- * number of mutator methods until the
- * <code>DistributionLocator</code> configured by this object is
- * {@linkplain ManagedEntity#start started}.  After that,
- * attempts to modify most attributes in the
- * <code>DistributionLocatorConfig</code> will result in an {@link
- * IllegalStateException} being thrown.  If you wish to use the same
- * <code>DistributionLocatorConfig</code> to configure another
- * <code>DistributionLocator</code>s, a copy of the
- * <code>DistributionLocatorConfig</code> object can be made by
- * invoking the {@link Object#clone} method.
- *
- * @see AdminDistributedSystem#addDistributionLocator
- * @see org.apache.geode.distributed.Locator
- *
- * @since GemFire 4.0
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- */
-public interface DistributionLocatorConfig
-  extends ManagedEntityConfig {
-
-  /**
-   * Returns the port on which ths distribution locator listens for
-   * members to connect.  There is no default locator port, so a
-   * non-default port must be specified.
-   */
-  public int getPort();
-
-  /**
-   * Sets the port on which the distribution locator listens for
-   * members to connect.
-   */
-  public void setPort(int port);
-
-  /**
-   * Returns the address to which the distribution locator's port is
-   * (or will be) bound.  By default, the bind address is
-   * <code>null</code> meaning that the port will be bound to all
-   * network addresses on the host.
-   */
-  public String getBindAddress();
-
-  /**
-   * Sets the address to which the distribution locator's port is
-   * (or will be) bound.
-   */
-  public void setBindAddress(String bindAddress);
-
-  /**
-   * Sets the properties used to configure the locator's
-   * DistributedSystem.
-   * @since GemFire 5.0
-   */
-  public void setDistributedSystemProperties(Properties props);
-  
-  /**
-   * Retrieves the properties used to configure the locator's
-   * DistributedSystem.
-   * @since GemFire 5.0
-   */
-  public Properties getDistributedSystemProperties();
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bd8ef7f/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java b/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java
deleted file mode 100644
index 202ce70..0000000
--- a/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geode.admin;
-
-import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
-/**
- * Provides information about the aggregate health of the members of a
- * GemFire distributed system ("components").  The {@link #getHealth
- * getHealth} method provides an indication of the overall health.
- * Health is expressed as one of three levels: {@link #GOOD_HEALTH
- * GOOD_HEALTH}, {@link #OKAY_HEALTH OKAY_HEALTH}, and {@link
- * #POOR_HEALTH POOR_HEALTH}.  The {@link #getDiagnosis getDiagnosis}
- * method provides a more detailed explanation of the cause of ill
- * health.
- *
- * <P>
- *
- * The aggregate health of the GemFire component is evaluated
- * {@linkplain GemFireHealthConfig#setHealthEvaluationInterval every
- * so often} and if certain criteria are met, then the overall health
- * of the component changes accordingly.  If any of the components is
- * in <code>OKAY_HEALTH</code>, then the overall health is
- * <code>OKAY_HEALTH</code>.  If any of the components is in
- * <code>POOR_HEALTH</code>, then the overall health is
- * <code>POOR_HEALTH</code>.
- *
- *
- * @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- * */
-public interface GemFireHealth {
-
-  /** An indicator that the GemFire components are healthy.
-   *
-   * @see #getHealth */
-  public static final Health GOOD_HEALTH =
-    new Health(Health.GOOD_STRING);
-
-  /** An indicator that one or more GemFire components is slightly
-   * unhealthy.  The problem may or may not require configuration
-   * changes and may not necessarily lead to poorer component health.
-   *
-   * @see #getHealth */
-  public static final Health OKAY_HEALTH =
-    new Health(Health.OKAY_STRING);
-
-  /** An indicator that one or more GemFire components is unhealthy.
-   * While it may be possible for the components to recover on their
-   * own, it is likely that they will have to be restarted.
-   *
-   * @see #getHealth */
-  public static final Health POOR_HEALTH =
-    new Health(Health.POOR_STRING);
-
-  ///////////////////////  Instance Methods  ///////////////////////
-
-  /**
-   * Returns an indicator of the overall health of the GemFire
-   * components. 
-   *
-   * @see #GOOD_HEALTH
-   * @see #OKAY_HEALTH
-   * @see #POOR_HEALTH
-   */
-  public Health getHealth();
-
-  /** 
-   * Resets the overall health of the GemFire components to {@link
-   * #GOOD_HEALTH}.  This operation should be invoked when the
-   * operator has determined that warnings about the components's
-   * health do not need to be regarded.
-   */
-  public void resetHealth();
-
-  /**
-   * Returns a message that provides a description of the cause of a
-   * component's ill health.
-   */
-  public String getDiagnosis();
-
-  /**
-   * Returns the configuration for determining the health of the
-   * distributed system itself.
-   */
-  public DistributedSystemHealthConfig getDistributedSystemHealthConfig();
-
-  /**
-   * Sets the configuration for determining the health of the
-   * distributed system itself.
-   */
-  public void setDistributedSystemHealthConfig(DistributedSystemHealthConfig config);
-
-  /**
-   * Returns the <code>GemFireHealthConfig</code> for GemFire
-   * components whose configurations are not overridden on a per-host
-   * basis.  Note that changes made to the returned
-   * <code>GemFireHealthConfig</code> will not take effect until
-   * {@link #setDefaultGemFireHealthConfig} is invoked.
-   */
-  public GemFireHealthConfig getDefaultGemFireHealthConfig();
-
-  /**
-   * Sets the <code>GemFireHealthConfig</code> for
-   * GemFire components whose configurations are not overridden on a
-   * per-host basis.
-   *
-   * @throws IllegalArgumentException
-   *         If <code>config</code> specifies the config for a host
-   */
-  public void setDefaultGemFireHealthConfig(GemFireHealthConfig config);
-
-  /**
-   * Returns the <code>GemFireHealthConfig</code> for GemFire
-   * components that reside on a given host.  This configuration will
-   * override the {@linkplain #getDefaultGemFireHealthConfig default}
-   * configuration.
-   *
-   * @param hostName
-   *        The {@linkplain java.net.InetAddress#getCanonicalHostName
-   *        canonical} name of the host.
-   */
-  public GemFireHealthConfig getGemFireHealthConfig(String hostName);
-
-  /**
-   * Sets the <code>GemFireHealthConfig</code> for GemFire
-   * components that reside on a given host.  This configuration will
-   * override the {@linkplain #getDefaultGemFireHealthConfig default}
-   * configuration.  Note that changes made to the returned
-   * <code>GemFireHealthConfig</code> will not take effect until
-   * {@link #setDefaultGemFireHealthConfig} is invoked.
-   *
-   * @param hostName
-   *        The {@linkplain java.net.InetAddress#getCanonicalHostName
-   *        canonical} name of the host.
-   *
-   * @throws IllegalArgumentException
-   *         If host <code>hostName</code> does not exist or if there
-   *         are no GemFire components running on that host or if
-   *         <code>config</code> does not configure host
-   *         <code>hostName</code>. 
-   */
-  public void setGemFireHealthConfig(String hostName,
-                                     GemFireHealthConfig config);
-
-  /**
-   * Closes this health monitor and releases all resources associated
-   * with it.
-   */
-  public void close();
-
-  /**
-   * Returns whether or not this <code>GemFireHealth</code> is
-   * {@linkplain #close closed}.
-   */
-  public boolean isClosed();
-
-  //////////////////////  Inner Classes  //////////////////////
-
-  /**
-   * An enumerated type for the health of GemFire.
-   */
-  public static class Health implements java.io.Serializable {
-    private static final long serialVersionUID = 3039539430412151801L;
-    /** The string for good health */
-    static final String GOOD_STRING = LocalizedStrings.GemFireHealth_GOOD.toLocalizedString();
-
-    /** The string for okay health */
-    static final String OKAY_STRING = LocalizedStrings.GemFireHealth_OKAY.toLocalizedString();
-
-    /** The string for poor health */
-    static final String POOR_STRING = LocalizedStrings.GemFireHealth_POOR.toLocalizedString();
-
-    ////////////////////  Instance Fields  ////////////////////
-
-    /** The string for this health */
-    private String healthString;
-
-    /////////////////////  Constructors  //////////////////////
-
-    /**
-     * Creates a new <code>Health</code> with the given string
-     */
-    protected Health(String healthString) {
-      this.healthString = healthString;
-    }
-    
-    ////////////////////  Instance Methods  ////////////////////
-
-    /**
-     * Returns the appropriate canonical instance of
-     * <code>Health</code>.
-     */
-    public Object readResolve() {
-      if (this.healthString.equals(GOOD_STRING)) {
-        return GemFireHealth.GOOD_HEALTH;
-
-      } else if (this.healthString.equals(OKAY_STRING)) {
-        return GemFireHealth.OKAY_HEALTH;
-
-      } else if (this.healthString.equals(POOR_STRING)) {
-        return GemFireHealth.POOR_HEALTH;
-
-      } else {
-        Assert.assertTrue(false, "Unknown healthString: " +
-                          this.healthString);
-        return null;
-      }
-    }
-
-    @Override
-    public String toString() {
-      return this.healthString;
-    }
-
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bd8ef7f/geode-core/src/main/java/org/apache/geode/admin/GemFireHealthConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/GemFireHealthConfig.java b/geode-core/src/main/java/org/apache/geode/admin/GemFireHealthConfig.java
deleted file mode 100644
index 638244a..0000000
--- a/geode-core/src/main/java/org/apache/geode/admin/GemFireHealthConfig.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geode.admin;
-
-/**
- * Provides configuration information relating to all of the
- * components of a GemFire distributed system.
- *
- *
- * @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- * */
-public interface GemFireHealthConfig
-  extends MemberHealthConfig, CacheHealthConfig {
-
-  /** The default number of seconds between assessments of the health
-   * of the GemFire components. */
-  public static final int DEFAULT_HEALTH_EVALUATION_INTERVAL = 30;
-
-  //////////////////////  Instance Methods  //////////////////////
-
-  /**
-   * Returns the name of the host to which this configuration
-   * applies.  If this is the "default" configuration, then
-   * <code>null</code> is returned.
-   *
-   * @see GemFireHealth#getGemFireHealthConfig
-   */
-  public String getHostName();
-
-  /**
-   * Sets the number of seconds between assessments of the health of
-   * the GemFire components.
-   */
-  public void setHealthEvaluationInterval(int interval);
-
-  /**
-   * Returns the number of seconds between assessments of the health of
-   * the GemFire components.
-   */
-  public int getHealthEvaluationInterval();
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bd8ef7f/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java b/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java
deleted file mode 100755
index b785125..0000000
--- a/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java
+++ /dev/null
@@ -1,698 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geode.admin;
-
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.client.PoolManager;
-import org.apache.geode.cache.server.CacheServer;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.distributed.Locator;
-import org.apache.geode.distributed.internal.DM;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.net.SocketCreator;
-import org.apache.geode.internal.admin.ClientHealthMonitoringRegion;
-import org.apache.geode.internal.admin.remote.ClientHealthStats;
-import org.apache.geode.internal.cache.*;
-import org.apache.geode.internal.cache.tier.InternalClientMembership;
-import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.net.InetAddress;
-import java.util.*;
-
-/**
- * Class <code>GemFireMemberStatus</code> provides the status of a specific
- * GemFire member VM. This VM can be a peer, a client, a server and/or a
- * gateway.
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- */
-public class GemFireMemberStatus implements Serializable {
-  private static final long serialVersionUID = 3389997790525991310L;
-
-  /**
-   * Notifies whether this member is a client to a cache server.
-   */
-  protected boolean _isClient;
-
-  /**
-   * Notifies whether this member is a cache server.
-   */
-  protected boolean _isServer;
-
-  /**
-   * Notifies whether this member is a hub for WAN gateways.
-   */
-  protected boolean _isGatewayHub;
-
-  /**
-   * Notifies whether this member is a locator.
-   */
-  protected boolean _isLocator;
-
-  protected boolean _isPrimaryGatewayHub;
-
-  protected Object/*GatewayHubStatus*/ _gatewayHubStatus;
-
-  protected boolean _isConnected;
-  protected Serializable _memberId;
-  protected Set _connectedPeers;
-  protected Set _connectedServers;
-  protected Set _unconnectedServers;
-  protected Set _connectedClients;
-  protected Map _connectedIncomingGateways;
-  protected Map _outgoingGateways;
-
-  protected Map _clientHostNames;
-  protected Map _clientQueueSizes;
-  protected Map _gatewayQueueSizes;
-  protected Map _regionStatuses;
-  protected Map _clientHealthStats;
-
-  protected String _memberName;
-  protected int _mcastPort;
-  protected int _serverPort;
-  protected InetAddress _mcastAddress;
-  protected String _bindAddress;
-  protected String _locators;
-  protected InetAddress _hostAddress;
-
-  protected long _maximumHeapSize;
-  protected long _freeHeapSize;
-  
-  protected long upTime = -1;
-
-  protected transient final Cache cache;
-  
-  public GemFireMemberStatus() {
-    this(null);
-  }
-
-  public GemFireMemberStatus(Cache cache) {
-    this.cache = cache;
-    DistributedSystem ds = null;
-    if (cache != null) {
-      ds = cache.getDistributedSystem();
-    }
-    initialize(ds);
-  }
-
-  public boolean getIsConnected() {
-    return this._isConnected;
-  }
-
-  protected void setIsConnected(boolean isConnected) {
-    this._isConnected = isConnected;
-  }
-
-  /**
-   * Returns whether this member is a client to a cache server
-   * @return whether this member is a client to a cache server
-   */
-  public boolean getIsClient() {
-    return this._isClient;
-  }
-
-  /**
-   * Sets whether this member is a client to a cache server
-   * @param isClient Boolean defining whether this member is a client to a
-   * cache server
-   */
-  protected void setIsClient(boolean isClient) {
-    this._isClient = isClient;
-  }
-
-  /**
-   * Returns whether this member is a cache server
-   * @return whether this member is a cache server
-   */
-  public boolean getIsServer() {
-    return this._isServer;
-  }
-
-  /**
-   * Sets whether this member is a cache server
-   * @param isServer Boolean defining whether this member is a cache server
-   */
-  protected void setIsServer(boolean isServer) {
-    this._isServer = isServer;
-  }
-
-  public int getServerPort() {
-	  return this._serverPort;
-  }
-  
-  protected void setServerPort(int port) {
-	  this._serverPort = port;
-  }
-  
-  /**
-   * Returns whether this member is a hub for WAN gateways
-   * @return whether this member is a hub for WAN gateways
-   */
-  public boolean getIsGatewayHub() {
-    return this._isGatewayHub;
-  }
-
-  /**
-   * Sets whether this member is a cache server
-   * @param isGatewayHub Boolean defining whether this member is a hub for
-   * WAN gateways
-   */
-  protected void setIsGatewayHub(boolean isGatewayHub) {
-    this._isGatewayHub = isGatewayHub;
-  }
-
-  public boolean getIsLocator() {
-    return this._isLocator;
-  }
-
-  protected void setIsLocator(boolean isLocator) {
-    this._isLocator = isLocator;
-  }
-
-  public boolean getIsPrimaryGatewayHub() {
-    return this._isPrimaryGatewayHub;
-  }
-
-  protected void setIsPrimaryGatewayHub(boolean isPrimaryGatewayHub) {
-    this._isPrimaryGatewayHub = isPrimaryGatewayHub;
-  }
-
-  /**
-   * For internal use only
-   * @return status of the gateway hub
-   */
-  public Object/*GatewayHubStatus*/ getGatewayHubStatus() {
-    return this._gatewayHubStatus;
-  }
-
-//  protected void setGatewayHubStatus(GatewayHubStatus gatewayHubStatus) {
-//    this._gatewayHubStatus = gatewayHubStatus;
-//  }
-
-  public boolean getIsSecondaryGatewayHub() {
-    return !this._isPrimaryGatewayHub;
-  }
-
-  public Set getConnectedPeers() {
-    return this._connectedPeers;
-  }
-
-  protected void setConnectedPeers(Set connectedPeers) {
-    this._connectedPeers = connectedPeers;
-  }
-
-  public Set getConnectedServers() {
-    return this._connectedServers;
-  }
-
-  protected void setConnectedServers(Set connectedServers) {
-    this._connectedServers = connectedServers;
-  }
-
-  protected void addConnectedServer(String connectedServer) {
-    this._connectedServers.add(connectedServer);
-  }
-
-  public Set getUnconnectedServers() {
-    return this._unconnectedServers;
-  }
-
-  protected void setUnconnectedServers(Set unconnectedServers) {
-    this._unconnectedServers = unconnectedServers;
-  }
-
-  protected void addUnconnectedServer(String unconnectedServer) {
-    this._unconnectedServers.add(unconnectedServer);
-  }
-
-  public Set getConnectedClients() {
-    return this._connectedClients;
-  }
-
-  protected void addConnectedClient(String connectedClient) {
-    this._connectedClients.add(connectedClient);
-  }
-
-  public Map getOutgoingGateways() {
-	    return this._outgoingGateways;
-  }
-
-  public Map getConnectedIncomingGateways() {
-    return this._connectedIncomingGateways;
-  }
-
-  protected void setConnectedIncomingGateways(Map connectedIncomingGateways) {
-    this._connectedIncomingGateways = connectedIncomingGateways;
-  }
-
-  public Map getClientQueueSizes() {
-    return this._clientQueueSizes;
-  }
-
-  protected void setClientQueueSizes(Map clientQueueSizes) {
-    this._clientQueueSizes = clientQueueSizes;
-  }
-
-  public int getClientQueueSize(String clientMemberId) {
-    Integer clientQueueSize = (Integer) getClientQueueSizes().get(clientMemberId);
-    return clientQueueSize == null ? 0 : clientQueueSize.intValue();
-  }
-
-  protected void putClientQueueSize(String clientMemberId, int size) {
-    getClientQueueSizes().put(clientMemberId, Integer.valueOf(size));
-  }
-
-  public Map getClientHealthStats() {
-    return this._clientHealthStats;
-  }
-  
-  protected void setClientHealthStats(Map stats) {
-    this._clientHealthStats = stats;
-  }
-  
-  /**
-   * For internal use only
-   * @param clientID client for health
-   * @return the client's health
-   */
-  public Object/*ClientHealthStats*/ getClientHealthStats(String clientID) {
-    return this._clientHealthStats.get(clientID);
-  }
-  
-  protected void setClientHealthStats(String clientID, ClientHealthStats stats) {
-    this._clientHealthStats.put(clientID, stats);
-  }
-  
-  protected void putClientHostName(String clientId, String hostName) {
-    this._clientHostNames.put(clientId, hostName);
-  }
-  
-  public String getClientHostName(String clientId) {
-    return (String)this._clientHostNames.get(clientId);
-  }
-  
-  public Map getRegionStatuses() {
-    return this._regionStatuses;
-  }
-
-  /**
-   * For internal use only
-   * @param fullRegionPath region path
-   * @return status for the region
-   */
-  public Object/*RegionStatus*/ getRegionStatus(String fullRegionPath) {
-    return getRegionStatuses().get(fullRegionPath);
-  }
-
-  protected void putRegionStatus(String fullRegionPath, RegionStatus status) {
-    getRegionStatuses().put(fullRegionPath, status);
-  }
-
-  public Serializable getMemberId() {
-    return this._memberId;
-  }
-
-  protected void setMemberId(Serializable memberId) {
-    this._memberId = memberId;
-  }
-
-  public String getMemberName() {
-    return this._memberName;
-  }
-
-  protected void setMemberName(String memberName) {
-    this._memberName = memberName;
-  }
-
-  public int getMcastPort() {
-    return this._mcastPort;
-  }
-
-  protected void setMcastPort(int mcastPort) {
-    this._mcastPort = mcastPort;
-  }
-
-  public InetAddress getMcastAddress() {
-    return this._mcastAddress;
-  }
-
-  protected void setMcastAddress(InetAddress mcastAddress) {
-    this._mcastAddress = mcastAddress;
-  }
-
-  public InetAddress getHostAddress() {
-    return this._hostAddress;
-  }
-
-  protected void setHostAddress(InetAddress hostAddress) {
-    this._hostAddress = hostAddress;
-  }
-
-  public String getBindAddress() {
-    return this._bindAddress;
-  }
-
-  protected void setBindAddress(String bindAddress) {
-    this._bindAddress = bindAddress;
-  }
-
-  public String getLocators() {
-    return this._locators;
-  }
-
-  protected void setLocators(String locators) {
-    this._locators = locators;
-  }
-
-  public long getMaximumHeapSize() {
-    return this._maximumHeapSize;
-  }
-
-  protected void setMaximumHeapSize(long size) {
-    this._maximumHeapSize = size;
-  }
-
-  public long getFreeHeapSize() {
-    return this._freeHeapSize;
-  }
-
-  protected void setFreeHeapSize(long size) {
-    this._freeHeapSize = size;
-  }
-
-  public long getUsedHeapSize() {
-    return getMaximumHeapSize() - getFreeHeapSize();
-  }
-  
-  public long getUpTime() {
-    return upTime;
-  }
-  
-  public void setUpTime(long upTime) {
-    this.upTime = upTime;
-  }
-
-  @Override
-  public String toString() {
-    StringBuffer buffer = new StringBuffer();
-    buffer
-      .append("GemFireMemberStatus[")
-      .append("isConnected=")
-      .append(this._isConnected)
-      .append("; memberName=")
-      .append(this._memberName)
-      .append("; memberId=")
-      .append(this._memberId)
-      .append("; hostAddress=")
-      .append(this._hostAddress)
-      .append("; mcastPort=")
-      .append(this._mcastPort)
-      .append("; mcastAddress=")
-      .append(this._mcastAddress)
-      .append("; bindAddress=")
-      .append(this._bindAddress)
-      .append("; serverPort=")
-      .append(this._serverPort)
-      .append("; locators=")
-      .append(this._locators)
-      .append("; isClient=")
-      .append(this._isClient)
-      .append("; isServer=")
-      .append(this._isServer)
-      .append("; isGatewayHub=")
-      .append(this._isGatewayHub)
-      .append("; isLocator=")
-      .append(this._isLocator)
-      .append("; isPrimaryGatewayHub=")
-      .append(this._isPrimaryGatewayHub)
-      .append("; gatewayHubStatus=")
-      .append(this._gatewayHubStatus)
-      .append("; connectedPeers=")
-      .append(this._connectedPeers)
-      .append("; connectedServers=")
-      .append(this._connectedServers)
-      .append("; unconnectedServers=")
-      .append(this._unconnectedServers)
-      .append("; connectedClients=")
-      .append(this._connectedClients)
-      .append("; clientHostNames=")
-      .append(this._clientHostNames)
-      .append("; clientQueueSizes=")
-      .append(this._clientQueueSizes)
-      .append("; clientHealthStats=")
-      .append(this._clientHealthStats)
-      .append("; gatewayQueueSizes=")
-      .append(this._gatewayQueueSizes)
-      .append("; regionStatuses=")
-      .append(this._regionStatuses)
-      .append("; maximumHeapSize=")
-      .append(this._maximumHeapSize)
-      .append("; freeHeapSize=")
-      .append(this._freeHeapSize)
-      .append("; upTime=")
-      .append(this.upTime)
-      .append("]");
-    return buffer.toString();
-  }
-  
-  protected void initialize(DistributedSystem distributedSystem) {
-    // Initialize instance variables
-    initializeInstanceVariables();
-
-    // If the cache is set, initialize the status.
-    // If the cache is not set, then this is most
-    // likely an unconnected status.
-    if (cache != null) {
-      // Initialize server
-      initializeServer();
-
-      // Initialize client
-      initializeClient();
-
-      // Initialize region sizes
-      initializeRegionSizes();
-    }
-
-    if (distributedSystem != null) {
-      // Initialize all
-      initializeAll(distributedSystem);
-    }
-
-    // If this is a locator, initialize the locator status
-    if (Locator.getLocators().size() > 0) {
-      setIsLocator(true);
-    }
-  }
-
-  protected void initializeInstanceVariables() {
-    // Variables for servers
-    this._connectedClients = new HashSet();
-    this._clientQueueSizes = new HashMap();
-    this._clientHealthStats = new HashMap();
-    this._clientHostNames = new HashMap();
-
-    // Variables for gateway hubs
-    this._outgoingGateways = new HashMap();
-    //this._connectedOutgoingGateways = new HashSet();
-    //this._unconnectedOutgoingGateways = new HashSet();
-    this._connectedIncomingGateways = new HashMap();
-    this._gatewayQueueSizes = new HashMap();
-
-    // Variables for clients
-    this._connectedServers = new HashSet();
-    this._unconnectedServers = new HashSet();
-
-    // Variables for all
-    this._connectedPeers = new HashSet();
-    this._regionStatuses = new HashMap();
-  }
-
-  protected void initializeServer() {
-    Collection servers = cache.getCacheServers();
-    if (servers.size() == 0) {
-      setIsServer(false);
-    } else {
-      setIsServer(true);
-
-      // Get connected clients.
-      // The following method returns a map of client member id to a cache
-      // client info. For now, keep track of the member ids in the set of
-      // _connectedClients.
-      Map allConnectedClients = InternalClientMembership.getStatusForAllClientsIgnoreSubscriptionStatus();
-      Iterator allConnectedClientsIterator = allConnectedClients.values().iterator();
-      while (allConnectedClientsIterator.hasNext()) {
-        CacheClientStatus ccs = (CacheClientStatus) allConnectedClientsIterator.next();
-        addConnectedClient(ccs.getMemberId());
-        // host address is available directly by id, hence CacheClientStatus need not be populated
-        putClientHostName(ccs.getMemberId(), ccs.getHostAddress());  
-      }
-
-      // Get client queue sizes
-      Map clientQueueSize = getClientIDMap(InternalClientMembership.getClientQueueSizes());
-      setClientQueueSizes(clientQueueSize);
-      
-      // Set server acceptor port (set it based on the first CacheServer)
-      CacheServer server = (CacheServer) servers.toArray()[0];
-      setServerPort(server.getPort());
-      
-      // Get Client Health Stats
-//      Assert.assertTrue(cache != null); (cannot be null)
-      Region clientHealthMonitoringRegion = ClientHealthMonitoringRegion.getInstance(
-          (GemFireCacheImpl)cache);
-      if(clientHealthMonitoringRegion != null) {
-        String [] clients = (String[])clientHealthMonitoringRegion.keySet().toArray(new String[0]);
-        for (int i = 0; i < clients.length; i++) {
-          String clientId = clients[i];
-          ClientHealthStats stats = (ClientHealthStats)clientHealthMonitoringRegion.get(clientId);
-          setClientHealthStats(clientId, stats);
-        } 
-      }
-    }
-  }
-  
-	/**
-	 * returning  Map of client queue size against client Id
-	 *  
-	 * param clientMap is a  Map of client queue size against ClientProxyMembershipID
-	 */
-	private Map getClientIDMap(Map ClientProxyMembershipIDMap) {
-	   Map clientIdMap = new HashMap();
-	   Set entrySet = ClientProxyMembershipIDMap.entrySet();
-	   Iterator entries = entrySet.iterator();
-	   while (entries.hasNext()) {
-             Map.Entry entry = (Map.Entry)entries.next();
-             ClientProxyMembershipID key = (ClientProxyMembershipID)entry.getKey();
-             Integer size = (Integer)entry.getValue();
-             clientIdMap.put(key.getDSMembership(), size);
-	   }
-           return clientIdMap;
-	  }
-
-  protected void initializeClient() {
-    Map poolMap = PoolManager.getAll();
-    if (poolMap.size() == 0) {
-      setIsClient(false);
-    } else {
-      setIsClient(true);
-
-      // Get connected servers.
-      // The following method returns a map of server name to a count of logical
-      // connections. A logical connection will be made for each region that
-      // references the live server. If the client is not connected to the server,
-      // the logical connections for that server will be 0. For now, keep track
-      // of the keys (server names) of this map in the sets of _connectedServers
-      // and _unconnectedServers.
-      Map connectedServers = InternalClientMembership.getConnectedServers();
-      if (!connectedServers.isEmpty()) {
-        Iterator connected = connectedServers.entrySet().iterator();
-        while (connected.hasNext()) {
-          Map.Entry entry = (Map.Entry) connected.next();
-          String server = (String) entry.getKey();
-//          Integer connections = (Integer) entry.getValue();
-//          if (connections.intValue()==0) {
-//            addUnconnectedServer(server);
-//          } else {
-            addConnectedServer(server);
-//          }
-          //System.out.println(connections.size() + " logical connnections to server " + server);
-        }
-      }
-    }
-  }
-
-  protected void initializeAll(DistributedSystem distributedSystem) {
-    // Initialize isConnected
-    setIsConnected(true);
-
-    // Initialize distributed system status
-    initializeDistributedSystem(distributedSystem);
-
-    // Initialize peers
-    initializePeers(distributedSystem);
-
-    // Initialize memory
-    initializeMemory();
-  }
-
-  protected void initializeDistributedSystem(DistributedSystem distributedSystem) {
-    InternalDistributedSystem ids = (InternalDistributedSystem) distributedSystem;
-    setMemberId(ids.getMemberId());
-    DistributionConfig config = ids.getConfig();
-    setMemberName(config.getName());
-    setMcastPort(config.getMcastPort());
-    setMcastAddress(config.getMcastAddress());
-    String bindAddress = config.getBindAddress();
-    setBindAddress(bindAddress);
-    setLocators(config.getLocators());
-    setUpTime(System.currentTimeMillis() - ids.getStartTime());
-    try {
-      setHostAddress((bindAddress != null && bindAddress.length() > 0)
-        ? InetAddress.getByName(bindAddress)
-        : SocketCreator.getLocalHost());
-    } catch (IOException e) {/*ignore - leave null host address*/}
-  }
-
-  protected void initializePeers(DistributedSystem distributedSystem) {
-    InternalDistributedSystem ids = (InternalDistributedSystem) distributedSystem;
-    DM dm = ids.getDistributionManager();
-    Set connections = dm.getOtherNormalDistributionManagerIds();
-    Set connectionsIDs = new HashSet(connections.size());
-    for (Iterator iter=connections.iterator(); iter.hasNext() ; ) {
-      InternalDistributedMember idm = (InternalDistributedMember)iter.next();
-      connectionsIDs.add(idm.getId());
-    }
-    setConnectedPeers(connectionsIDs);
-  }
-
-  protected void initializeMemory() {
-    //InternalDistributedSystem system = (InternalDistributedSystem) region.getCache().getDistributedSystem();
-    //GemFireStatSampler sampler = system.getStatSampler();
-    //VMStatsContract statsContract = sampler.getVMStats();
-
-    Runtime rt = Runtime.getRuntime();
-    setMaximumHeapSize(rt.maxMemory());
-    setFreeHeapSize(rt.freeMemory());
-  }
-
-  protected void initializeRegionSizes() {
-    Iterator rootRegions = cache.rootRegions().iterator();
-
-    while (rootRegions.hasNext()) {
-      LocalRegion rootRegion = (LocalRegion) rootRegions.next();
-      if (!(rootRegion instanceof HARegion)) {
-        RegionStatus rootRegionStatus = rootRegion instanceof PartitionedRegion
-          ? new PartitionedRegionStatus((PartitionedRegion) rootRegion)
-          : new RegionStatus(rootRegion);
-        putRegionStatus(rootRegion.getFullPath(), rootRegionStatus);
-        Iterator subRegions = rootRegion.subregions(true).iterator();
-        while (subRegions.hasNext()) {
-          LocalRegion subRegion = (LocalRegion) subRegions.next();
-          RegionStatus subRegionStatus = subRegion instanceof PartitionedRegion
-            ? new PartitionedRegionStatus((PartitionedRegion) subRegion)
-            : new RegionStatus(subRegion);
-          putRegionStatus(subRegion.getFullPath(), subRegionStatus);
-        }
-      }
-    }
-  }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bd8ef7f/geode-core/src/main/java/org/apache/geode/admin/ManagedEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/ManagedEntity.java b/geode-core/src/main/java/org/apache/geode/admin/ManagedEntity.java
deleted file mode 100644
index 0b4851e..0000000
--- a/geode-core/src/main/java/org/apache/geode/admin/ManagedEntity.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geode.admin;
-
-/**
- * A entity that can be managed with the GemFire administration API.
- *
- * @see ManagedEntityConfig
- *
- * @since GemFire 4.0
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- */
-public interface ManagedEntity {
-
-  /**
-   * Starts this managed entity.  Note that this method may return
-   * before the managed entity is actually started.
-   *
-   * @throws AdminException
-   *         If a problem is encountered while starting this managed
-   *         entity. 
-   * @throws IllegalStateException
-   *         If this managed entity resides on a remote machine and a
-   *         <code>null</code> or empty (<code>""</code>) {@linkplain
-   *         ManagedEntityConfig#getRemoteCommand remote command} has
-   *         been specified.
-   *
-   * @see #waitToStart
-   */
-  public void start() throws AdminException;
-
-  /**
-   * Stops this managed entity.  Note that this method may return
-   * before the managed entity is actually stopped.
-   *
-   * @throws AdminException
-   *         If a problem is encountered while stopping this managed
-   *         entity. 
-   * @throws IllegalStateException
-   *         If this managed entity resides on a remote machine and a
-   *         <code>null</code> or empty (<code>""</code>) {@linkplain
-   *         ManagedEntityConfig#getRemoteCommand remote command} has
-   *         been specified.
-   *
-   * @see #waitToStop
-   */
-  public void stop() throws AdminException;
-
-  /**
-   * Waits for up to a given number of milliseconds for this managed
-   * entity to {@linkplain #start start}.
-   *
-   * @param timeout
-   *        The number of milliseconds to wait for this managed entity
-   *        to start.
-   *
-   * @return Whether or not the entity has started.
-   *         <code>false</code>, if the method times out.
-   *
-   * @throws InterruptedException
-   *         If the thread invoking this method is interrupted while
-   *         waiting. 
-   */
-  public boolean waitToStart(long timeout)
-    throws InterruptedException;
-
-  /**
-   * Waits for up to a given number of milliseconds for this managed
-   * entity to {@linkplain #stop stop}.
-   *
-   * @param timeout
-   *        The number of milliseconds to wait for this managed entity
-   *        to stop.
-   *
-   * @return Whether or not the entity has stopped.
-   *         <code>false</code>, if the method times out.
-   *
-   * @throws InterruptedException
-   *         If the thread invoking this method is interrupted while
-   *         waiting. 
-   */
-  public boolean waitToStop(long timeout)
-    throws InterruptedException;
-
-  /**
-   * Returns whether or not this managed entity is running.  Note that
-   * this operation may attempt to contact the managed entity.
-   *
-   * @throws IllegalStateException
-   *         If this managed entity resides on a remote machine and a
-   *         <code>null</code> or empty (<code>""</code>) {@linkplain
-   *         ManagedEntityConfig#getRemoteCommand remote command} has
-   *         been specified.
-   */
-  public boolean isRunning();
-
-  /**
-   * Returns the tail of this manage entity's log file.  Note that not
-   * all managed entities implement this functionality.
-   *
-   * @throws AdminException
-   *         If a problem is encountered while getting the log of this
-   *         managed entity.
-   * @throws UnsupportedOperationException
-   *         If this managed entity does not support retrieving its
-   *         log.
-   */
-  public String getLog() throws AdminException;
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bd8ef7f/geode-core/src/main/java/org/apache/geode/admin/ManagedEntityConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/ManagedEntityConfig.java b/geode-core/src/main/java/org/apache/geode/admin/ManagedEntityConfig.java
deleted file mode 100644
index 9a95b44..0000000
--- a/geode-core/src/main/java/org/apache/geode/admin/ManagedEntityConfig.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geode.admin;
-
-/**
- * Common configuration for all entities that can be managed using the
- * GemFire administration API.  Note that once a managed entity has
- * been {@linkplain ManagedEntity#start started}, attempts to modify
- * its configuration will cause an {@link IllegalStateException} to be
- * thrown.
- *
- * @see ManagedEntity
- *
- * @since GemFire 4.0
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- */
-public interface ManagedEntityConfig extends Cloneable {
-
-  /**
-   * Returns the name of the host on which the managed entity runs or
-   * will run.
-   */
-  public String getHost();
-
-  /**
-   * Sets the name of the host on which the managed entity will run.
-   */
-  public void setHost(String host);
-
-  /**
-   * Returns the name of the working directory in which the managed
-   * entity runs or will run.
-   */
-  public String getWorkingDirectory();
-
-  /**
-   * Sets the name of the working directory in which the managed
-   * entity will run.
-   */
-  public void setWorkingDirectory(String dir);
-
-  /**
-   * Returns the name of the GemFire product directory to use when
-   * administering the managed entity.
-   */
-  public String getProductDirectory();
-
-  /**
-   * Sets the name of the GemFire product directory to use when
-   * administering the managed entity.
-   */
-  public void setProductDirectory(String dir);
-
-  /**
-   * Returns the command prefix used to administer a managed entity
-   * that is hosted on a remote machine.  If the remote command is
-   * <code>null</code> (the default value), then the remote command
-   * associated with the {@linkplain
-   * AdminDistributedSystem#getRemoteCommand() distributed system}
-   * will be used.
-   */
-  public String getRemoteCommand();
-
-  /**
-   * Sets the command prefix used to administer a managed entity that
-   * is hosted on a remote machine.
-   */
-  public void setRemoteCommand(String remoteCommand);
-
-  /**
-   * Validates this configuration.
-   *
-   * @throws IllegalStateException
-   *         If a managed entity cannot be administered using this
-   *         configuration 
-   */
-  public void validate();
-
-  /**
-   * Returns a new <code>ManagedEntityConfig</code> with the same
-   * configuration as this <code>ManagedEntityConfig</code>.
-   */
-  public Object clone() throws CloneNotSupportedException; 
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bd8ef7f/geode-core/src/main/java/org/apache/geode/admin/MemberHealthConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/MemberHealthConfig.java b/geode-core/src/main/java/org/apache/geode/admin/MemberHealthConfig.java
deleted file mode 100644
index e0a90c6..0000000
--- a/geode-core/src/main/java/org/apache/geode/admin/MemberHealthConfig.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geode.admin;
-
-/**
- * Provides configuration information relating to the health of a
- * member of a GemFire distributed system.
- *
- * <P>
- *
- * If any of the following criteria is true, then a member is
- * considered to be in {@link GemFireHealth#OKAY_HEALTH OKAY_HEALTH}.
- *
- * <UL>
- *
- * <LI>The size of the {@linkplain #getMaxVMProcessSize VM process} is
- * too large.</LI>
- *
- * <LI>There are too many {@linkplain #getMaxMessageQueueSize enqueued}
- * incoming/outgoing messages.</LI>
- *
- * <LI>Too many message sends {@link #getMaxReplyTimeouts timeout}
- * while waiting for a reply.</LI>
- *
- * </UL>
- *
- * If any of the following criteria is true, then a member is
- * considered to be in {@link GemFireHealth#POOR_HEALTH POOR_HEALTH}.
- *
- * <UL>
- *
- * </UL>
- *
- *
- * @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- * */
-public interface MemberHealthConfig {
-
-  /** The default maximum VM process size (in megabytes) of a health
-   * member of the distributed system. The default value is 1000. */
-  public static final long DEFAULT_MAX_VM_PROCESS_SIZE = 1000;
-
-  /** The default maximum number of enqueued incoming or outgoing
-   * messages that a healthy member of a distributed system can have.
-   * The default value is 1000. */
-  public static final long DEFAULT_MAX_MESSAGE_QUEUE_SIZE = 1000;
-
-  /** The default maximum number of message reply timeouts that can
-   * occur in a given health monitoring interval. The default value
-   * is zero. */
-  public static final long DEFAULT_MAX_REPLY_TIMEOUTS = 0;
-
-  /** The default maximum multicast retransmission ratio.  The default
-   * value is 0.20 (twenty percent of messages retransmitted)
-   */
-  public static final double DEFAULT_MAX_RETRANSMISSION_RATIO = 0.20;
-  
-  ///////////////////////  Instance Methods  ///////////////////////
-
-  /**
-   * Returns the maximum VM process size (in megabytes) of a healthy
-   * member of the distributed system.
-   *
-   * @see #DEFAULT_MAX_VM_PROCESS_SIZE
-   */
-  public long getMaxVMProcessSize();
-
-  /**
-   * Sets the maximum VM process size (in megabytes) of a healthy
-   * member of the distributed system.
-   *
-   * @see #getMaxVMProcessSize
-   */
-  public void setMaxVMProcessSize(long size);
-  
-  /**
-   * Returns the maximum number of enqueued incoming or outgoing
-   * messages that a healthy member of a distributed system can have.
-   *
-   * @see #DEFAULT_MAX_MESSAGE_QUEUE_SIZE
-   */
-  public long getMaxMessageQueueSize();
-
-  /**
-   * Sets the maximum number of enqueued incoming or outgoing
-   * messages that a healthy member of a distributed system can have.
-   *
-   * @see #getMaxMessageQueueSize
-   */
-  public void setMaxMessageQueueSize(long maxMessageQueueSize);
-
-  /**
-   * Returns the maximum number message replies that can timeout in a
-   * healthy member.
-   *
-   * @see #DEFAULT_MAX_REPLY_TIMEOUTS
-   */
-  public long getMaxReplyTimeouts();
-
-  /**
-   * Sets the maximum number message replies that can timeout in a
-   * healthy member.
-   *
-   * @see #getMaxReplyTimeouts
-   */
-  public void setMaxReplyTimeouts(long maxReplyTimeouts);
-
-  /**
-   * Returns the maximum ratio of multicast retransmissions / total multicast
-   * messages.  Retransmissions are requestor-specific (i.e., unicast), so
-   * a single lost message may result in multiple retransmissions.<p>
-   * A high retransmission ratio may indicate
-   * poor network conditions requiring reduced flow-control settings,
-   * a udp-fragment-size setting that is too high.
-   * @see #DEFAULT_MAX_RETRANSMISSION_RATIO
-   */
-  public double getMaxRetransmissionRatio();
-  
-  /**
-   * Sets the maximum ratio of multicast retransmissions / total multicast
-   * messages.
-   * @see #getMaxRetransmissionRatio
-   */
-  public void setMaxRetransmissionRatio(double ratio);
-   
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bd8ef7f/geode-core/src/main/java/org/apache/geode/admin/OperationCancelledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/OperationCancelledException.java b/geode-core/src/main/java/org/apache/geode/admin/OperationCancelledException.java
deleted file mode 100644
index d765c21..0000000
--- a/geode-core/src/main/java/org/apache/geode/admin/OperationCancelledException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geode.admin;
-
-//import org.apache.geode.GemFireException;
-
-/**
- * Thrown when an administration operation that accesses information
- * in a remote system member is cancelled.  The cancelation may occur
- * because the system member has left the distributed system.
- *
- * @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- */
-public class OperationCancelledException extends RuntimeAdminException {
-   private static final long serialVersionUID = 5474068770227602546L;
-    
-    public OperationCancelledException() {
-      super();
-    }
-    
-    public OperationCancelledException( String message ) {
-        super( message );
-    }
-    
-    public OperationCancelledException( Throwable cause ){
-      super(cause);
-    }
-    
-    public OperationCancelledException( String message, Throwable cause ) {
-      super(message, cause);
-    }
-}



Mime
View raw message