You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2016/09/15 21:02:03 UTC

[46/76] [abbrv] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java b/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
index 2df1cd6..487106a 100755
--- a/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
+++ b/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.annotations;
+package org.apache.geode.annotations;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -23,9 +23,9 @@ import java.lang.reflect.AnnotatedElement;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import com.gemstone.gemfire.annotations.experimentalpackage.ClassInExperimentalPackage;
-import com.gemstone.gemfire.experimental.nonexperimentalpackage.ClassInNonExperimentalPackage;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import org.apache.geode.annotations.experimentalpackage.ClassInExperimentalPackage;
+import org.apache.geode.experimental.nonexperimentalpackage.ClassInNonExperimentalPackage;
+import org.apache.geode.test.junit.categories.UnitTest;
 
 /**
  * Unit tests for the <tt>Experimental</tt> annotation. Verifies that the

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java
----------------------------------------------------------------------
diff --git a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java
index cd080ce..3b6e7d2 100755
--- a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java
+++ b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.annotations.experimentalpackage;
+package org.apache.geode.annotations.experimentalpackage;
 
 /**
  * Used by <tt>ExperimentalJUnitTest</tt>. This is a class in an
  * <tt>Experimental</tt> package.
  * 
- * @see com.gemstone.gemfire.annotations.ExperimentalJUnitTest
+ * @see org.apache.geode.annotations.ExperimentalJUnitTest
  */
 public class ClassInExperimentalPackage {
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java
----------------------------------------------------------------------
diff --git a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java
index 3db93ff..288e9aa 100755
--- a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java
+++ b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java
@@ -18,9 +18,9 @@
  * Used by <tt>ExperimentalJUnitTest</tt>. This is an <tt>Experimental</tt> 
  * package.
  * 
- * @see com.gemstone.gemfire.annotations.ExperimentalJUnitTest
+ * @see org.apache.geode.annotations.ExperimentalJUnitTest
  */
 @Experimental("This is an experimental package")
-package com.gemstone.gemfire.annotations.experimentalpackage;
+package org.apache.geode.annotations.experimentalpackage;
 
-import com.gemstone.gemfire.annotations.Experimental;
+import org.apache.geode.annotations.Experimental;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java
----------------------------------------------------------------------
diff --git a/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java b/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java
index 26499a6..10f6072 100755
--- a/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java
+++ b/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.experimental.nonexperimentalpackage;
+package org.apache.geode.experimental.nonexperimentalpackage;
 
 /**
  * Used by <tt>ExperimentalJUnitTest</tt>. This is a class in an
  * <tt>Experimental</tt> package.
  * 
- * @see com.gemstone.gemfire.annotations.ExperimentalJUnitTest
+ * @see org.apache.geode.annotations.ExperimentalJUnitTest
  */
 public class ClassInNonExperimentalPackage {
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/package-info.java
----------------------------------------------------------------------
diff --git a/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/package-info.java b/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/package-info.java
index 8e76724..20236a6 100755
--- a/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/package-info.java
+++ b/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/package-info.java
@@ -18,6 +18,6 @@
  * Used by <tt>ExperimentalJUnitTest</tt>. This is a non-<tt>Experimental</tt> 
  * package.
  * 
- * @see com.gemstone.gemfire.annotations.ExperimentalJUnitTest
+ * @see org.apache.geode.annotations.ExperimentalJUnitTest
  */
-package com.gemstone.gemfire.experimental.nonexperimentalpackage;
+package org.apache.geode.experimental.nonexperimentalpackage;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/build.gradle
----------------------------------------------------------------------
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index ea1fce2..b2e5a4e 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -135,7 +135,7 @@ sourceSets {
 
 // Creates the version properties file and writes it to the classes dir
 task createVersionPropertiesFile {
-  def propertiesFile = file(generatedResources + "/com/gemstone/gemfire/internal/GemFireVersion.properties");
+  def propertiesFile = file(generatedResources + "/org/apache/geode/internal/GemFireVersion.properties");
   outputs.file propertiesFile
   inputs.dir compileJava.destinationDir
 
@@ -162,22 +162,22 @@ jar {
   from sourceSets.main.output
   from sourceSets.jca.output
   
-  exclude 'com/gemstone/gemfire/management/internal/web/**'
-  exclude 'com/gemstone/gemfire/internal/i18n/StringIdResourceBundle_ja.txt'
-  exclude 'com/gemstone/gemfire/admin/doc-files/ds4_0.dtd'
+  exclude 'org/apache/geode/management/internal/web/**'
+  exclude 'org/apache/geode/internal/i18n/StringIdResourceBundle_ja.txt'
+  exclude 'org/apache/geode/admin/doc-files/ds4_0.dtd'
 }
 
 task webJar (type: Jar, dependsOn: classes) {
   description 'Assembles the jar archive containing the gemfire management web classes.'
   from sourceSets.main.output
   baseName 'geode-web'
-  include 'com/gemstone/gemfire/management/internal/web/**'
+  include 'org/apache/geode/management/internal/web/**'
 }
 
 task raJar (type: Jar, dependsOn: classes) {
   description 'Assembles the jar archive that contains the JCA classes'
   from sourceSets.jca.output
-  exclude 'com/gemstone/gemfire/ra/**'
+  exclude 'org/apache/geode/ra/**'
   archiveName 'ra.jar'
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionFactoryImpl.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionFactoryImpl.java
index 23343ea..d7bcc44 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionFactoryImpl.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionFactoryImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal.ra;
+package org.apache.geode.internal.ra;
 
 import javax.naming.NamingException;
 import javax.naming.Reference;
@@ -22,7 +22,7 @@ import javax.resource.ResourceException;
 import javax.resource.spi.ConnectionManager;
 import javax.resource.spi.ManagedConnectionFactory;
 
-import com.gemstone.gemfire.ra.GFConnectionFactory;
+import org.apache.geode.ra.GFConnectionFactory;
 /**
  * 
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionImpl.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionImpl.java
index de68486..7a69293 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionImpl.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionImpl.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal.ra;
+package org.apache.geode.internal.ra;
 
 import javax.naming.NamingException;
 import javax.naming.Reference;
 import javax.resource.ResourceException;
 
-import com.gemstone.gemfire.internal.ra.spi.JCAManagedConnection;
-import com.gemstone.gemfire.ra.GFConnection;
+import org.apache.geode.internal.ra.spi.JCAManagedConnection;
+import org.apache.geode.ra.GFConnection;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java
index 19afdb2..c7b2223 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal.ra.spi;
+package org.apache.geode.internal.ra.spi;
 
 import javax.resource.ResourceException;
 import javax.resource.spi.LocalTransaction;
@@ -22,14 +22,14 @@ import javax.resource.spi.LocalTransactionException;
 import javax.transaction.SystemException;
 import javax.transaction.TransactionManager;
 
-import com.gemstone.gemfire.LogWriter;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.TransactionId;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.cache.TXStateProxy;
+import org.apache.geode.LogWriter;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.TransactionId;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.TXStateProxy;
 
-import com.gemstone.gemfire.internal.cache.TXManagerImpl;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.cache.TXManagerImpl;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnection.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnection.java
index 909e3f3..4a9c903 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnection.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnection.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal.ra.spi;
+package org.apache.geode.internal.ra.spi;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -36,11 +36,11 @@ import javax.security.auth.Subject;
 import javax.transaction.SystemException;
 import javax.transaction.xa.XAResource;
 
-import com.gemstone.gemfire.LogWriter;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.cache.TXManagerImpl;
-import com.gemstone.gemfire.internal.ra.GFConnectionImpl;
+import org.apache.geode.LogWriter;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.TXManagerImpl;
+import org.apache.geode.internal.ra.GFConnectionImpl;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionFactory.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionFactory.java
index f1b1143..fda8707 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionFactory.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal.ra.spi;
+package org.apache.geode.internal.ra.spi;
 
 import java.io.PrintWriter;
 import java.util.Set;
@@ -26,7 +26,7 @@ import javax.resource.spi.ManagedConnection;
 import javax.resource.spi.ManagedConnectionFactory;
 import javax.security.auth.Subject;
 
-import com.gemstone.gemfire.internal.ra.GFConnectionFactoryImpl;
+import org.apache.geode.internal.ra.GFConnectionFactoryImpl;
 /**
  * 
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionMetaData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionMetaData.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionMetaData.java
index e21f33f..6a04ac3 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionMetaData.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionMetaData.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal.ra.spi;
+package org.apache.geode.internal.ra.spi;
 
 import javax.resource.ResourceException;
 import javax.resource.spi.ManagedConnectionMetaData;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/jca/ra.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/jca/ra.xml b/geode-core/src/jca/ra.xml
index 78b4579..0e258d7 100644
--- a/geode-core/src/jca/ra.xml
+++ b/geode-core/src/jca/ra.xml
@@ -25,7 +25,7 @@
     <eis-type>GFE JCA</eis-type>
     <version>1.5</version>
     <resourceadapter>
-        <managedconnectionfactory-class>com.gemstone.gemfire.internal.ra.spi.JCAManagedConnectionFactory</managedconnectionfactory-class>
+        <managedconnectionfactory-class>org.apache.geode.internal.ra.spi.JCAManagedConnectionFactory</managedconnectionfactory-class>
                 <config-property>
                     <config-property-name>ProductName</config-property-name>
                     <config-property-type>java.lang.String</config-property-type>
@@ -42,10 +42,10 @@
                     <config-property-value>8.0</config-property-value>
                 </config-property>
         
-        <connectionfactory-interface>com.gemstone.gemfire.ra.GFConnectionFactory</connectionfactory-interface>
-        <connectionfactory-impl-class>com.gemstone.gemfire.internal.ra.GFConnectionFactoryImpl</connectionfactory-impl-class>
-        <connection-interface>com.gemstone.gemfire.ra.GFConnection</connection-interface>
-        <connection-impl-class>com.gemstone.gemfire.internal.ra.GFConnectionImpl</connection-impl-class>
+        <connectionfactory-interface>org.apache.geode.ra.GFConnectionFactory</connectionfactory-interface>
+        <connectionfactory-impl-class>org.apache.geode.internal.ra.GFConnectionFactoryImpl</connectionfactory-impl-class>
+        <connection-interface>org.apache.geode.ra.GFConnection</connection-interface>
+        <connection-impl-class>org.apache.geode.internal.ra.GFConnectionImpl</connection-impl-class>
         <transaction-support>LocalTransaction</transaction-support>
         <reauthentication-support>false</reauthentication-support> 
     </resourceadapter>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/external-overview.html
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/external-overview.html b/geode-core/src/main/java/external-overview.html
index 6472059..ee2f395 100644
--- a/geode-core/src/main/java/external-overview.html
+++ b/geode-core/src/main/java/external-overview.html
@@ -26,7 +26,7 @@ constructs.</P>
 <P>GemFire's distributed caching allows application access to
 distributed and cached data across multiple physical machines.
 GemFire's main API for accessing distributed data is the {@linkplain
-com.gemstone.gemfire.cache.Region}
+org.apache.geode.cache.Region}
 
 <P>GemFire provides a flexible and powerful API for distributed object
 caching.  The API is particularly well-suited for caching application
@@ -37,7 +37,7 @@ data and data VMs.</P>
 
 <P>A discussion of the Distributed Caching API and GemFire's
 implementation of it can be found {@linkplain
-com.gemstone.gemfire.cache here}.</P>
+org.apache.geode.cache here}.</P>
 
 </BODY>
 </HTML>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/CancelCriterion.java b/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
index 0cb44ca..f0eb160 100644
--- a/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
+++ b/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * Abstract cancellation proxy for cancelling an operation, esp. a thread.
@@ -54,7 +54,7 @@ public abstract class CancelCriterion
    * construct an exception indicating the service is shut down.
    */
   public abstract String cancelInProgress();
-//import com.gemstone.gemfire.distributed.internal.DistributionManager;
+//import org.apache.geode.distributed.internal.DistributionManager;
 //    * <p>
 //    * In particular, a {@link DistributionManager} returns a non-null result if
 //    * message distribution has been terminated.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/CancelException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/CancelException.java b/geode-core/src/main/java/org/apache/geode/CancelException.java
index e896d2f..94fd8b5 100644
--- a/geode-core/src/main/java/org/apache/geode/CancelException.java
+++ b/geode-core/src/main/java/org/apache/geode/CancelException.java
@@ -17,9 +17,9 @@
 /**
  * 
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
-import com.gemstone.gemfire.cache.CacheRuntimeException;
+import org.apache.geode.cache.CacheRuntimeException;
 
 /**
  * Abstract root class of all GemFire exceptions representing system

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java b/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
index 8317141..d62d873 100644
--- a/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 import java.io.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/CopyException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/CopyException.java b/geode-core/src/main/java/org/apache/geode/CopyException.java
index 5294368..8ad9c57 100644
--- a/geode-core/src/main/java/org/apache/geode/CopyException.java
+++ b/geode-core/src/main/java/org/apache/geode/CopyException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * Indicates a failure to copy an object.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/CopyHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/CopyHelper.java b/geode-core/src/main/java/org/apache/geode/CopyHelper.java
index f3c2a6a..dd79c0e 100644
--- a/geode-core/src/main/java/org/apache/geode/CopyHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/CopyHelper.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.Serializable;
@@ -25,14 +25,14 @@ import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.UUID;
 
-import com.gemstone.gemfire.internal.HeapDataOutputStream;
-import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.internal.cache.CachedDeserializable;
-import com.gemstone.gemfire.internal.cache.Token;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.pdx.PdxInstance;
-import com.gemstone.gemfire.pdx.WritablePdxInstance;
-import com.gemstone.gemfire.pdx.internal.PdxUnreadData;
+import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.CachedDeserializable;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.pdx.WritablePdxInstance;
+import org.apache.geode.pdx.internal.PdxUnreadData;
 
 /**
  * A static helper for optimally creating copies.  Creating copies
@@ -52,8 +52,8 @@ import com.gemstone.gemfire.pdx.internal.PdxUnreadData;
  * @see Cloneable
  * @see Serializable
  * @see DataSerializer
- * @see com.gemstone.gemfire.cache.Cache#setCopyOnRead
- * @see com.gemstone.gemfire.cache.CacheTransactionManager
+ * @see org.apache.geode.cache.Cache#setCopyOnRead
+ * @see org.apache.geode.cache.CacheTransactionManager
  *
  * @since GemFire 4.0
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/DataSerializable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/DataSerializable.java b/geode-core/src/main/java/org/apache/geode/DataSerializable.java
index ecbb044..d7c60a5 100644
--- a/geode-core/src/main/java/org/apache/geode/DataSerializable.java
+++ b/geode-core/src/main/java/org/apache/geode/DataSerializable.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 import java.io.*;
 
@@ -34,7 +34,7 @@ import java.io.*;
  * When possible, GemFire respects the <code>DataSerializable</code>
  * contract to provide optimal object serialization.  For instance, if
  * a <code>DataSerializable</code> object is 
- * {@linkplain com.gemstone.gemfire.cache.Region#put(Object, Object) placed} into a distributed
+ * {@linkplain org.apache.geode.cache.Region#put(Object, Object) placed} into a distributed
  * cache region, its <code>toData</code> method will be used to
  * serialize it when it is sent to another member of the distributed
  * system.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/DataSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/DataSerializer.java b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
index 360069a..224df85 100644
--- a/geode-core/src/main/java/org/apache/geode/DataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -48,25 +48,25 @@ import java.util.concurrent.ConcurrentMap;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.admin.RegionNotFoundException;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.internal.DSCODE;
-import com.gemstone.gemfire.internal.HeapDataOutputStream;
-import com.gemstone.gemfire.internal.InternalDataSerializer;
-import com.gemstone.gemfire.internal.ObjToByteArraySerializer;
-import com.gemstone.gemfire.internal.Sendable;
-import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.internal.cache.CachedDeserializable;
-import com.gemstone.gemfire.internal.cache.EventID;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
-import com.gemstone.gemfire.internal.offheap.StoredObject;
-import com.gemstone.gemfire.pdx.PdxInstance;
+import org.apache.geode.admin.RegionNotFoundException;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.internal.DSCODE;
+import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.ObjToByteArraySerializer;
+import org.apache.geode.internal.Sendable;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.CachedDeserializable;
+import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.offheap.StoredObject;
+import org.apache.geode.pdx.PdxInstance;
 
 /**
  * Provides static helper methods for reading and writing
@@ -301,8 +301,8 @@ public abstract class DataSerializer {
    * @return the name of the class in this implementation
    */
   private static String swizzleClassNameForRead(String name) {
-    String oldPackage = "com.gemstone.org.jgroups.stack.tcpserver";
-    String newPackage = "com.gemstone.gemfire.distributed.internal.tcpserver";
+    String oldPackage = "org.apache.org.jgroups.stack.tcpserver";
+    String newPackage = "org.apache.geode.distributed.internal.tcpserver";
     String result = name;
     if (name.startsWith(oldPackage)) {
       result = newPackage + name.substring(oldPackage.length());
@@ -319,8 +319,8 @@ public abstract class DataSerializer {
    * @return the name of the class in this implementation
    */
   private static String swizzleClassNameForWrite(String name) {
-    String oldPackage = "com.gemstone.org.jgroups.stack.tcpserver";
-    String newPackage = "com.gemstone.gemfire.distributed.internal.tcpserver";
+    String oldPackage = "org.apache.org.jgroups.stack.tcpserver";
+    String newPackage = "org.apache.geode.distributed.internal.tcpserver";
     String result = name;
     if (name.startsWith(newPackage)) {
       result = oldPackage + name.substring(newPackage.length());
@@ -369,7 +369,7 @@ public abstract class DataSerializer {
    *
    * @param in the input stream
    * @return the Region instance
-   * @throws com.gemstone.gemfire.cache.CacheClosedException if a cache has not been created or the only
+   * @throws org.apache.geode.cache.CacheClosedException if a cache has not been created or the only
    * created one is closed.
    * @throws RegionNotFoundException if there is no region by this name
    * in the Cache

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/Delta.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/Delta.java b/geode-core/src/main/java/org/apache/geode/Delta.java
index d345b58..de3ef98 100755
--- a/geode-core/src/main/java/org/apache/geode/Delta.java
+++ b/geode-core/src/main/java/org/apache/geode/Delta.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 import java.io.DataInput;
 import java.io.DataOutput;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java b/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
index 15eb331..dfe2faf 100644
--- a/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
+++ b/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
@@ -17,7 +17,7 @@
 /**
  * 
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * This exception wraps any checked exception encountered during invocation of

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/ForcedDisconnectException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/ForcedDisconnectException.java b/geode-core/src/main/java/org/apache/geode/ForcedDisconnectException.java
index d4ff966..cd3b90f 100755
--- a/geode-core/src/main/java/org/apache/geode/ForcedDisconnectException.java
+++ b/geode-core/src/main/java/org/apache/geode/ForcedDisconnectException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * An <code>ForcedDisconnectException</code> is thrown when a GemFire

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/GemFireCacheException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireCacheException.java b/geode-core/src/main/java/org/apache/geode/GemFireCacheException.java
index 0a18eeb..7f06d05 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireCacheException.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireCacheException.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
-import com.gemstone.gemfire.cache.CacheException;
+import org.apache.geode.cache.CacheException;
 
 /**
  * An <code>GemFireCacheException</code> is used to wrap a

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java b/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
index 3f1a4c4..c1db7d6 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
    
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * This is the abstract superclass of exceptions that are thrown and
@@ -24,7 +24,7 @@ package com.gemstone.gemfire;
  * This class ought to be called <em>GemFireException</em>, but that name
  * is reserved for an older class that extends {@link java.lang.RuntimeException}.
  * 
- * @see com.gemstone.gemfire.GemFireException
+ * @see org.apache.geode.GemFireException
  * @since GemFire 5.1
  */
 public abstract class GemFireCheckedException extends Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/GemFireConfigException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireConfigException.java b/geode-core/src/main/java/org/apache/geode/GemFireConfigException.java
index bb5dd5d..7063bce 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireConfigException.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireConfigException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
    
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * A <code>GemFireConfigException</code> is used for failures

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/GemFireException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireException.java b/geode-core/src/main/java/org/apache/geode/GemFireException.java
index c334947..142a97c 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireException.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
    
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * This is the abstract superclass of exceptions that are thrown to
@@ -25,8 +25,8 @@ package com.gemstone.gemfire;
  * <em>ought</em> to be called <code>GemFireRuntimeException</code>;
  * however, the current name is retained for compatibility's sake.
  * 
- * @see com.gemstone.gemfire.GemFireCheckedException
- * @see com.gemstone.gemfire.cache.CacheRuntimeException
+ * @see org.apache.geode.GemFireCheckedException
+ * @see org.apache.geode.cache.CacheRuntimeException
  */
 // Implementation note: This class is abstract so that we are forced
 // to have more specific exception types.  We want to avoid using

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/GemFireIOException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireIOException.java b/geode-core/src/main/java/org/apache/geode/GemFireIOException.java
index 4e0c399..583777c 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireIOException.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireIOException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
    
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * A <code>GemFireIOException</code> is thrown when a 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/GemFireRethrowable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireRethrowable.java b/geode-core/src/main/java/org/apache/geode/GemFireRethrowable.java
index 82c4092..a6ea18a 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireRethrowable.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireRethrowable.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * This error is used by GemFire for internal purposes.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/IncompatibleSystemException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/IncompatibleSystemException.java b/geode-core/src/main/java/org/apache/geode/IncompatibleSystemException.java
index 0af1726..997feb3 100644
--- a/geode-core/src/main/java/org/apache/geode/IncompatibleSystemException.java
+++ b/geode-core/src/main/java/org/apache/geode/IncompatibleSystemException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * An <code>IncompatibleSystemException</code> is thrown when a

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/Instantiator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/Instantiator.java b/geode-core/src/main/java/org/apache/geode/Instantiator.java
index 7aac081..00eb598 100644
--- a/geode-core/src/main/java/org/apache/geode/Instantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/Instantiator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
-import com.gemstone.gemfire.internal.InternalInstantiator;
-import com.gemstone.gemfire.internal.cache.EventID;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.InternalInstantiator;
+import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * <code>Instantiator</code> allows classes that implement {@link

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/InternalGemFireError.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/InternalGemFireError.java b/geode-core/src/main/java/org/apache/geode/InternalGemFireError.java
index 0681bd2..39fe1ea 100644
--- a/geode-core/src/main/java/org/apache/geode/InternalGemFireError.java
+++ b/geode-core/src/main/java/org/apache/geode/InternalGemFireError.java
@@ -17,7 +17,7 @@
 /**
  * 
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * Indicates that serious error has occurred within the GemFire system.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/InternalGemFireException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/InternalGemFireException.java b/geode-core/src/main/java/org/apache/geode/InternalGemFireException.java
index 8c1598b..a2362f8 100644
--- a/geode-core/src/main/java/org/apache/geode/InternalGemFireException.java
+++ b/geode-core/src/main/java/org/apache/geode/InternalGemFireException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
    
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * An <code>InternalGemFireException</code> is thrown when

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java b/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
index 1cc162e..10d2d48 100755
--- a/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
+++ b/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 import java.io.DataInput;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/InvalidValueException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/InvalidValueException.java b/geode-core/src/main/java/org/apache/geode/InvalidValueException.java
index d7fa1ce..e323431 100644
--- a/geode-core/src/main/java/org/apache/geode/InvalidValueException.java
+++ b/geode-core/src/main/java/org/apache/geode/InvalidValueException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * An <code>InvalidValueException</code> is thrown when an attempt is

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/InvalidVersionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/InvalidVersionException.java b/geode-core/src/main/java/org/apache/geode/InvalidVersionException.java
index 0f9af70..54813b3 100644
--- a/geode-core/src/main/java/org/apache/geode/InvalidVersionException.java
+++ b/geode-core/src/main/java/org/apache/geode/InvalidVersionException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 public class InvalidVersionException extends GemFireException {
   private static final long serialVersionUID = 6342040462194322698L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/LicenseException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/LicenseException.java b/geode-core/src/main/java/org/apache/geode/LicenseException.java
index f41db3a..96f07af 100644
--- a/geode-core/src/main/java/org/apache/geode/LicenseException.java
+++ b/geode-core/src/main/java/org/apache/geode/LicenseException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
    
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * A <code>LicenseException</code> is thrown when

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/LogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/LogWriter.java b/geode-core/src/main/java/org/apache/geode/LogWriter.java
index 648b9fa..17e23e0 100644
--- a/geode-core/src/main/java/org/apache/geode/LogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/LogWriter.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 import java.util.logging.Handler;
 
-import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.i18n.LogWriterI18n;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.i18n.LogWriterI18n;
 
 /**
   * Defines methods available to clients that want to write a log message

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/NoSystemException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/NoSystemException.java b/geode-core/src/main/java/org/apache/geode/NoSystemException.java
index 8490d1a..215e157 100644
--- a/geode-core/src/main/java/org/apache/geode/NoSystemException.java
+++ b/geode-core/src/main/java/org/apache/geode/NoSystemException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * A <code>NoSystemException</code> is thrown when a

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/OutOfOffHeapMemoryException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/OutOfOffHeapMemoryException.java b/geode-core/src/main/java/org/apache/geode/OutOfOffHeapMemoryException.java
index 25d4b16..2dc105c 100755
--- a/geode-core/src/main/java/org/apache/geode/OutOfOffHeapMemoryException.java
+++ b/geode-core/src/main/java/org/apache/geode/OutOfOffHeapMemoryException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * Indicates that attempts to allocate more objects in off-heap memory has

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/SerializationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/SerializationException.java b/geode-core/src/main/java/org/apache/geode/SerializationException.java
index cfcbae3..592ff38 100644
--- a/geode-core/src/main/java/org/apache/geode/SerializationException.java
+++ b/geode-core/src/main/java/org/apache/geode/SerializationException.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
-import com.gemstone.gemfire.GemFireIOException;
+import org.apache.geode.GemFireIOException;
 
 /**
  * An exception indicating that a serialization or deserialization failed.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/StatisticDescriptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/StatisticDescriptor.java b/geode-core/src/main/java/org/apache/geode/StatisticDescriptor.java
index e812cec..010565c 100644
--- a/geode-core/src/main/java/org/apache/geode/StatisticDescriptor.java
+++ b/geode-core/src/main/java/org/apache/geode/StatisticDescriptor.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
-//import com.gemstone.gemfire.internal.Assert;
-//import com.gemstone.gemfire.internal.FieldInfo;
+//import org.apache.geode.internal.Assert;
+//import org.apache.geode.internal.FieldInfo;
 
 /**
  * Describes an individual statistic whose value is updated by an

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/Statistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/Statistics.java b/geode-core/src/main/java/org/apache/geode/Statistics.java
index 17b5bc0..b8ffc06 100644
--- a/geode-core/src/main/java/org/apache/geode/Statistics.java
+++ b/geode-core/src/main/java/org/apache/geode/Statistics.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
-//import com.gemstone.gemfire.distributed.DistributedSystem;
+//import org.apache.geode.distributed.DistributedSystem;
 
 import java.util.function.DoubleSupplier;
 import java.util.function.IntSupplier;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java b/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
index 3ba1665..4fe13ee 100644
--- a/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
-//import com.gemstone.gemfire.distributed.DistributedSystem;
-//import com.gemstone.gemfire.internal.statistics.StatArchiveFormat;
+//import org.apache.geode.distributed.DistributedSystem;
+//import org.apache.geode.internal.statistics.StatArchiveFormat;
 //import java.io.IOException;
 //import java.io.Reader;
 
@@ -27,7 +27,7 @@ package com.gemstone.gemfire;
  * It can also be used to create instances of {@link StatisticDescriptor}
  * and {@link StatisticsType} because it implements {@link StatisticsTypeFactory}.
  * {@link
- * com.gemstone.gemfire.distributed.DistributedSystem} is the only
+ * org.apache.geode.distributed.DistributedSystem} is the only
  * instance of this interface.
  *
  * <P>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/StatisticsType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/StatisticsType.java b/geode-core/src/main/java/org/apache/geode/StatisticsType.java
index a24e0e5..c799cb5 100644
--- a/geode-core/src/main/java/org/apache/geode/StatisticsType.java
+++ b/geode-core/src/main/java/org/apache/geode/StatisticsType.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
-//import com.gemstone.gemfire.internal.Assert;
+//import org.apache.geode.internal.Assert;
 //import java.io.*;
 //import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/StatisticsTypeFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/StatisticsTypeFactory.java b/geode-core/src/main/java/org/apache/geode/StatisticsTypeFactory.java
index 4569b7e..e35725c 100644
--- a/geode-core/src/main/java/org/apache/geode/StatisticsTypeFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/StatisticsTypeFactory.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
-//import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.internal.statistics.StatArchiveFormat;
+//import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.statistics.StatArchiveFormat;
 import java.io.IOException;
 import java.io.Reader;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/SystemConnectException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/SystemConnectException.java b/geode-core/src/main/java/org/apache/geode/SystemConnectException.java
index 01636d3..ed41798 100644
--- a/geode-core/src/main/java/org/apache/geode/SystemConnectException.java
+++ b/geode-core/src/main/java/org/apache/geode/SystemConnectException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * An <code>SystemConnectException</code> is thrown when a

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/SystemFailure.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/SystemFailure.java b/geode-core/src/main/java/org/apache/geode/SystemFailure.java
index 61d73af..8acf473 100644
--- a/geode-core/src/main/java/org/apache/geode/SystemFailure.java
+++ b/geode-core/src/main/java/org/apache/geode/SystemFailure.java
@@ -17,13 +17,13 @@
 /**
  * 
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.internal.SystemFailureTestHook;
-import com.gemstone.gemfire.internal.admin.remote.RemoteGfManagerAgent;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.SystemFailureTestHook;
+import org.apache.geode.internal.admin.remote.RemoteGfManagerAgent;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Catches and responds to JVM failure
@@ -135,7 +135,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * returns a non-null result).  
  * <p>
  * A job processing loop is a good candidate, for
- * instance, in com.gemstone.org.jgroups.protocols.UDP#run(), 
+ * instance, in org.apache.org.jgroups.protocols.UDP#run(), 
  * which implements {@link Thread#run}:
  * <p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/SystemIsRunningException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/SystemIsRunningException.java b/geode-core/src/main/java/org/apache/geode/SystemIsRunningException.java
index e96ddf4..06dd0c7 100644
--- a/geode-core/src/main/java/org/apache/geode/SystemIsRunningException.java
+++ b/geode-core/src/main/java/org/apache/geode/SystemIsRunningException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * A <code>SystemIsRunningException</code> is thrown when an operation

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/ThreadInterruptedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/ThreadInterruptedException.java b/geode-core/src/main/java/org/apache/geode/ThreadInterruptedException.java
index 6c459d3..373cead 100644
--- a/geode-core/src/main/java/org/apache/geode/ThreadInterruptedException.java
+++ b/geode-core/src/main/java/org/apache/geode/ThreadInterruptedException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * @deprecated this class is no longer used

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/ToDataException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/ToDataException.java b/geode-core/src/main/java/org/apache/geode/ToDataException.java
index e131596..e602f3c 100644
--- a/geode-core/src/main/java/org/apache/geode/ToDataException.java
+++ b/geode-core/src/main/java/org/apache/geode/ToDataException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * A <code>ToDataException</code> is thrown during serialization if

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/UncreatedSystemException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/UncreatedSystemException.java b/geode-core/src/main/java/org/apache/geode/UncreatedSystemException.java
index 4552b86..685e8fc 100644
--- a/geode-core/src/main/java/org/apache/geode/UncreatedSystemException.java
+++ b/geode-core/src/main/java/org/apache/geode/UncreatedSystemException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * An <code>UncreatedSystemException</code> is thrown when the specified

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/UnmodifiableException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/UnmodifiableException.java b/geode-core/src/main/java/org/apache/geode/UnmodifiableException.java
index 3a79c3c..640629c 100644
--- a/geode-core/src/main/java/org/apache/geode/UnmodifiableException.java
+++ b/geode-core/src/main/java/org/apache/geode/UnmodifiableException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * A <code>UnmodifiableException</code> is thrown when a

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/UnstartedSystemException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/UnstartedSystemException.java b/geode-core/src/main/java/org/apache/geode/UnstartedSystemException.java
index 6a10f08..c390089 100644
--- a/geode-core/src/main/java/org/apache/geode/UnstartedSystemException.java
+++ b/geode-core/src/main/java/org/apache/geode/UnstartedSystemException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire;
+package org.apache.geode;
 
 /**
  * An <code>UnstartedSystemException</code> is thrown when the specified

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java b/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java
index fd54b2e..ec5ed73 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -40,7 +40,7 @@ import java.util.Date;
  * running
  * <li> Port=The port you are using to open the monitor port for
  * the instance
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
+ * @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 AdminConfig
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
index 3cc8926..982c4f1 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
-import com.gemstone.gemfire.LogWriter;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.persistence.PersistentID;
-import com.gemstone.gemfire.distributed.DistributedMember;
+import org.apache.geode.LogWriter;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.persistence.PersistentID;
+import org.apache.geode.distributed.DistributedMember;
 
 import java.io.File;
 import java.net.InetAddress;
@@ -30,14 +30,14 @@ import java.util.UUID;
 /**
  * Administrative interface for managing an entire GemFire distributed
  * system.  This interface should not be confused with {@link
- * com.gemstone.gemfire.distributed.DistributedSystem
+ * org.apache.geode.distributed.DistributedSystem
  * DistributedSystem} that represents a connection to a GemFire
  * distributed system.
  *
  * @see AdminDistributedSystemFactory
  *
  * @since GemFire     3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
+ * @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 AdminDistributedSystem {
 	
@@ -50,7 +50,7 @@ public interface AdminDistributedSystem {
    * Retrieves display friendly name for this system.  If this administrative
    * VM defined an optional name for its connection to the distributed system,
    * that name will be returned.  Otherwise the returned value will be {@link
-   * com.gemstone.gemfire.admin.AdminDistributedSystem#getId}.
+   * org.apache.geode.admin.AdminDistributedSystem#getId}.
    */
   public String getName();
   
@@ -201,7 +201,7 @@ public interface AdminDistributedSystem {
    * {@linkplain #getCacheVms cache server vms}.
    */
   public SystemMember[] getSystemMemberApplications() 
-  throws com.gemstone.gemfire.admin.AdminException;
+  throws org.apache.geode.admin.AdminException;
 
   /**
    * Display in readable format the latest Alert in this distributed system.
@@ -345,7 +345,7 @@ public interface AdminDistributedSystem {
 
   /**
    * Returns the administrative SystemMember specified by the {@link
-   * com.gemstone.gemfire.distributed.DistributedMember}.
+   * org.apache.geode.distributed.DistributedMember}.
    *
    * @param distributedMember the distributed member to lookup
    * @return administrative SystemMember for that distributed member

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java
index 49917b6..6f2af1f 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
-import com.gemstone.gemfire.admin.internal.AdminDistributedSystemImpl;
-import com.gemstone.gemfire.admin.internal.DistributedSystemConfigImpl;
-import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.i18n.LogWriterI18n;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LocalLogWriter;
+import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
+import org.apache.geode.admin.internal.DistributedSystemConfigImpl;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.DistributionConfigImpl;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.i18n.LogWriterI18n;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LocalLogWriter;
 
 import java.util.Properties;
 
@@ -32,7 +32,7 @@ import java.util.Properties;
  * Factory for creating GemFire administration entities. 
  *
  * @since GemFire     3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
+ * @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 AdminDistributedSystemFactory {
   
@@ -84,8 +84,8 @@ public class AdminDistributedSystemFactory {
    * before {@link DistributedSystem#connect} is when creating a colocated distributed system.
    * <p>
    * Once it has been enabled be careful to only use GemFire APIs from the
-   * <code>com.gemstone.gemfire.admin</code> package. In particular do not create
-   * a {@link com.gemstone.gemfire.cache.Cache} or a normal {@link DistributedSystem}.
+   * <code>org.apache.geode.admin</code> package. In particular do not create
+   * a {@link org.apache.geode.cache.Cache} or a normal {@link DistributedSystem}.
    * @param adminOnly <code>true</code> if this VM should be limited to administration APIs;
    *  <code>false</code> if this VM should allow all GemFire APIs.
    * @throws IllegalStateException if a {@link DistributedSystem}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/AdminException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminException.java b/geode-core/src/main/java/org/apache/geode/admin/AdminException.java
index cc15b4f..e7d574d 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminException.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminException.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
    
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
-import com.gemstone.gemfire.GemFireCheckedException;
+import org.apache.geode.GemFireCheckedException;
 
 /**
  * An <code>AdminException</code> is thrown when administration or monitoring
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.GemFireCheckedException;
  *
  * @since GemFire     3.5
  *
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
+ * @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 AdminException extends GemFireCheckedException {
 private static final long serialVersionUID = 879398950879472021L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/AdminXmlException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminXmlException.java b/geode-core/src/main/java/org/apache/geode/admin/AdminXmlException.java
index 672c494..e465ddc 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminXmlException.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminXmlException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
 /**
  * Thrown when a problem is encountered while working with
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.admin;
  * @see DistributedSystemConfig#getEntityConfigXMLFile
  *
  * @since GemFire 4.0
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
+ * @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 AdminXmlException extends RuntimeAdminException {
   private static final long serialVersionUID = -6848726449157550169L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/Alert.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/Alert.java b/geode-core/src/main/java/org/apache/geode/admin/Alert.java
index cf163a2..9519cba 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/Alert.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/Alert.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
 /**
  * An administration alert that is issued by a member of a GemFire
  * distributed system.  It is similar to a {@linkplain
- * com.gemstone.gemfire.i18n.LogWriterI18n log message}.
+ * org.apache.geode.i18n.LogWriterI18n log message}.
  *
  * @see       AlertListener
  * @since GemFire     3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
+ * @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 Alert {
   
@@ -38,7 +38,7 @@ public interface Alert {
 
   /** 
    * The name of the {@linkplain
-   * com.gemstone.gemfire.distributed.DistributedSystem#getName
+   * org.apache.geode.distributed.DistributedSystem#getName
    * distributed system}) through which the alert was issued.
    */
   public String getConnectionName();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java b/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java
index fb4271d..0791a5f 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
-import com.gemstone.gemfire.internal.admin.Alert;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.admin.Alert;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
- * Type-safe enumeration for {@link com.gemstone.gemfire.admin.Alert
+ * Type-safe enumeration for {@link org.apache.geode.admin.Alert
  * Alert} level.
  *
  * @since GemFire     3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
+ * @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 AlertLevel implements java.io.Serializable {
   private static final long serialVersionUID = -4752438966587392126L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java b/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java
index a19f93d..f217817 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
 /**
  * A listener whose callback methods are invoked when an {@link Alert}
  * is received.
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
+ * @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 AlertListener extends java.util.EventListener {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java b/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java
index 6cd7fa4..802d37e 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
 import java.util.Map;
 import java.util.Set;
 
-import com.gemstone.gemfire.cache.persistence.PersistentID;
-import com.gemstone.gemfire.distributed.DistributedMember;
+import org.apache.geode.cache.persistence.PersistentID;
+import org.apache.geode.distributed.DistributedMember;
 
 /**
  * The status of a backup operation, returned by
  * {@link AdminDistributedSystem#backupAllMembers(java.io.File,java.io.File)}.
  * 
  * @since GemFire 6.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
+ * @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 BackupStatus {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java b/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java
index 8964d79..ac43c1f 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
    
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
 /**
  * An <code>CacheDoesNotExistException</code> is thrown when an attempt
  * is made to get a cache and one does not exist.
  *
  * @since GemFire     3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
+ * @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 CacheDoesNotExistException extends AdminException {
 private static final long serialVersionUID = -1639933911265729978L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java b/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java
index 11899b1..f2aeb6d 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
 /**
  * Provides configuration information relating to the health of a
  * member of a GemFire distributed system that hosts a GemFire {@link
- * com.gemstone.gemfire.cache.Cache Cache}.
+ * org.apache.geode.cache.Cache Cache}.
  *
  * <P>
  *
@@ -40,7 +40,7 @@ package com.gemstone.gemfire.admin;
  * <LI>The number of entries in the Cache {@link #getMaxEventQueueSize
  * event delivery queue} is too large.</LI>
  * 
- * <LI>If one of the regions is configured with {@link com.gemstone.gemfire.cache.LossAction#FULL_ACCESS FULL_ACCESS}
+ * <LI>If one of the regions is configured with {@link org.apache.geode.cache.LossAction#FULL_ACCESS FULL_ACCESS}
  * on role loss.</LI>
  *
  * </UL>
@@ -50,10 +50,10 @@ package com.gemstone.gemfire.admin;
  * 
  * <UL>
  * 
- * <LI>If one of the regions is configured with {@link com.gemstone.gemfire.cache.LossAction#NO_ACCESS NO_ACCESS}
+ * <LI>If one of the regions is configured with {@link org.apache.geode.cache.LossAction#NO_ACCESS NO_ACCESS}
  * on role loss.</LI> 
  * 
- * <LI>If one of the regions is configured with {@link com.gemstone.gemfire.cache.LossAction#LIMITED_ACCESS LIMITED_ACCESS}
+ * <LI>If one of the regions is configured with {@link org.apache.geode.cache.LossAction#LIMITED_ACCESS LIMITED_ACCESS}
  * on role loss.</LI> 
  * 
  * </UL>
@@ -64,7 +64,7 @@ package com.gemstone.gemfire.admin;
  *
  *
  * @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
+ * @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 CacheHealthConfig {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java b/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java
index e94402d..0149a05 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
 /**
  * A dedicated cache server VM that is managed by the administration

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java b/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java
index 16a402c..fc4ce0f 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
 /**
  * Configuration for a GemFire cache server that is managed by the

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java b/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java
index 6d7e482..5bfeddc 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
 /**
  * A dedicated cache server VM that is managed by the administration
  * API.
  * <p>Note that this may not represent an instance of
- * {@link com.gemstone.gemfire.cache.server.CacheServer}. It is possible for
+ * {@link org.apache.geode.cache.server.CacheServer}. It is possible for
  * a cache VM to be started but for it not to listen for client connections
  * in which case it is not a 
- * {@link com.gemstone.gemfire.cache.server.CacheServer}
+ * {@link org.apache.geode.cache.server.CacheServer}
  * but is an instance of this interface.
  *
  * @since GemFire 5.7
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
+ * @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 CacheVm extends SystemMember, ManagedEntity {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/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
index e5d22de..e7068bc 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheVmConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheVmConfig.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.admin;
+package org.apache.geode.admin;
 
 /**
  * Configuration for a GemFire cache server VM that is managed by the
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.admin;
  * @see AdminDistributedSystem#addCacheVm()
  *
  * @since GemFire 5.7
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
+ * @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 {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/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
index dd62026..ff9b613 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.admin;
+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}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
+ * @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 {