geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hiteshkhame...@apache.org
Subject [43/51] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
Date Tue, 13 Sep 2016 23:02:29 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
index 7d880ad..37e7eea 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import java.io.File;
 import java.io.IOException;
@@ -48,31 +48,31 @@ import mx4j.tools.adaptor.http.HttpAdaptor;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.GemFireException;
-import com.gemstone.gemfire.GemFireIOException;
-import com.gemstone.gemfire.LogWriter;
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.admin.AdminDistributedSystem;
-import com.gemstone.gemfire.admin.AdminException;
-import com.gemstone.gemfire.admin.jmx.Agent;
-import com.gemstone.gemfire.admin.jmx.AgentConfig;
-import com.gemstone.gemfire.admin.jmx.AgentFactory;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.i18n.StringId;
-import com.gemstone.gemfire.internal.Banner;
-import com.gemstone.gemfire.internal.GemFireVersion;
-import com.gemstone.gemfire.internal.admin.remote.TailLogResponse;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.InternalLogWriter;
-import com.gemstone.gemfire.internal.logging.LogConfig;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.LogWriterFactory;
-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 com.gemstone.gemfire.internal.logging.log4j.LogWriterAppender;
-import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppenders;
+import org.apache.geode.GemFireException;
+import org.apache.geode.GemFireIOException;
+import org.apache.geode.LogWriter;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.admin.AdminDistributedSystem;
+import org.apache.geode.admin.AdminException;
+import org.apache.geode.admin.jmx.Agent;
+import org.apache.geode.admin.jmx.AgentConfig;
+import org.apache.geode.admin.jmx.AgentFactory;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.i18n.StringId;
+import org.apache.geode.internal.Banner;
+import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.admin.remote.TailLogResponse;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.InternalLogWriter;
+import org.apache.geode.internal.logging.LogConfig;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.LogWriterFactory;
+import org.apache.geode.internal.logging.LoggingThreadGroup;
+import org.apache.geode.internal.logging.log4j.AlertAppender;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.logging.log4j.LogWriterAppender;
+import org.apache.geode.internal.logging.log4j.LogWriterAppenders;
 
 /**
  * The GemFire JMX Agent provides the ability to administrate one GemFire
@@ -81,8 +81,8 @@ import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppenders;
  * @since GemFire     3.5
  */
 public class AgentImpl
-implements com.gemstone.gemfire.admin.jmx.Agent,
-           com.gemstone.gemfire.admin.jmx.internal.ManagedResource {
+implements org.apache.geode.admin.jmx.Agent,
+           org.apache.geode.admin.jmx.internal.ManagedResource {
 
   private static final Logger logger = LogService.getLogger();
   
@@ -185,7 +185,7 @@ implements com.gemstone.gemfire.admin.jmx.Agent,
    * Constructs a new Agent using the specified configuration.
    *
    * @param agentConfig instance of configuration for Agent
-   * @throws com.gemstone.gemfire.admin.AdminException TODO-javadocs
+   * @throws org.apache.geode.admin.AdminException TODO-javadocs
    * @throws IllegalArgumentException if agentConfig is null
    */
   public AgentImpl(AgentConfigImpl agentConfig)
@@ -861,13 +861,13 @@ implements com.gemstone.gemfire.admin.jmx.Agent,
    * Adds a ShutdownHook to the Agent for cleaning up any resources
    */
   private void addShutdownHook() {
-    if( ! Boolean.getBoolean( com.gemstone.gemfire.distributed.internal.InternalDistributedSystem.DISABLE_SHUTDOWN_HOOK_PROPERTY)) {
+    if( ! Boolean.getBoolean( org.apache.geode.distributed.internal.InternalDistributedSystem.DISABLE_SHUTDOWN_HOOK_PROPERTY)) {
       Runtime.getRuntime().addShutdownHook(shutdownHook);
     }
   }
 
   private void removeShutdownHook() {
-    if( ! Boolean.getBoolean( com.gemstone.gemfire.distributed.internal.InternalDistributedSystem.DISABLE_SHUTDOWN_HOOK_PROPERTY)) {
+    if( ! Boolean.getBoolean( org.apache.geode.distributed.internal.InternalDistributedSystem.DISABLE_SHUTDOWN_HOOK_PROPERTY)) {
       Runtime.getRuntime().removeShutdownHook(shutdownHook);
     }
   }
@@ -876,7 +876,7 @@ implements com.gemstone.gemfire.admin.jmx.Agent,
    * Creates a LogWriterI18n for this Agent to use in logging.
    */
   @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE", justification="Return value for file delete is not important here.") 
-  private void initLogWriter() throws com.gemstone.gemfire.admin.AdminException {
+  private void initLogWriter() throws org.apache.geode.admin.AdminException {
     final LogConfig logConfig = this.agentConfig.createLogConfig();
     
     // LOG: create logWriterAppender here
@@ -1031,7 +1031,7 @@ implements com.gemstone.gemfire.admin.jmx.Agent,
    * @param config
    */
   private AdminDistributedSystem createDistributedSystem(AgentConfigImpl config)
-  throws com.gemstone.gemfire.admin.AdminException {
+  throws org.apache.geode.admin.AdminException {
     return new AdminDistributedSystemJmxImpl(config);
   }
 
@@ -1043,7 +1043,7 @@ implements com.gemstone.gemfire.admin.jmx.Agent,
    * Command-line main for running the GemFire Management Agent.
    * <p>
    * Accepts command-line arguments matching the options in {@link AgentConfig}
-   * and {@link com.gemstone.gemfire.admin.DistributedSystemConfig}.
+   * and {@link org.apache.geode.admin.DistributedSystemConfig}.
    * <p>
    * <code>AgentConfig</code> will convert -Jarguments to System properties.
    */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
index e864f73..b87792d 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -39,20 +39,20 @@ import java.util.TreeMap;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.GemFireException;
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.admin.AdminException;
-import com.gemstone.gemfire.admin.jmx.Agent;
-import com.gemstone.gemfire.admin.jmx.AgentConfig;
-import com.gemstone.gemfire.admin.jmx.AgentFactory;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.internal.OSProcess;
-import com.gemstone.gemfire.internal.PureJavaMode;
-import com.gemstone.gemfire.internal.net.SocketCreator;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.util.IOUtils;
-import com.gemstone.gemfire.internal.util.JavaCommandBuilder;
+import org.apache.geode.GemFireException;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.admin.AdminException;
+import org.apache.geode.admin.jmx.Agent;
+import org.apache.geode.admin.jmx.AgentConfig;
+import org.apache.geode.admin.jmx.AgentFactory;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.internal.OSProcess;
+import org.apache.geode.internal.PureJavaMode;
+import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.internal.util.JavaCommandBuilder;
 
 /**
  * A command line utility inspired by the <code>CacheServerLauncher</code> that is responsible for administering

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java
index e203f5b..e08f3a5 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -34,25 +34,25 @@ import javax.naming.OperationNotSupportedException;
 import org.apache.commons.modeler.ManagedBean;
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.admin.AdminException;
-import com.gemstone.gemfire.admin.CacheServerConfig;
-import com.gemstone.gemfire.admin.CacheVmConfig;
-import com.gemstone.gemfire.admin.ConfigurationParameter;
-import com.gemstone.gemfire.admin.StatisticResource;
-import com.gemstone.gemfire.admin.SystemMemberCache;
-import com.gemstone.gemfire.admin.SystemMemberCacheEvent;
-import com.gemstone.gemfire.admin.SystemMemberRegionEvent;
-import com.gemstone.gemfire.admin.internal.CacheServerImpl;
-import com.gemstone.gemfire.admin.internal.ConfigurationParameterImpl;
-import com.gemstone.gemfire.internal.admin.ClientMembershipMessage;
-import com.gemstone.gemfire.internal.admin.GemFireVM;
-import com.gemstone.gemfire.internal.admin.StatResource;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
+import org.apache.geode.admin.AdminException;
+import org.apache.geode.admin.CacheServerConfig;
+import org.apache.geode.admin.CacheVmConfig;
+import org.apache.geode.admin.ConfigurationParameter;
+import org.apache.geode.admin.StatisticResource;
+import org.apache.geode.admin.SystemMemberCache;
+import org.apache.geode.admin.SystemMemberCacheEvent;
+import org.apache.geode.admin.SystemMemberRegionEvent;
+import org.apache.geode.admin.internal.CacheServerImpl;
+import org.apache.geode.admin.internal.ConfigurationParameterImpl;
+import org.apache.geode.internal.admin.ClientMembershipMessage;
+import org.apache.geode.internal.admin.GemFireVM;
+import org.apache.geode.internal.admin.StatResource;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
 
 /**
  * MBean representation of a {@link
- * com.gemstone.gemfire.admin.CacheVm}. 
+ * org.apache.geode.admin.CacheVm}. 
  *
  * @since GemFire 4.0
  */
@@ -303,7 +303,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
   // -------------------------------------------------------------------------
 
   public void refreshConfig()
-    throws com.gemstone.gemfire.admin.AdminException {
+    throws org.apache.geode.admin.AdminException {
     // 1st call to refreshConfig would trigger 
     // the auto-refresh if an interval is set
     if (this.refreshInterval>0) {
@@ -430,7 +430,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
    */
   @Override
   protected StatisticResource createStatisticResource(StatResource stat)
-    throws com.gemstone.gemfire.admin.AdminException {
+    throws org.apache.geode.admin.AdminException {
     StatisticResourceJmxImpl managedStatisticResource = null;
     
     synchronized (this.managedStatisticsResourcesMap) {
@@ -462,7 +462,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
    */
   @Override
   protected SystemMemberCache createSystemMemberCache(GemFireVM vm)
-    throws com.gemstone.gemfire.admin.AdminException {
+    throws org.apache.geode.admin.AdminException {
     if (managedSystemMemberCache == null) {
       managedSystemMemberCache = new SystemMemberCacheJmxImpl(vm);
     }
@@ -481,7 +481,7 @@ public class CacheServerJmxImpl extends CacheServerImpl
    *         with the new attributes added
    */
   public ManagedBean addDynamicAttributes(ManagedBean managed) 
-  throws com.gemstone.gemfire.admin.AdminException {
+  throws org.apache.geode.admin.AdminException {
     return Helper.addDynamicAttributes(this, managed);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigAttributeInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigAttributeInfo.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigAttributeInfo.java
index 7dba8d9..9f7f940 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigAttributeInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigAttributeInfo.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
-//import com.gemstone.gemfire.admin.ConfigurationParameter;
-import com.gemstone.gemfire.internal.Assert;
+//import org.apache.geode.admin.ConfigurationParameter;
+import org.apache.geode.internal.Assert;
 
 import javax.management.Descriptor;
 import javax.management.modelmbean.DescriptorSupport;
@@ -25,7 +25,7 @@ import javax.management.modelmbean.ModelMBeanAttributeInfo;
 
 /** 
  * Subclass of AttributeInfo with {@link 
- * com.gemstone.gemfire.admin.ConfigurationParameter} added for use as the 
+ * org.apache.geode.admin.ConfigurationParameter} added for use as the 
  * {@link javax.management.modelmbean.ModelMBeanAttributeInfo} descriptor's 
  * <i>targetObject</i> value.
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
index 20796c7..a318eb5 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import java.io.IOException;
 import java.io.Serializable;
 
 import org.apache.logging.log4j.Level;
 
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.admin.UnmodifiableConfigurationException;
-import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.admin.UnmodifiableConfigurationException;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Provides MBean support for managing accessing a ConfigurationParameter.
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  *
  */
 public class ConfigurationParameterJmxImpl
-extends com.gemstone.gemfire.admin.internal.ConfigurationParameterImpl
+extends org.apache.geode.admin.internal.ConfigurationParameterImpl
 implements Serializable {
 
   private static final long serialVersionUID = -7822171853906772375L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
index 5babbcd..18c3fd5 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
-import com.gemstone.gemfire.admin.*;
-import com.gemstone.gemfire.admin.internal.*;
-//import com.gemstone.gemfire.internal.admin.*;
+import org.apache.geode.admin.*;
+import org.apache.geode.admin.internal.*;
+//import org.apache.geode.internal.admin.*;
 import javax.management.*;
 import javax.management.modelmbean.*;
 //import org.apache.commons.modeler.ManagedBean;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
index f264f21..ad60682 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
-//import com.gemstone.gemfire.admin.AdminException;
-//import com.gemstone.gemfire.admin.DistributionLocator;
-import com.gemstone.gemfire.admin.DistributionLocatorConfig;
-import com.gemstone.gemfire.admin.internal.AdminDistributedSystemImpl;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-//import com.gemstone.gemfire.internal.Assert;
+//import org.apache.geode.admin.AdminException;
+//import org.apache.geode.admin.DistributionLocator;
+import org.apache.geode.admin.DistributionLocatorConfig;
+import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+//import org.apache.geode.internal.Assert;
 
 //import org.apache.commons.modeler.ManagedBean;
 //import org.apache.commons.modeler.AttributeInfo;
@@ -47,8 +47,8 @@ import javax.management.modelmbean.ModelMBean;
  *
  */
 public class DistributionLocatorJmxImpl 
-extends com.gemstone.gemfire.admin.internal.DistributionLocatorImpl
-implements com.gemstone.gemfire.admin.jmx.internal.ManagedResource,
+extends org.apache.geode.admin.internal.DistributionLocatorImpl
+implements org.apache.geode.admin.jmx.internal.ManagedResource,
            DistributionLocatorConfig {
 
   /** The JMX object name of this managed resource */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DynamicManagedBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DynamicManagedBean.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DynamicManagedBean.java
index 67bb0ec..1b62fb0 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DynamicManagedBean.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DynamicManagedBean.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthConfigJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthConfigJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthConfigJmxImpl.java
index dce9e5d..f1bfa55 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthConfigJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthConfigJmxImpl.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import javax.management.ObjectName;
 import javax.management.modelmbean.ModelMBean;
 
-import com.gemstone.gemfire.admin.AdminException;
-import com.gemstone.gemfire.admin.GemFireHealth;
-import com.gemstone.gemfire.admin.GemFireHealthConfig;
-import com.gemstone.gemfire.admin.internal.GemFireHealthConfigImpl;
+import org.apache.geode.admin.AdminException;
+import org.apache.geode.admin.GemFireHealth;
+import org.apache.geode.admin.GemFireHealthConfig;
+import org.apache.geode.admin.internal.GemFireHealthConfigImpl;
 
 /**
  * The JMX "managed resource" that represents the configuration for

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java
index 1cf931a..1f8d322 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
@@ -22,15 +22,15 @@ import javax.management.modelmbean.ModelMBean;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.admin.AdminException;
-import com.gemstone.gemfire.admin.DistributedSystemHealthConfig;
-import com.gemstone.gemfire.admin.GemFireHealthConfig;
-import com.gemstone.gemfire.admin.RuntimeAdminException;
-import com.gemstone.gemfire.admin.internal.GemFireHealthImpl;
-import com.gemstone.gemfire.internal.admin.GfManagerAgent;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.admin.AdminException;
+import org.apache.geode.admin.DistributedSystemHealthConfig;
+import org.apache.geode.admin.GemFireHealthConfig;
+import org.apache.geode.admin.RuntimeAdminException;
+import org.apache.geode.admin.internal.GemFireHealthImpl;
+import org.apache.geode.internal.admin.GfManagerAgent;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
 //import org.apache.commons.modeler.ManagedBean;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java
index f887a23..2c4f63e 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
-import com.gemstone.gemfire.internal.ClassPathLoader;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.ClassPathLoader;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
@@ -37,7 +37,7 @@ public class GenerateMBeanHTML extends DefaultHandler {
 
   /** The location of the DTD for the MBean descriptions */
   private static final String DTD_LOCATION =
-    "/com/gemstone/gemfire/admin/jmx/internal/doc-files/mbeans-descriptors.dtd";
+    "/org/apache/geode/admin/jmx/internal/doc-files/mbeans-descriptors.dtd";
 
 //  /** The system id of MBean description's DTD */
 //  private static final String SYSTEM_ID = 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java
index b16d2bd..d805b8a 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import java.net.URL;
 import java.util.Date;
@@ -42,14 +42,14 @@ import org.apache.commons.modeler.Registry;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.LogWriter;
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.admin.RuntimeAdminException;
-import com.gemstone.gemfire.admin.internal.AdminDistributedSystemImpl;
-import com.gemstone.gemfire.internal.ClassPathLoader;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.InternalLogWriter;
-import com.gemstone.gemfire.internal.logging.LogService;
+import org.apache.geode.LogWriter;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.admin.RuntimeAdminException;
+import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
+import org.apache.geode.internal.ClassPathLoader;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.InternalLogWriter;
+import org.apache.geode.internal.logging.LogService;
 
 /**
  * Common support for MBeans and {@link ManagedResource}s.  Static loading of
@@ -165,7 +165,7 @@ public class MBeanUtil {
         }
         registry.setMBeanServer(mbeanServer);
   
-        String mbeansResource = getOSPath("/com/gemstone/gemfire/admin/jmx/mbeans-descriptors.xml");
+        String mbeansResource = getOSPath("/org/apache/geode/admin/jmx/mbeans-descriptors.xml");
         //System.out.println(LocalizedStrings.MBeanUtil_LOADING_RESOURCE_0.toLocalizedString(mbeansResource));
         
         URL url = ClassPathLoader.getLatest().getResource(MBeanUtil.class, mbeansResource);
@@ -294,7 +294,7 @@ public class MBeanUtil {
     
     // customize the defn...
     managed.setClassName(
-        "com.gemstone.gemfire.admin.jmx.internal.MX4JModelMBean");
+        "org.apache.geode.admin.jmx.internal.MX4JModelMBean");
 
     return managed;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
index 81f956f..81f543d 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
@@ -6,7 +6,7 @@
  * See the terms of the MX4J License in the documentation provided with this software.
  */
 
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -58,7 +58,7 @@ import mx4j.persist.MBeanPersister;
 import mx4j.persist.PersisterMBean;
 import mx4j.util.Utils;
 
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * @author <a href="mailto:biorn_steedom@users.sourceforge.net">Simone Bordet</a>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
index bf6ff5e..474f8dd 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
-import com.gemstone.gemfire.admin.DistributedSystemConfig;
-import com.gemstone.gemfire.admin.internal.InetAddressUtil;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.internal.net.SocketCreator;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.net.SocketCreatorFactory;
+import org.apache.geode.admin.DistributedSystemConfig;
+import org.apache.geode.admin.internal.InetAddressUtil;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.net.SocketCreatorFactory;
 
 import org.apache.logging.log4j.Logger;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java
index 53a50d6..1786406 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -30,10 +30,10 @@ import javax.mail.internet.MimeMessage;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 /**
  * Provides the ways to send emails to all the registered email id It also

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
index f2ecba5..2496013 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import javax.management.ObjectName;
 import javax.management.modelmbean.ModelMBean;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java
index 65a908e..cf9b792 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -31,47 +31,47 @@ public class ManagedResourceType implements java.io.Serializable {
   
   /** Agent managed resource type */
   public static final ManagedResourceType AGENT = 
-      new ManagedResourceType("Agent", com.gemstone.gemfire.admin.jmx.Agent.class);
+      new ManagedResourceType("Agent", org.apache.geode.admin.jmx.Agent.class);
 
   /** DistributedSystem managed resource type */
   public static final ManagedResourceType DISTRIBUTED_SYSTEM = 
-      new ManagedResourceType("AdminDistributedSystem", com.gemstone.gemfire.admin.AdminDistributedSystem.class);
+      new ManagedResourceType("AdminDistributedSystem", org.apache.geode.admin.AdminDistributedSystem.class);
 
   /** SystemMember managed resource type */
   public static final ManagedResourceType SYSTEM_MEMBER = 
-      new ManagedResourceType("SystemMember", com.gemstone.gemfire.admin.SystemMember.class);
+      new ManagedResourceType("SystemMember", org.apache.geode.admin.SystemMember.class);
 
   /** SystemMemberCache managed resource type */
   public static final ManagedResourceType SYSTEM_MEMBER_CACHE = 
-      new ManagedResourceType("SystemMemberCache", com.gemstone.gemfire.admin.SystemMemberCache.class);
+      new ManagedResourceType("SystemMemberCache", org.apache.geode.admin.SystemMemberCache.class);
 
   /** SystemMemberCache managed resource type */
   public static final ManagedResourceType SYSTEM_MEMBER_REGION = 
-      new ManagedResourceType("SystemMemberRegion", com.gemstone.gemfire.admin.SystemMemberRegion.class);
+      new ManagedResourceType("SystemMemberRegion", org.apache.geode.admin.SystemMemberRegion.class);
 
   /** SystemMemberCacheServer managed resource type */
   public static final ManagedResourceType SYSTEM_MEMBER_CACHE_SERVER = 
-      new ManagedResourceType("SystemMemberCacheServer", com.gemstone.gemfire.admin.SystemMemberCacheServer.class);
+      new ManagedResourceType("SystemMemberCacheServer", org.apache.geode.admin.SystemMemberCacheServer.class);
 
   /** CacheVm managed resource type */
   public static final ManagedResourceType CACHE_VM = 
-      new ManagedResourceType("CacheVm", com.gemstone.gemfire.admin.CacheVm.class);
+      new ManagedResourceType("CacheVm", org.apache.geode.admin.CacheVm.class);
 
   /** StatisticResource managed resource type */
   public static final ManagedResourceType STATISTIC_RESOURCE = 
-      new ManagedResourceType("StatisticResource", com.gemstone.gemfire.admin.StatisticResource.class);
+      new ManagedResourceType("StatisticResource", org.apache.geode.admin.StatisticResource.class);
 
   public static final ManagedResourceType GEMFIRE_HEALTH = 
-      new ManagedResourceType("GemFireHealth", com.gemstone.gemfire.admin.GemFireHealth.class);
+      new ManagedResourceType("GemFireHealth", org.apache.geode.admin.GemFireHealth.class);
 
   public static final ManagedResourceType DISTRIBUTED_SYSTEM_HEALTH_CONFIG = 
-      new ManagedResourceType("DistributedSystemHealthConfig", com.gemstone.gemfire.admin.DistributedSystemHealthConfig.class);
+      new ManagedResourceType("DistributedSystemHealthConfig", org.apache.geode.admin.DistributedSystemHealthConfig.class);
 
   public static final ManagedResourceType GEMFIRE_HEALTH_CONFIG = 
-      new ManagedResourceType("GemFireHealthConfig", com.gemstone.gemfire.admin.GemFireHealthConfig.class);
+      new ManagedResourceType("GemFireHealthConfig", org.apache.geode.admin.GemFireHealthConfig.class);
 
   public static final ManagedResourceType DISTRIBUTION_LOCATOR = 
-      new ManagedResourceType("DistributionLocator", com.gemstone.gemfire.admin.DistributionLocator.class);
+      new ManagedResourceType("DistributionLocator", org.apache.geode.admin.DistributionLocator.class);
 
   ////////////////////  Instance Fields  ////////////////////
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
index d14e5e6..ac75f38 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
 
-import com.gemstone.gemfire.admin.*;
-import com.gemstone.gemfire.admin.jmx.Agent;
-import com.gemstone.gemfire.cache.InterestPolicy;
-import com.gemstone.gemfire.cache.SubscriptionAttributes;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.internal.GemFireVersion;
-import com.gemstone.gemfire.internal.admin.remote.ClientHealthStats;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.admin.*;
+import org.apache.geode.admin.jmx.Agent;
+import org.apache.geode.cache.InterestPolicy;
+import org.apache.geode.cache.SubscriptionAttributes;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.admin.remote.ClientHealthStats;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import mx4j.AbstractDynamicMBean;
 import org.apache.logging.log4j.Logger;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
index f9d6f87..6bf240f 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import java.io.IOException;
 import java.net.InetAddress;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
index d226bf1..f2ac079 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import java.rmi.NoSuchObjectException;
 import java.rmi.NotBoundException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java
index d5e4c72..93513e5 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import org.apache.commons.lang.StringUtils;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java
index 8a35ba9..59d7948 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.Serializable;
 import java.io.IOException;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.DataSerializable;
-import com.gemstone.gemfire.internal.DataSerializableFixedID;
-import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.internal.admin.StatAlert;
-import com.gemstone.gemfire.internal.admin.StatAlertDefinition;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.admin.StatAlert;
+import org.apache.geode.internal.admin.StatAlertDefinition;
 
 /**
  * Notification to be sent to clients (e.g GFMon2.0 ). It incorporates

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
index 94900f2..b80b18b 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
-import com.gemstone.gemfire.internal.admin.GemFireVM;
-import com.gemstone.gemfire.internal.admin.StatAlert;
-import com.gemstone.gemfire.internal.admin.StatAlertDefinition;
+import org.apache.geode.internal.admin.GemFireVM;
+import org.apache.geode.internal.admin.StatAlert;
+import org.apache.geode.internal.admin.StatAlertDefinition;
 
 /**
  * This interface represents an Aggregator entity and resides in JMXAgent.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticAttributeInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticAttributeInfo.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticAttributeInfo.java
index ddd2cfb..92c6091 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticAttributeInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticAttributeInfo.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
-import com.gemstone.gemfire.admin.Statistic;
-import com.gemstone.gemfire.internal.Assert;
+import org.apache.geode.admin.Statistic;
+import org.apache.geode.internal.Assert;
 
 import javax.management.Descriptor;
 import javax.management.modelmbean.DescriptorSupport;
 import javax.management.modelmbean.ModelMBeanAttributeInfo;
 
 /** 
- * Subclass of AttributeInfo with {@link com.gemstone.gemfire.admin.Statistic} 
+ * Subclass of AttributeInfo with {@link org.apache.geode.admin.Statistic} 
  * added for use as the {@link 
  * javax.management.modelmbean.ModelMBeanAttributeInfo} descriptor's 
  * <i>targetObject</i> value.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
index 6e79ad8..3e04500 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import javax.management.Notification;
 import javax.management.ObjectName;
@@ -24,14 +24,14 @@ import javax.naming.OperationNotSupportedException;
 import org.apache.commons.modeler.ManagedBean;
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.CancelException;
-import com.gemstone.gemfire.LogWriter;
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.admin.AdminException;
-import com.gemstone.gemfire.admin.Statistic;
-import com.gemstone.gemfire.internal.admin.StatResource;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
+import org.apache.geode.CancelException;
+import org.apache.geode.LogWriter;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.admin.AdminException;
+import org.apache.geode.admin.Statistic;
+import org.apache.geode.internal.admin.StatResource;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
 
 /**
  * Provides MBean support for the monitoring of a statistic resource.
@@ -40,9 +40,9 @@ import com.gemstone.gemfire.internal.logging.LogService;
  *
  */
 public class StatisticResourceJmxImpl 
-extends com.gemstone.gemfire.admin.internal.StatisticResourceImpl
+extends org.apache.geode.admin.internal.StatisticResourceImpl
 implements javax.management.NotificationListener, 
-           com.gemstone.gemfire.admin.jmx.internal.ManagedResource {
+           org.apache.geode.admin.jmx.internal.ManagedResource {
 
   private static final Logger logger = LogService.getLogger();
   
@@ -67,19 +67,19 @@ implements javax.management.NotificationListener,
    *
    * @param statResource  the admin StatResource to manage/monitor
    * @param member        the SystemMember owning this resource
-   * @exception com.gemstone.gemfire.admin.AdminException 
+   * @exception org.apache.geode.admin.AdminException 
    *            if unable to create this StatisticResource for administration
    */
   public StatisticResourceJmxImpl(StatResource statResource,
                                   SystemMemberJmx member)
-                           throws com.gemstone.gemfire.admin.AdminException {
+                           throws org.apache.geode.admin.AdminException {
     super(statResource, member);
     initializeMBean();
   }
 
   /** Create and register the MBean to manage this resource */
   private void initializeMBean() 
-  throws com.gemstone.gemfire.admin.AdminException {
+  throws org.apache.geode.admin.AdminException {
     this.mbeanName = new StringBuffer("GemFire.Statistic:")
                       .append("source=").append(MBeanUtil.makeCompliantMBeanNameProperty(this.member.getId()))
                       .append(",type=").append(MBeanUtil.makeCompliantMBeanNameProperty(getType()))
@@ -199,9 +199,9 @@ implements javax.management.NotificationListener,
       try {
         refresh();
 
-      } catch (com.gemstone.gemfire.admin.AdminException e) {
+      } catch (org.apache.geode.admin.AdminException e) {
         logger.warn(e.getMessage(), e);
-      } catch (com.gemstone.gemfire.admin.OperationCancelledException e) {
+      } catch (org.apache.geode.admin.OperationCancelledException e) {
         // underlying resource is no longer reachable by remote admin
         logger.warn(e.getMessage(), e);
         _setRefreshInterval(0);
@@ -240,7 +240,7 @@ implements javax.management.NotificationListener,
    *         with the new attributes added
    */
   ManagedBean addDynamicAttributes(ManagedBean managed) 
-  throws com.gemstone.gemfire.admin.AdminException {
+  throws org.apache.geode.admin.AdminException {
     if (managed == null) {
       throw new IllegalArgumentException(LocalizedStrings.StatisticResourceJmxImpl_MANAGEDBEAN_IS_NULL.toLocalizedString());
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
index ad94396..0040cb0 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
-import com.gemstone.gemfire.admin.AdminException;
-import com.gemstone.gemfire.admin.internal.SystemMemberBridgeServerImpl;
-import com.gemstone.gemfire.admin.internal.SystemMemberCacheImpl;
-import com.gemstone.gemfire.internal.admin.AdminBridgeServer;
-import com.gemstone.gemfire.internal.admin.GemFireVM;
+import org.apache.geode.admin.AdminException;
+import org.apache.geode.admin.internal.SystemMemberBridgeServerImpl;
+import org.apache.geode.admin.internal.SystemMemberCacheImpl;
+import org.apache.geode.internal.admin.AdminBridgeServer;
+import org.apache.geode.internal.admin.GemFireVM;
 
 import javax.management.ObjectName;
 import javax.management.modelmbean.ModelMBean;
 
 /**
  * MBean representation of a {@link
- * com.gemstone.gemfire.admin.SystemMemberBridgeServer}. 
+ * org.apache.geode.admin.SystemMemberBridgeServer}. 
  *
  * @since GemFire 4.0
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
index 2e32f8f..b8cc255 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -30,25 +30,25 @@ import javax.management.modelmbean.ModelMBean;
 import org.apache.commons.modeler.ManagedBean;
 import org.apache.logging.log4j.Level;
 
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.admin.AdminException;
-import com.gemstone.gemfire.admin.SystemMemberCacheServer;
-import com.gemstone.gemfire.admin.SystemMemberRegion;
-import com.gemstone.gemfire.admin.internal.SystemMemberBridgeServerImpl;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.internal.admin.AdminBridgeServer;
-import com.gemstone.gemfire.internal.admin.GemFireVM;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.InternalLogWriter;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.admin.AdminException;
+import org.apache.geode.admin.SystemMemberCacheServer;
+import org.apache.geode.admin.SystemMemberRegion;
+import org.apache.geode.admin.internal.SystemMemberBridgeServerImpl;
+import org.apache.geode.cache.Region;
+import org.apache.geode.internal.admin.AdminBridgeServer;
+import org.apache.geode.internal.admin.GemFireVM;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.InternalLogWriter;
 
 /**
- * MBean representation of {@link com.gemstone.gemfire.admin.SystemMemberCache}.
+ * MBean representation of {@link org.apache.geode.admin.SystemMemberCache}.
  *
  * @since GemFire     3.5
  */
 public class SystemMemberCacheJmxImpl 
-extends com.gemstone.gemfire.admin.internal.SystemMemberCacheImpl
-implements com.gemstone.gemfire.admin.jmx.internal.ManagedResource {
+extends org.apache.geode.admin.internal.SystemMemberCacheImpl
+implements org.apache.geode.admin.jmx.internal.ManagedResource {
 
   /** The object name of this managed resource */
   private ObjectName objectName;
@@ -68,14 +68,14 @@ implements com.gemstone.gemfire.admin.jmx.internal.ManagedResource {
    *        The vm owning the cache this object will manage
    */
   public SystemMemberCacheJmxImpl(GemFireVM vm)
-  throws com.gemstone.gemfire.admin.AdminException { 
+  throws org.apache.geode.admin.AdminException { 
     super(vm);
     initializeMBean();
   }
 
   /** Create and register the MBean to manage this resource */
   private void initializeMBean() 
-  throws com.gemstone.gemfire.admin.AdminException {
+  throws org.apache.geode.admin.AdminException {
     this.mbeanName = new StringBuffer("GemFire.Cache:")
         .append("name=")
         .append(MBeanUtil.makeCompliantMBeanNameProperty(getName()))
@@ -109,7 +109,7 @@ implements com.gemstone.gemfire.admin.jmx.internal.ManagedResource {
    */
   @Override  
   protected SystemMemberRegion createSystemMemberRegion(Region r)
-    throws com.gemstone.gemfire.admin.AdminException {
+    throws org.apache.geode.admin.AdminException {
     SystemMemberRegionJmxImpl managedSystemMemberRegion = null;
     boolean needsRefresh = false;
     synchronized (this.managedRegionResourcesMap) {
@@ -177,7 +177,7 @@ implements com.gemstone.gemfire.admin.jmx.internal.ManagedResource {
    *         with the new attributes added
    */
   ManagedBean addDynamicAttributes(ManagedBean managed)
-  throws com.gemstone.gemfire.admin.AdminException {
+  throws org.apache.geode.admin.AdminException {
     if (managed == null) {
       throw new IllegalArgumentException(LocalizedStrings.SystemMemberCacheJmxImpl_MANAGEDBEAN_IS_NULL.toLocalizedString());
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
index c57bf85..dd52a4e 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
-
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.admin.*;
-import com.gemstone.gemfire.cache.Operation;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.internal.admin.ClientMembershipMessage;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+package org.apache.geode.admin.jmx.internal;
+
+import org.apache.geode.SystemFailure;
+import org.apache.geode.admin.*;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.admin.ClientMembershipMessage;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.commons.modeler.ManagedBean;
 import org.apache.logging.log4j.Logger;
 
@@ -356,7 +356,7 @@ public interface SystemMemberJmx
         try {
           member.refreshConfig();
 
-        } catch (com.gemstone.gemfire.admin.AdminException e) {
+        } catch (org.apache.geode.admin.AdminException e) {
           logger.warn(e.getMessage(), e);
         } catch (OperationCancelledException e) {
           // underlying resource is no longer reachable by remote admin

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java
index 103dbe1..2f5fca9 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -34,21 +34,21 @@ import javax.naming.OperationNotSupportedException;
 import org.apache.commons.modeler.ManagedBean;
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.admin.AdminException;
-import com.gemstone.gemfire.admin.ConfigurationParameter;
-import com.gemstone.gemfire.admin.StatisticResource;
-import com.gemstone.gemfire.admin.SystemMemberCache;
-import com.gemstone.gemfire.admin.SystemMemberCacheEvent;
-import com.gemstone.gemfire.admin.SystemMemberRegionEvent;
-import com.gemstone.gemfire.admin.internal.ConfigurationParameterImpl;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.i18n.LogWriterI18n;
-import com.gemstone.gemfire.internal.admin.ApplicationVM;
-import com.gemstone.gemfire.internal.admin.ClientMembershipMessage;
-import com.gemstone.gemfire.internal.admin.GemFireVM;
-import com.gemstone.gemfire.internal.admin.StatResource;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
+import org.apache.geode.admin.AdminException;
+import org.apache.geode.admin.ConfigurationParameter;
+import org.apache.geode.admin.StatisticResource;
+import org.apache.geode.admin.SystemMemberCache;
+import org.apache.geode.admin.SystemMemberCacheEvent;
+import org.apache.geode.admin.SystemMemberRegionEvent;
+import org.apache.geode.admin.internal.ConfigurationParameterImpl;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.i18n.LogWriterI18n;
+import org.apache.geode.internal.admin.ApplicationVM;
+import org.apache.geode.internal.admin.ClientMembershipMessage;
+import org.apache.geode.internal.admin.GemFireVM;
+import org.apache.geode.internal.admin.StatResource;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
 
 /**
  * Provides MBean support for managing a SystemMember application.
@@ -61,9 +61,9 @@ import com.gemstone.gemfire.internal.logging.LogService;
  *
  */
 public class SystemMemberJmxImpl 
-extends com.gemstone.gemfire.admin.internal.SystemMemberImpl
+extends org.apache.geode.admin.internal.SystemMemberImpl
 implements SystemMemberJmx, javax.management.NotificationListener,
-           com.gemstone.gemfire.admin.jmx.internal.ManagedResource {
+           org.apache.geode.admin.jmx.internal.ManagedResource {
 
   private static final Logger logger = LogService.getLogger();
   
@@ -95,7 +95,7 @@ implements SystemMemberJmx, javax.management.NotificationListener,
    */
   public SystemMemberJmxImpl(AdminDistributedSystemJmxImpl system,
                              ApplicationVM application)
-                      throws com.gemstone.gemfire.admin.AdminException { 
+                      throws org.apache.geode.admin.AdminException { 
     super(system, application);
     initializeMBean();
   }
@@ -123,7 +123,7 @@ implements SystemMemberJmx, javax.management.NotificationListener,
 
   /** Create and register the MBean to manage this resource */
   private void initializeMBean() 
-  throws com.gemstone.gemfire.admin.AdminException {
+  throws org.apache.geode.admin.AdminException {
     //initialize Managed Resources for stats & cache first.
 //    initializeManagedResources();
 
@@ -194,7 +194,7 @@ implements SystemMemberJmx, javax.management.NotificationListener,
   //   MBean Operations
   // -------------------------------------------------------------------------
 
-  public void refreshConfig() throws com.gemstone.gemfire.admin.AdminException {
+  public void refreshConfig() throws org.apache.geode.admin.AdminException {
     // 1st call to refreshConfig would trigger
     // the auto-refresh if an interval is set
     if (this.refreshInterval > 0) {
@@ -324,7 +324,7 @@ implements SystemMemberJmx, javax.management.NotificationListener,
    */
   @Override
   protected StatisticResource createStatisticResource(StatResource stat)
-    throws com.gemstone.gemfire.admin.AdminException {
+    throws org.apache.geode.admin.AdminException {
     StatisticResourceJmxImpl managedStatisticResource = null;
     
     synchronized (this.managedStatisticsResourcesMap) {
@@ -356,7 +356,7 @@ implements SystemMemberJmx, javax.management.NotificationListener,
    */
   @Override
   protected SystemMemberCache createSystemMemberCache(GemFireVM vm)
-    throws com.gemstone.gemfire.admin.AdminException {
+    throws org.apache.geode.admin.AdminException {
     if (managedSystemMemberCache == null) {
       managedSystemMemberCache = new SystemMemberCacheJmxImpl(vm);
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberRegionJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberRegionJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberRegionJmxImpl.java
index d7b4d5b..9ee3153 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberRegionJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberRegionJmxImpl.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin.jmx.internal;
+package org.apache.geode.admin.jmx.internal;
 
-import com.gemstone.gemfire.admin.internal.SystemMemberCacheImpl;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.internal.admin.GemFireVM;
+import org.apache.geode.admin.internal.SystemMemberCacheImpl;
+import org.apache.geode.cache.Region;
+import org.apache.geode.internal.admin.GemFireVM;
 
 import javax.management.ObjectName;
 import javax.management.modelmbean.ModelMBean;
 
 /**
  * MBean representation of {@link 
- * com.gemstone.gemfire.admin.SystemMemberRegion}.
+ * org.apache.geode.admin.SystemMemberRegion}.
  *
  * @since GemFire     3.5
  */
 public class SystemMemberRegionJmxImpl 
-extends com.gemstone.gemfire.admin.internal.SystemMemberRegionImpl
-implements com.gemstone.gemfire.admin.jmx.internal.ManagedResource {
+extends org.apache.geode.admin.internal.SystemMemberRegionImpl
+implements org.apache.geode.admin.jmx.internal.ManagedResource {
 
   /** The object name of this managed resource */
   private ObjectName objectName;
@@ -48,14 +48,14 @@ implements com.gemstone.gemfire.admin.jmx.internal.ManagedResource {
    */
   public SystemMemberRegionJmxImpl(SystemMemberCacheImpl cache, 
                                    Region region)
-                            throws com.gemstone.gemfire.admin.AdminException {
+                            throws org.apache.geode.admin.AdminException {
     super(cache, region);
     initializeMBean(cache);
   }
 
   /** Create and register the MBean to manage this resource */
   private void initializeMBean(SystemMemberCacheImpl cache)
-  throws com.gemstone.gemfire.admin.AdminException {
+  throws org.apache.geode.admin.AdminException {
     
     GemFireVM vm = cache.getVM();
     this.mbeanName = new StringBuffer("GemFire.Cache:")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/package.html
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/package.html b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/package.html
index 1700ab7..bc2b2f2 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/package.html
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/package.html
@@ -18,7 +18,7 @@ limitations under the License.
 <BODY>
 
 <P>Contains the implementation of the external JMX APIs from
-<a href="{@docRoot}/com/gemstone/gemfire/admin/jmx/package-summary.html#package_description">com.gemstone.gemfire.admin.jmx</a>.</P>
+<a href="{@docRoot}/org/apache/geode/admin/jmx/package-summary.html#package_description">org.apache.geode.admin.jmx</a>.</P>
 
 <H2>JMX Support in GemFire</H2>
 
@@ -33,7 +33,7 @@ Our goal was to provide JMX administrative support in GemFire.  The design was i
 
 From a functional stand point, the JMX support was supposed to provide most of the same administrative and operational monitoring that the console already provides.  In some cases we limited the functionality due to security concerns and in others because it was hard to express the features as JMX beans.  The JMX Agent also provides some functionality (such as Health monitoring) that is not currently in the console.
 <p>
-The Agent communicates with the distributed system using the same distribution manager {@link com.gemstone.gemfire.distributed.internal.DistributionManager} as the console uses and thus has the same requirements that determine what distributed system it can manage.  Although the Console currently supports managing multiple distributed systems, we decided that a given Agent should only be able to manage a single system.  We have not tested the use of more than one Agent for the same system, however nothing currently prohibits this.
+The Agent communicates with the distributed system using the same distribution manager {@link org.apache.geode.distributed.internal.DistributionManager} as the console uses and thus has the same requirements that determine what distributed system it can manage.  Although the Console currently supports managing multiple distributed systems, we decided that a given Agent should only be able to manage a single system.  We have not tested the use of more than one Agent for the same system, however nothing currently prohibits this.
 <p>
 We decided to develop a simple public Admin API which in essence wraps the internal.admin API that the Console currently uses extensively.  The Admin API also contains implementations of new functionality not in internal.admin.  Our JMX support is an extension to this Admin API.  In an overly simplified view, the GemFire JMX MBeans are ModelMBeans that manage instances of the Admin API objects housed in the Agent's MBeanServer.
 <p>
@@ -43,39 +43,39 @@ The two server connectors we selected are the HttpAdaptor and the RMI Connector.
 <p>
 Two open-source JMX implementations made it to our final review for consideration: <a href="http://www.xmojo.org">XMOJO</a> and <a href="http://www.mx4j.org">MX4J</a>.  The decision to go with MX4J was based mainly on our perceptions of MX4J being more active and widespread in use.  Additionally, XMOJO is associated with <a href="http://www.adventnet.com/">AdventNet</a> which produces commercial products.  This made MX4J seem more true to open-source and safer from corporate tampering.
 <p>
-ModelMBeans are very dynamic and capable of managing aggregate resources.  Use of a ModelMBean entails specifying meta-data to an instance of javax.management.modelmbean.RequiredModelMBean.  This meta-data identifies the manageble resource(s) which can consist of a single object, or many objects, including those in one VM or in any number of distributed VMs.  We decided to subclass classes in the Admin API in order to massage them a little and make them easier to use as a managed resource by the ModelMBean.  For example, com.gemstone.gemfire.admin.GemFireManager represents a type of member in a GemFire system which manages shared memory.  When an MBean is registered for managing the GemFireManager, the JMX Agent instantiates a "JMX friendlier" subclass: com.gemstone.gemfire.admin.jmx.internal.GemFireMangerJmxImpl.  Comparison of this class with the non-JMX super class com.gemstone.gemfire.admin.internal.GemFireManagerImpl will illustrate what "JMX friendly" means better than trying 
 to explain it here...
+ModelMBeans are very dynamic and capable of managing aggregate resources.  Use of a ModelMBean entails specifying meta-data to an instance of javax.management.modelmbean.RequiredModelMBean.  This meta-data identifies the manageble resource(s) which can consist of a single object, or many objects, including those in one VM or in any number of distributed VMs.  We decided to subclass classes in the Admin API in order to massage them a little and make them easier to use as a managed resource by the ModelMBean.  For example, org.apache.geode.admin.GemFireManager represents a type of member in a GemFire system which manages shared memory.  When an MBean is registered for managing the GemFireManager, the JMX Agent instantiates a "JMX friendlier" subclass: org.apache.geode.admin.jmx.internal.GemFireMangerJmxImpl.  Comparison of this class with the non-JMX super class org.apache.geode.admin.internal.GemFireManagerImpl will illustrate what "JMX friendly" means better than trying to explain i
 t here...
 <p>
 One standard approach to defining a ModelMBean is to programmatically
 build the necessary meta-data.  The folks on the Tomcat approach
 developed a better solution... an XML definition file which Jakarta
 Commons-Modeler parses to create the meta-data objects required to
 definie the ModelMBean.  We currently have our XML descriptor file at
-com.gemstone.gemfire.admin.jmx.mbeans-descriptors.xml.
+org.apache.geode.admin.jmx.mbeans-descriptors.xml.
 Commons-Modeler can be found at <A href="http://jakarta.apache.org/commons/modeler">http://jakarta.apache.org/commons/modeler/</A>
 <p>
 Here's a quick run-down of the Admin and JMX pkgs in GemFire...
 <p>
-<b>com.gemstone.gemfire.admin</b>
+<b>org.apache.geode.admin</b>
 <ul>
 <li/>interfaces describing GemFire entities and resources for managing or monitoring
 </ul>
 <p>
-<b>com.gemstone.gemfire.admin.internal</b>
+<b>org.apache.geode.admin.internal</b>
 <ul>
 <li/>implementations of the admin pkg which could be used to managing GemFire
 <li/>recommendation is to create one set on non-JMX unit tests for these and then wrap that unit test within another test that is specific to its use in JMX
 </ul>
 <p>
-<b>com.gemstone.gemfire.admin.jmx</b>
+<b>org.apache.geode.admin.jmx</b>
 <ul>
 <li/>Commons-Modeler descriptor file mbeans-descriptors.xml
 <li/>AgentMBean - non-required interface that simply represents a public documentation of what the Agent does
 <li/>VersionMBean and Version - unused (but functional) examples of a standard MBean (other MBeans as defined in mbeans-descriptors.xml also provide version info)
 </ul>
 <p>
-<b>com.gemstone.gemfire.admin.jmx.internal</b>
+<b>org.apache.geode.admin.jmx.internal</b>
 <ul>
-<li/>subclasses of com.gemstone.gemfire.admin.internal classes that use JMX services, implement ManagedResource, register ModelMBeans to manage themselves, and other JMX related details
+<li/>subclasses of org.apache.geode.admin.internal classes that use JMX services, implement ManagedResource, register ModelMBeans to manage themselves, and other JMX related details
 <li/>ManagedResource - simple interface we use to create a more uniform approach in using JMX
 <li/>Agent - application with main, registers HttpAdaptor, acts as a factory to DistributedSystemJmxImpl (which is the entry point to using JMX with a GemFire system)
 <li/>AgentConfig - configuration for Agent that reads/writes to a properties file
@@ -93,7 +93,7 @@ Here's a quick run-down of the Admin and JMX pkgs in GemFire...
 <p>
 3) Our MBeans currently have some return types of Admin interfaces and GemFire MBean types.  This is not recommended.  The correct approach is to return javax.management.ObjectName or an array of ObjectName so that remotability is not broken.  We have a bug filed to correct this in GemFire.
 <p>
-4) Commons-Modeler provides a simple, incomplete implementation of ModelMBean called org.apache.commons.modeler.BaseModelMBean. We decided to use the standard RequiredModelMBean which all JMX implementations are required to supply.  The JMX spec details several "managed resource types" that a ModelMBean can support.  ObjectReference is the type that both MX4J's RequiredModelMBean and Modeler's BaseModelMBean support.  However, MX4J is more strict in it's interpretation of the spec which spells it out as "ObjectReference".  Modeler's BaseModelMBean performs no enforcement and simply assumes it is managing type ObjectReference.  Modeler has a bug in org.apache.commons.modeler.ManagedBean because it specifies "objectReference" which is the incorrect case in comparison to the specification.  I intend to work with the Jakarta-Commons folks to change this to comply with the spec.  The Modeler will use BaseModelMBean by default even though it is actually depending on a JMX implementation s
 uch as MX4J or XMOJO.  com.gemstone.gemfire.admin.jmx.internal.MBeanUtil tells Modeler to use RequiredModelMBean instead and also uses com.gemstone.gemfire.admin.jmx.internal.SpecManagedBean as a workaround to the whole "objectReference" issue.  You could feasibly use org.apache.commons.modeler.BaseModelMBean or RequiredModelMBean.
+4) Commons-Modeler provides a simple, incomplete implementation of ModelMBean called org.apache.commons.modeler.BaseModelMBean. We decided to use the standard RequiredModelMBean which all JMX implementations are required to supply.  The JMX spec details several "managed resource types" that a ModelMBean can support.  ObjectReference is the type that both MX4J's RequiredModelMBean and Modeler's BaseModelMBean support.  However, MX4J is more strict in it's interpretation of the spec which spells it out as "ObjectReference".  Modeler's BaseModelMBean performs no enforcement and simply assumes it is managing type ObjectReference.  Modeler has a bug in org.apache.commons.modeler.ManagedBean because it specifies "objectReference" which is the incorrect case in comparison to the specification.  I intend to work with the Jakarta-Commons folks to change this to comply with the spec.  The Modeler will use BaseModelMBean by default even though it is actually depending on a JMX implementation s
 uch as MX4J or XMOJO.  org.apache.geode.admin.jmx.internal.MBeanUtil tells Modeler to use RequiredModelMBean instead and also uses org.apache.geode.admin.jmx.internal.SpecManagedBean as a workaround to the whole "objectReference" issue.  You could feasibly use org.apache.commons.modeler.BaseModelMBean or RequiredModelMBean.
 <p>
 
 <h3>Capabilities currently supported in GemFire via JMX:</h3>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/package.html
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/package.html b/geode-core/src/main/java/org/apache/geode/admin/package.html
index 86d7651..29ce994 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/package.html
+++ b/geode-core/src/main/java/org/apache/geode/admin/package.html
@@ -26,11 +26,11 @@ system, and processes that host GemFire Caches.</P>
 The Admin API provides interfaces for administrative control, 
 monitoring, and custom management of a GemFire system.
 <P>
-The {@link com.gemstone.gemfire.admin.AdminDistributedSystemFactory}
+The {@link org.apache.geode.admin.AdminDistributedSystemFactory}
 is the starting point.  It creates an instance of
 <code>AdminDistributedSystem</code> that administers the distributed
 system to which a VM is {@linkplain
-com.gemstone.gemfire.distributed.DistributedSystem connected}.
+org.apache.geode.distributed.DistributedSystem connected}.
 <P>
 <pre><code>
 DistributedSystem connection = DistributedSystem.connect(new Properties());
@@ -39,38 +39,38 @@ AdminDistributedSystem system =
 system.connect(new File("admin.log"), "info");
 </code></pre>
 <P>
-This {@link com.gemstone.gemfire.admin.AdminDistributedSystem}
+This {@link org.apache.geode.admin.AdminDistributedSystem}
 interface exposes methods for such tasks as connecting to the system,
 merging system logs, getting administrative interfaces to 
 applications that host GemFire Caches.
 
 <H3>Monitoring the Health of GemFire</H3>
 
-<P>The {@link com.gemstone.gemfire.admin.GemFireHealth} interface
+<P>The {@link org.apache.geode.admin.GemFireHealth} interface
 allows the overall health of GemFire to be monitored.
 <code>GemFireHealth</code> monitors the behavior the members of a
 distributed system namely 
-application VMs that may host {@link com.gemstone.gemfire.cache.Cache
+application VMs that may host {@link org.apache.geode.cache.Cache
 cache} instances.  There are three levels of health: {@linkplain
-com.gemstone.gemfire.admin.GemFireHealth#GOOD_HEALTH good health} that
+org.apache.geode.admin.GemFireHealth#GOOD_HEALTH good health} that
 indicates that all GemFire components are behaving reasonably,
-{@linkplain com.gemstone.gemfire.admin.GemFireHealth#OKAY_HEALTH okay
+{@linkplain org.apache.geode.admin.GemFireHealth#OKAY_HEALTH okay
 health} that indicates that one or more GemFire components is slightly
 unhealthy and may need some attention, and {@linkplain
-com.gemstone.gemfire.admin.GemFireHealth#POOR_HEALTH poor health} that
+org.apache.geode.admin.GemFireHealth#POOR_HEALTH poor health} that
 indicates that a GemFire component is unhealthy and needs immediate
 attention.</P>
 
 <P>Because each GemFire application has its own definition of what it
 means to be "healthy", the metrics that are used to determine health
 are configurable.  {@link
-com.gemstone.gemfire.admin.GemFireHealthConfig} provides methods for
+org.apache.geode.admin.GemFireHealthConfig} provides methods for
 configuring how the health of {@linkplain
-com.gemstone.gemfire.admin.DistributedSystemHealthConfig the
+org.apache.geode.admin.DistributedSystemHealthConfig the
 distributed system},
-{@linkplain com.gemstone.gemfire.admin.CacheHealthConfig members that
+{@linkplain org.apache.geode.admin.CacheHealthConfig members that
 host Cache instances}, and {@linkplain
-com.gemstone.gemfire.admin.MemberHealthConfig individual members} of
+org.apache.geode.admin.MemberHealthConfig individual members} of
 the distributed system.  <code>GemFireHealthConfig</code> also allows
 you to configure how often GemFire's health is evaluated.</P>
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java b/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
index c773c96..3418c21 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache;
+package org.apache.geode.cache;
 
 import java.io.File;
 import java.io.Serializable;
@@ -25,21 +25,21 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import com.gemstone.gemfire.GemFireIOException;
-import com.gemstone.gemfire.cache.client.ClientCache;
-import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
-import com.gemstone.gemfire.cache.client.PoolManager;
-import com.gemstone.gemfire.compression.Compressor;
-import com.gemstone.gemfire.internal.cache.AbstractRegion;
-import com.gemstone.gemfire.internal.cache.DiskStoreFactoryImpl;
-import com.gemstone.gemfire.internal.cache.DiskWriteAttributesImpl;
-import com.gemstone.gemfire.internal.cache.EvictionAttributesImpl;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.cache.PartitionAttributesImpl;
-import com.gemstone.gemfire.internal.cache.PartitionedRegionHelper;
-import com.gemstone.gemfire.internal.cache.UserSpecifiedRegionAttributes;
-import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.GemFireIOException;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.client.PoolManager;
+import org.apache.geode.compression.Compressor;
+import org.apache.geode.internal.cache.AbstractRegion;
+import org.apache.geode.internal.cache.DiskStoreFactoryImpl;
+import org.apache.geode.internal.cache.DiskWriteAttributesImpl;
+import org.apache.geode.internal.cache.EvictionAttributesImpl;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.PartitionAttributesImpl;
+import org.apache.geode.internal.cache.PartitionedRegionHelper;
+import org.apache.geode.internal.cache.UserSpecifiedRegionAttributes;
+import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /** Creates instances of {@link RegionAttributes}. An <code>AttributesFactory</code>
  * instance maintains state for creating <code>RegionAttributes</code> instances.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java b/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
index 6b31759..d3aaf9c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.cache;
+package org.apache.geode.cache;
 
 
 /**



Mime
View raw message