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

[hi...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java
index 32d6df2..be77c7e 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.management.internal.cli.commands;
+package org.apache.geode.management.internal.cli.commands;
 
 import static org.junit.Assert.*;
 
@@ -38,14 +38,14 @@ import org.junit.experimental.categories.Category;
 import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestName;
 
-import com.gemstone.gemfire.internal.util.IOUtils;
-import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.test.junit.categories.IntegrationTest;
 
 /**
  * The LauncherLifecycleCommandsJUnitTest class is a test suite of test cases testing the contract and functionality of
  * the lifecycle launcher GemFire shell (Gfsh) commands.
  *
- * @see com.gemstone.gemfire.management.internal.cli.commands.LauncherLifecycleCommands
+ * @see org.apache.geode.management.internal.cli.commands.LauncherLifecycleCommands
  * @see org.junit.Assert
  * @see org.junit.Test
  * @since GemFire 7.0

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
index 84b8668..6ce0014 100755
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.management.internal.cli.commands;
-
-import com.gemstone.gemfire.GemFireException;
-import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.distributed.ServerLauncher;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.internal.DistributionLocator;
-import com.gemstone.gemfire.internal.lang.StringUtils;
-import com.gemstone.gemfire.internal.lang.SystemUtils;
-import com.gemstone.gemfire.internal.util.IOUtils;
-import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
-import com.gemstone.gemfire.test.junit.categories.UnitTest;
+package org.apache.geode.management.internal.cli.commands;
+
+import org.apache.geode.GemFireException;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.distributed.ServerLauncher;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.DistributionLocator;
+import org.apache.geode.internal.lang.StringUtils;
+import org.apache.geode.internal.lang.SystemUtils;
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+import org.apache.geode.test.junit.categories.UnitTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -34,14 +34,14 @@ import org.junit.experimental.categories.Category;
 import java.io.File;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**
  * The LauncherLifecycleCommandsJUnitTest class is a test suite of test cases testing the contract and functionality of
  * the lifecycle launcher GemFire shell (Gfsh) commands.
  *
- * @see com.gemstone.gemfire.management.internal.cli.commands.LauncherLifecycleCommands
+ * @see org.apache.geode.management.internal.cli.commands.LauncherLifecycleCommands
  * @see org.junit.Assert
  * @see org.junit.Test
  * @since GemFire 7.0

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
index 738718e..0862fde 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
@@ -14,28 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.management.internal.configuration;
-
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
-import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.internal.InternalLocator;
-import com.gemstone.gemfire.internal.ClassBuilder;
-import com.gemstone.gemfire.internal.JarDeployer;
-import com.gemstone.gemfire.internal.admin.remote.ShutdownAllRequest;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.management.cli.Result.Status;
-import com.gemstone.gemfire.management.internal.cli.HeadlessGfsh;
-import com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase;
-import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
-import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
-import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
-import com.gemstone.gemfire.test.dunit.SerializableCallable;
-import com.gemstone.gemfire.test.dunit.VM;
-import com.gemstone.gemfire.test.dunit.WaitCriterion;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+package org.apache.geode.management.internal.configuration;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
+import org.apache.geode.distributed.Locator;
+import org.apache.geode.distributed.internal.InternalLocator;
+import org.apache.geode.internal.ClassBuilder;
+import org.apache.geode.internal.JarDeployer;
+import org.apache.geode.internal.admin.remote.ShutdownAllRequest;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.management.cli.Result.Status;
+import org.apache.geode.management.internal.cli.HeadlessGfsh;
+import org.apache.geode.management.internal.cli.commands.CliCommandTestBase;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+import org.apache.geode.management.internal.cli.result.CommandResult;
+import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.test.dunit.SerializableCallable;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.commons.io.FileUtils;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -48,19 +48,19 @@ import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
 
-import static com.gemstone.gemfire.cache.RegionShortcut.PARTITION;
-import static com.gemstone.gemfire.cache.RegionShortcut.REPLICATE;
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
-import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
-import static com.gemstone.gemfire.internal.FileUtil.delete;
-import static com.gemstone.gemfire.internal.FileUtil.deleteMatching;
-import static com.gemstone.gemfire.internal.lang.StringUtils.isBlank;
-import static com.gemstone.gemfire.management.internal.cli.CliUtil.getAllNormalMembers;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.Host.getHost;
-import static com.gemstone.gemfire.test.dunit.IgnoredException.addIgnoredException;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
-import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
+import static org.apache.geode.cache.RegionShortcut.PARTITION;
+import static org.apache.geode.cache.RegionShortcut.REPLICATE;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
+import static org.apache.geode.internal.FileUtil.delete;
+import static org.apache.geode.internal.FileUtil.deleteMatching;
+import static org.apache.geode.internal.lang.StringUtils.isBlank;
+import static org.apache.geode.management.internal.cli.CliUtil.getAllNormalMembers;
+import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.test.dunit.Host.getHost;
+import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
+import static org.apache.geode.test.dunit.Wait.waitForCriterion;
 
 @Category(DistributedTest.class)
 public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
@@ -205,8 +205,8 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
       byte[] jarBytes = classBuilder.createJarFromClassContent("com/qcdunit/QueueCommandsDUnitTestListener",
           "package com.qcdunit;" +
               "import java.util.List; import java.util.Properties;" +
-              "import com.gemstone.gemfire.internal.cache.xmlcache.Declarable2; import com.gemstone.gemfire.cache.asyncqueue.AsyncEvent;" +
-              "import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener;" +
+              "import org.apache.geode.internal.cache.xmlcache.Declarable2; import org.apache.geode.cache.asyncqueue.AsyncEvent;" +
+              "import org.apache.geode.cache.asyncqueue.AsyncEventListener;" +
               "public class QueueCommandsDUnitTestListener implements Declarable2, AsyncEventListener {" +
               "Properties props;" +
               "public boolean processEvents(List<AsyncEvent> events) { return true; }" +

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionTemplate.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionTemplate.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionTemplate.java
index 8cd0638..b21f94c 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionTemplate.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionTemplate.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web;
+package org.apache.geode.rest.internal.web;
 
-import com.gemstone.gemfire.cache.execute.FunctionAdapter;
+import org.apache.geode.cache.execute.FunctionAdapter;
 
 public abstract class RestFunctionTemplate extends FunctionAdapter {
   public int invocationCount = 0;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
index 8246671..0d93518 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web;
+package org.apache.geode.rest.internal.web;
 
 import com.fasterxml.jackson.core.JsonParser.Feature;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.internal.AvailablePortHelper;
-import com.gemstone.gemfire.internal.GemFireVersion;
-import com.gemstone.gemfire.internal.util.IOUtils;
-import com.gemstone.gemfire.management.internal.AgentUtil;
-import com.gemstone.gemfire.pdx.*;
-import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import org.apache.geode.cache.*;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.management.internal.AgentUtil;
+import org.apache.geode.pdx.*;
+import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -49,7 +49,7 @@ import java.io.InputStreamReader;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**
@@ -63,10 +63,10 @@ import static org.junit.Assert.*;
  * @see org.springframework.test.context.ContextConfiguration
  * @see org.springframework.test.context.junit4.SpringJUnit4ClassRunner
  * @see org.springframework.web.client.RestTemplate
- * @see com.gemstone.gemfire.cache.Cache
- * @see com.gemstone.gemfire.cache.Region
- * @see com.gemstone.gemfire.pdx.PdxInstance
- * @see com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer
+ * @see org.apache.geode.cache.Cache
+ * @see org.apache.geode.cache.Region
+ * @see org.apache.geode.pdx.PdxInstance
+ * @see org.apache.geode.pdx.ReflectionBasedAutoSerializer
  * @since Geode 1.0.0
  */
 //@RunWith(SpringJUnit4ClassRunner.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
index 847ca76..df146a6 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web;
+package org.apache.geode.rest.internal.web;
 
 import static org.junit.Assert.*;
 
@@ -34,10 +34,10 @@ import org.json.JSONException;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import com.gemstone.gemfire.internal.AvailablePortHelper;
-import com.gemstone.gemfire.security.AbstractSecureServerDUnitTest;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import com.gemstone.gemfire.test.junit.categories.SecurityTest;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.security.AbstractSecureServerDUnitTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
 
 @Category({ DistributedTest.class, SecurityTest.class})
 public class RestSecurityDUnitTest extends AbstractSecureServerDUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
index 7344780..b2bb040 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,20 +22,20 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Vector;
 
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheClosedException;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.execute.Function;
-import com.gemstone.gemfire.cache.execute.FunctionContext;
-import com.gemstone.gemfire.cache.query.FunctionDomainException;
-import com.gemstone.gemfire.cache.query.NameResolutionException;
-import com.gemstone.gemfire.cache.query.Query;
-import com.gemstone.gemfire.cache.query.QueryInvocationTargetException;
-import com.gemstone.gemfire.cache.query.SelectResults;
-import com.gemstone.gemfire.cache.query.TypeMismatchException;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.pdx.PdxInstance;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.Query;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.TypeMismatchException;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.pdx.PdxInstance;
 
 /**
  * Gemfire function to add free items in the existing order

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
index c065fbb..801c5a7 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
 import java.io.Serializable;
-import com.gemstone.gemfire.internal.lang.ObjectUtils;
+import org.apache.geode.internal.lang.ObjectUtils;
 
 /**
  * The Customer class models a customer entity.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
index 3a92df3..1467821 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Gender.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Gender.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Gender.java
index 9cd1cdb..774d83c 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Gender.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Gender.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
 /**
  * The Gender enum is a enumeration of genders (sexes).

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java
index daa609e..c047f12 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.gemstone.gemfire.cache.execute.Function;
-import com.gemstone.gemfire.cache.execute.FunctionContext;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionContext;
 
 /**
  * The GetAllEntries is function that will return a map as a result of its execution.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java
index beb8d3a..e224777 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheClosedException;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.execute.Function;
-import com.gemstone.gemfire.cache.execute.FunctionContext;
-import com.gemstone.gemfire.cache.query.FunctionDomainException;
-import com.gemstone.gemfire.cache.query.NameResolutionException;
-import com.gemstone.gemfire.cache.query.Query;
-import com.gemstone.gemfire.cache.query.QueryInvocationTargetException;
-import com.gemstone.gemfire.cache.query.SelectResults;
-import com.gemstone.gemfire.cache.query.TypeMismatchException;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.cache.query.FunctionDomainException;
+import org.apache.geode.cache.query.NameResolutionException;
+import org.apache.geode.cache.query.Query;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.TypeMismatchException;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java
index 6f287c7..9e261a7 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
 import java.util.ArrayList;
 import java.util.Set;
 
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheClosedException;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.execute.Function;
-import com.gemstone.gemfire.cache.execute.FunctionContext;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionContext;
 
 /**
 * The GetRegions class is an gemfire function that gives data about available regions.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java
index 25e87b6..eb461fb 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheClosedException;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.execute.Function;
-import com.gemstone.gemfire.cache.execute.FunctionContext;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionContext;
 
 public class GetValueForKey implements Function {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Item.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Item.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Item.java
index 5f99bbe..e8d4f01 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Item.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Item.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
 import java.io.Serializable;
 
-import com.gemstone.gemfire.internal.lang.ObjectUtils;
-import com.gemstone.gemfire.pdx.PdxReader;
-import com.gemstone.gemfire.pdx.PdxSerializable;
-import com.gemstone.gemfire.pdx.PdxWriter;
+import org.apache.geode.internal.lang.ObjectUtils;
+import org.apache.geode.pdx.PdxReader;
+import org.apache.geode.pdx.PdxSerializable;
+import org.apache.geode.pdx.PdxWriter;
 
 /**
  * The Item class models item entity in the real world.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Order.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Order.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Order.java
index 062aaf9..bcf5c3b 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Order.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Order.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import com.gemstone.gemfire.pdx.PdxReader;
-import com.gemstone.gemfire.pdx.PdxSerializable;
-import com.gemstone.gemfire.pdx.PdxWriter;
+import org.apache.geode.pdx.PdxReader;
+import org.apache.geode.pdx.PdxSerializable;
+import org.apache.geode.pdx.PdxWriter;
 
 /**
 * The Order class is an abstraction modeling a order.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Person.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Person.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Person.java
index 9687f1e..b995ec2 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Person.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Person.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
 import java.util.Date;
-import com.gemstone.gemfire.internal.lang.ObjectUtils;
-import com.gemstone.gemfire.pdx.PdxReader;
-import com.gemstone.gemfire.pdx.PdxSerializable;
-import com.gemstone.gemfire.pdx.PdxWriter;
+import org.apache.geode.internal.lang.ObjectUtils;
+import org.apache.geode.pdx.PdxReader;
+import org.apache.geode.pdx.PdxSerializable;
+import org.apache.geode.pdx.PdxWriter;
 
 import java.io.Serializable;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java
index e75d9fc..ab0f7d0 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
 import java.util.Properties;
 
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.execute.Function;
-import com.gemstone.gemfire.cache.execute.FunctionContext;
-import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.cache.execute.RegionFunctionContext;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
index 62ddb35..b45b683 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
 import static org.junit.Assert.*;
 
@@ -34,26 +34,26 @@ import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.gemstone.gemfire.LogWriter;
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache.execute.FunctionContext;
-import com.gemstone.gemfire.cache.execute.FunctionService;
-import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
-import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
-import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.internal.cache.PartitionAttributesImpl;
-import com.gemstone.gemfire.internal.cache.PartitionedRegion;
-import com.gemstone.gemfire.internal.cache.PartitionedRegionTestHelper;
-import com.gemstone.gemfire.rest.internal.web.RestFunctionTemplate;
-import com.gemstone.gemfire.test.dunit.VM;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import com.gemstone.gemfire.test.junit.runners.CategoryWithParameterizedRunnerFactory;
+import org.apache.geode.LogWriter;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.Scope;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.cache.execute.RegionFunctionContext;
+import org.apache.geode.cache.partition.PartitionRegionHelper;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.cache.PartitionAttributesImpl;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.PartitionedRegionTestHelper;
+import org.apache.geode.rest.internal.web.RestFunctionTemplate;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
 
 /**
  * Dunit Test to validate OnRegion function execution with REST APIs
@@ -87,7 +87,7 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
     factory.setScope(Scope.DISTRIBUTED_ACK);
     factory.setDataPolicy(policy);
     Region region = CacheFactory.getAnyInstance().createRegion(REPLICATE_REGION_NAME, factory.create());
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Region Created :" + region);
+    org.apache.geode.test.dunit.LogWriterUtils.getLogWriter().info("Region Created :" + region);
     assertNotNull(region);
   }
 
@@ -100,7 +100,7 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
     raf.setPartitionAttributes(pa);
 
     Region region = CacheFactory.getAnyInstance().createRegion(PR_REGION_NAME, raf.create());
-    com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("Region Created :" + region);
+    org.apache.geode.test.dunit.LogWriterUtils.getLogWriter().info("Region Created :" + region);
     assertNotNull(region);
     return Boolean.TRUE;
   }
@@ -223,7 +223,7 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
 
     vm3.invoke("populatePRRegion", () -> populatePRRegion());
 
-    String jsonBody = "[" + "{\"@type\": \"double\",\"@value\": 210}" + ",{\"@type\":\"com.gemstone.gemfire.rest.internal.web.controllers.Item\"," + "\"itemNo\":\"599\",\"description\":\"Part X Free on Bumper Offer\"," + "\"quantity\":\"2\"," + "\"unitprice\":\"5\"," + "\"totalprice\":\"10.00\"}" + "]";
+    String jsonBody = "[" + "{\"@type\": \"double\",\"@value\": 210}" + ",{\"@type\":\"org.apache.geode.rest.internal.web.controllers.Item\"," + "\"itemNo\":\"599\",\"description\":\"Part X Free on Bumper Offer\"," + "\"quantity\":\"2\"," + "\"unitprice\":\"5\"," + "\"totalprice\":\"10.00\"}" + "]";
 
     CloseableHttpResponse response = executeFunctionThroughRestCall("SampleFunction", PR_REGION_NAME, null, jsonBody, null, null);
     assertEquals(200, response.getStatusLine().getStatusCode());
@@ -232,7 +232,7 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
     // Assert that only 1 node has executed the function.
     assertCorrectInvocationCount(4, vm0, vm1, vm2, vm3);
 
-    jsonBody = "[" + "{\"@type\": \"double\",\"@value\": 220}" + ",{\"@type\":\"com.gemstone.gemfire.rest.internal.web.controllers.Item\"," + "\"itemNo\":\"609\",\"description\":\"Part X Free on Bumper Offer\"," + "\"quantity\":\"3\"," + "\"unitprice\":\"9\"," + "\"totalprice\":\"12.00\"}" + "]";
+    jsonBody = "[" + "{\"@type\": \"double\",\"@value\": 220}" + ",{\"@type\":\"org.apache.geode.rest.internal.web.controllers.Item\"," + "\"itemNo\":\"609\",\"description\":\"Part X Free on Bumper Offer\"," + "\"quantity\":\"3\"," + "\"unitprice\":\"9\"," + "\"totalprice\":\"12.00\"}" + "]";
 
     resetInvocationCounts(vm0, vm1, vm2, vm3);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
index 57b92be..d35744f 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.test.dunit.Assert.*;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -40,20 +40,20 @@ import org.apache.http.impl.client.HttpClients;
 import org.json.JSONArray;
 import org.junit.experimental.categories.Category;
 
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.execute.FunctionService;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.internal.AvailablePortHelper;
-import com.gemstone.gemfire.internal.GemFireVersion;
-import com.gemstone.gemfire.internal.lang.StringUtils;
-import com.gemstone.gemfire.management.internal.AgentUtil;
-import com.gemstone.gemfire.rest.internal.web.RestFunctionTemplate;
-import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.Invoke;
-import com.gemstone.gemfire.test.dunit.VM;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.lang.StringUtils;
+import org.apache.geode.management.internal.AgentUtil;
+import org.apache.geode.rest.internal.web.RestFunctionTemplate;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.Invoke;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
 
 @Category(DistributedTest.class)
 class RestAPITestBase extends JUnit4DistributedTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index 09410d3..0299615 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.BufferedReader;
@@ -48,32 +48,32 @@ import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.cache.RegionFactory;
-import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.cache.client.ClientCache;
-import com.gemstone.gemfire.cache.client.ClientCacheFactory;
-import com.gemstone.gemfire.cache.client.ClientRegionFactory;
-import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
-import com.gemstone.gemfire.cache.client.internal.LocatorTestBase;
-import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache.server.ServerLoadProbe;
-import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.AvailablePortHelper;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.management.ManagementTestBase;
-import com.gemstone.gemfire.pdx.PdxInstance;
-import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.NetworkUtils;
-import com.gemstone.gemfire.test.dunit.VM;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import com.gemstone.gemfire.test.junit.runners.CategoryWithParameterizedRunnerFactory;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.cache.client.ClientRegionFactory;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.client.internal.LocatorTestBase;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.server.ServerLoadProbe;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.AvailablePort;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.management.ManagementTestBase;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.NetworkUtils;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
 
 /**
  * Dunit Test containing inter - operations between REST Client and Gemfire cache client
@@ -119,14 +119,14 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
   final static String PERSON_AS_JSON_CAS = "{"
       + "\"@old\" :"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Person\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
       + "\"id\": 101," + " \"firstName\": \"Mithali\","
       + " \"middleName\": \"Dorai\"," + " \"lastName\": \"Raj\","
       + " \"birthDate\": \"12/04/1982\"," + "\"gender\": \"FEMALE\""
       + "},"
       + "\"@new\" :"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Person\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
       + "\"id\": 1101," + " \"firstName\": \"Virat\","
       + " \"middleName\": \"Premkumar\"," + " \"lastName\": \"Kohli\","
       + " \"birthDate\": \"08/11/1988\"," + "\"gender\": \"MALE\""
@@ -134,50 +134,50 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
       + "}";
 
   final static String PERSON_AS_JSON_REPLACE = "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Person\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
       + "\"id\": 501," + " \"firstName\": \"Barack\","
       + " \"middleName\": \"Hussein\"," + " \"lastName\": \"Obama\","
       + " \"birthDate\": \"04/08/1961\"," + "\"gender\": \"MALE\""
       + "}";
 
   private static final String PERSON_LIST_AS_JSON = "[" + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Person\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
       + "\"id\": 3," + " \"firstName\": \"Nishka3\","
       + " \"middleName\": \"Nilkanth3\"," + " \"lastName\": \"Patel3\","
       + " \"birthDate\": \"07/31/2009\"," + "\"gender\": \"FEMALE\"" + "},"
-      + "{" + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Person\","
+      + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
       + "\"id\": 4," + " \"firstName\": \"Tanay4\","
       + " \"middleName\": \"kiran4\"," + " \"lastName\": \"Patel4\","
       + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\"" + "}," + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Person\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
       + "\"id\": 5," + " \"firstName\": \"Nishka5\","
       + " \"middleName\": \"Nilkanth5\"," + " \"lastName\": \"Patel5\","
       + " \"birthDate\": \"31/09/2009\"," + "\"gender\": \"FEMALE\"" + "},"
-      + "{" + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Person\","
+      + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
       + "\"id\": 6," + " \"firstName\": \"Tanay6\","
       + " \"middleName\": \"Kiran6\"," + " \"lastName\": \"Patel\","
       + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\"" + "}," + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Person\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
       + "\"id\": 7," + " \"firstName\": \"Nishka7\","
       + " \"middleName\": \"Nilkanth7\"," + " \"lastName\": \"Patel\","
       + " \"birthDate\": \"31/09/2009\"," + "\"gender\": \"FEMALE\"" + "},"
-      + "{" + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Person\","
+      + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
       + "\"id\": 8," + " \"firstName\": \"Tanay8\","
       + " \"middleName\": \"kiran8\"," + " \"lastName\": \"Patel\","
       + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\"" + "}," + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Person\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
       + "\"id\": 9," + " \"firstName\": \"Nishka9\","
       + " \"middleName\": \"Nilkanth9\"," + " \"lastName\": \"Patel\","
       + " \"birthDate\": \"31/09/2009\"," + "\"gender\": \"FEMALE\"" + "},"
-      + "{" + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Person\","
+      + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
       + "\"id\": 10," + " \"firstName\": \"Tanay10\","
       + " \"middleName\": \"kiran10\"," + " \"lastName\": \"Patel\","
       + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\"" + "}," + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Person\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
       + "\"id\": 11," + " \"firstName\": \"Nishka11\","
       + " \"middleName\": \"Nilkanth11\"," + " \"lastName\": \"Patel\","
       + " \"birthDate\": \"31/09/2009\"," + "\"gender\": \"FEMALE\"" + "},"
-      + "{" + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Person\","
+      + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
       + "\"id\": 12," + " \"firstName\": \"Tanay12\","
       + " \"middleName\": \"kiran12\"," + " \"lastName\": \"Patel\","
       + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\"" + "}" + "]";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
index a3a2a10..e8e81cc 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
 import static org.junit.Assert.*;
 
@@ -29,13 +29,13 @@ import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.gemstone.gemfire.cache.execute.FunctionContext;
-import com.gemstone.gemfire.cache.execute.FunctionService;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.rest.internal.web.RestFunctionTemplate;
-import com.gemstone.gemfire.test.dunit.LogWriterUtils;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import com.gemstone.gemfire.test.junit.runners.CategoryWithParameterizedRunnerFactory;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.rest.internal.web.RestFunctionTemplate;
+import org.apache.geode.test.dunit.LogWriterUtils;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
 
 @Category(DistributedTest.class)
 @RunWith(Parameterized.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index ad431f9..64fbba6 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -28,16 +28,16 @@ import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheClosedException;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.execute.FunctionContext;
-import com.gemstone.gemfire.cache.execute.FunctionService;
-import com.gemstone.gemfire.internal.AvailablePortHelper;
-import com.gemstone.gemfire.rest.internal.web.RestFunctionTemplate;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import com.gemstone.gemfire.test.junit.categories.FlakyTest;
-import com.gemstone.gemfire.test.junit.runners.CategoryWithParameterizedRunnerFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.rest.internal.web.RestFunctionTemplate;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
 
 @Category(DistributedTest.class)
 @RunWith(Parameterized.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
index 39b8fb1..390f12d 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.net.InetAddress;
@@ -45,30 +45,30 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.HttpServerErrorException;
 
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.CacheLoader;
-import com.gemstone.gemfire.cache.CacheWriter;
-import com.gemstone.gemfire.cache.CacheWriterException;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.Declarable;
-import com.gemstone.gemfire.cache.EntryEvent;
-import com.gemstone.gemfire.cache.LoaderHelper;
-import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.cache.RegionDestroyedException;
-import com.gemstone.gemfire.cache.RegionEvent;
-import com.gemstone.gemfire.cache.RegionFactory;
-import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.cache.TimeoutException;
-import com.gemstone.gemfire.cache.execute.FunctionService;
-import com.gemstone.gemfire.distributed.ServerLauncher;
-import com.gemstone.gemfire.internal.AvailablePortHelper;
-import com.gemstone.gemfire.internal.GemFireVersion;
-import com.gemstone.gemfire.internal.net.SocketCreator;
-import com.gemstone.gemfire.management.internal.AgentUtil;
-import com.gemstone.gemfire.management.internal.ManagementConstants;
-import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.CacheLoader;
+import org.apache.geode.cache.CacheWriter;
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.Declarable;
+import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.cache.LoaderHelper;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.RegionDestroyedException;
+import org.apache.geode.cache.RegionEvent;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.TimeoutException;
+import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.distributed.ServerLauncher;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.internal.GemFireVersion;
+import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.management.internal.AgentUtil;
+import org.apache.geode.management.internal.ManagementConstants;
+import org.apache.geode.test.junit.categories.IntegrationTest;
 
 @Category(IntegrationTest.class)
 public class RestAPIsQueryAndFEJUnitTest {
@@ -92,7 +92,7 @@ public class RestAPIsQueryAndFEJUnitTest {
   private Map<Integer, QueryResultData> queryResultByIndex;
  
   private final String ORDER1_AS_JSON = "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Order\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
       + "\"purchaseOrderNo\": 111," + "\"customerId\": 101,"
       + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\"," + "\"deliveryDate\": \"01/20/2014\","
       + "\"contact\": \"Nilkanthkumar N Patel\","
@@ -105,7 +105,7 @@ public class RestAPIsQueryAndFEJUnitTest {
       + "}" + "]" + "}";
   
   private final String MALFORMED_JSON = "{"
-      + "\"@type\" \"com.gemstone.gemfire.rest.internal.web.controllers.Order\","
+      + "\"@type\" \"org.apache.geode.rest.internal.web.controllers.Order\","
       + "\"purchaseOrderNo\": 111," + "\"customerId\": 101,"
       + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\"," + "\"deliveryDate\": \"01/20/2014\","
       + "\"contact\": \"Nilkanthkumar N Patel\","
@@ -118,7 +118,7 @@ public class RestAPIsQueryAndFEJUnitTest {
       + "}" + "]" + "}";
   
   private final String ORDER2_AS_JSON = "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Order\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
       + "\"purchaseOrderNo\": 112," + "\"customerId\": 102,"
       + "\"description\": \"Purchase order for company - B\"," + "\"orderDate\": \"02/10/2014\"," + "\"deliveryDate\": \"02/20/2014\","
       + "\"contact\": \"John Blum\","
@@ -131,7 +131,7 @@ public class RestAPIsQueryAndFEJUnitTest {
       + "}" + "]" + "}";
   
   private final String ORDER2_UPDATED_AS_JSON = "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Order\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
       + "\"purchaseOrderNo\": 1112," + "\"customerId\": 102,"
       + "\"description\": \"Purchase order for company - B\","  + "\"orderDate\": \"02/10/2014\"," + "\"deliveryDate\": \"02/20/2014\","
       + "\"contact\": \"John Blum\","
@@ -145,25 +145,25 @@ public class RestAPIsQueryAndFEJUnitTest {
   
   final String CUSTOMER_LIST1_AS_JSON = "[" 
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 1,"
       + " \"firstName\": \"Vishal\","
       + " \"lastName\": \"Roa\"" 
       + "},"
       +"{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 2,"
       + " \"firstName\": \"Nilkanth\","
       + " \"lastName\": \"Patel\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 3,"
       + " \"firstName\": \"Avinash Dongre\","
       + " \"lastName\": \"Roa\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 4,"
       + " \"firstName\": \"Avinash Dongre\","
       + " \"lastName\": \"Roa\"" 
@@ -172,181 +172,181 @@ public class RestAPIsQueryAndFEJUnitTest {
       
   final String CUSTOMER_LIST_AS_JSON = "[" 
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 101,"
       + " \"firstName\": \"Vishal\","
       + " \"lastName\": \"Roa\"" 
       + "},"
       +"{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 102,"
       + " \"firstName\": \"Nilkanth\","
       + " \"lastName\": \"Patel\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 103,"
       + " \"firstName\": \"Avinash Dongre\","
       + " \"lastName\": \"Roa\"" 
       + "},"
       +"{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 104,"
       + " \"firstName\": \"John\","
       + " \"lastName\": \"Blum\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 105,"
       + " \"firstName\": \"Shankar\","
       + " \"lastName\": \"Hundekar\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 106,"
       + " \"firstName\": \"Amey\","
       + " \"lastName\": \"Barve\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 107,"
       + " \"firstName\": \"Vishal\","
       + " \"lastName\": \"Roa\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 108,"
       + " \"firstName\": \"Supriya\","
       + " \"lastName\": \"Pillai\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 109,"
       + " \"firstName\": \"Tushar\","
       + " \"lastName\": \"khairnar\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 110,"
       + " \"firstName\": \"Rishitesh\","
       + " \"lastName\": \"Mishra\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 111,"
       + " \"firstName\": \"Ajay\","
       + " \"lastName\": \"Pandey\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 112,"
       + " \"firstName\": \"Suyog\","
       + " \"lastName\": \"Bokare\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 113,"
       + " \"firstName\": \"Rajesh\","
       + " \"lastName\": \"kumar\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 114,"
       + " \"firstName\": \"swati\","
       + " \"lastName\": \"sawant\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 115,"
       + " \"firstName\": \"sonal\","
       + " \"lastName\": \"Agrawal\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 116,"
       + " \"firstName\": \"Amogh\","
       + " \"lastName\": \"Shetkar\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 117,"
       + " \"firstName\": \"Viren\","
       + " \"lastName\": \"Balaut\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 118,"
       + " \"firstName\": \"Namrata\","
       + " \"lastName\": \"Tanvi\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 119,"
       + " \"firstName\": \"Rahul\","
       + " \"lastName\": \"Diyekar\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 120,"
       + " \"firstName\": \"Varun\","
       + " \"lastName\": \"Agrawal\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 121,"
       + " \"firstName\": \"Hemant\","
       + " \"lastName\": \"Bhanavat\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 122,"
       + " \"firstName\": \"Sunil\","
       + " \"lastName\": \"jigyasu\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 123,"
       + " \"firstName\": \"Sumedh\","
       + " \"lastName\": \"wale\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 124,"
       + " \"firstName\": \"saobhik\","
       + " \"lastName\": \"chaudhari\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 125,"
       + " \"firstName\": \"Ketki\","
       + " \"lastName\": \"Naidu\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 126,"
       + " \"firstName\": \"YOgesh\","
       + " \"lastName\": \"Mahajan\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 127,"
       + " \"firstName\": \"Surinder\","
       + " \"lastName\": \"Bindra\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 128,"
       + " \"firstName\": \"sandip\","
       + " \"lastName\": \"kasbe\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 129,"
       + " \"firstName\": \"shivam\","
       + " \"lastName\": \"Panada\"" 
       + "},"
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Customer\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
       +"\"customerId\": 130,"
       + " \"firstName\": \"Preeti\","
       + " \"lastName\": \"Kumari\"" 
@@ -506,7 +506,7 @@ public class RestAPIsQueryAndFEJUnitTest {
   private final String ORDER_AS_CASJSON = "{"
       + "\"@old\" :" 
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Order\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
       + "\"purchaseOrderNo\": 111," + "\"customerId\": 101,"
       + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\"," + "\"deliveryDate\": \"01/20/2014\","
       + "\"contact\": \"Nilkanthkumar N Patel\","
@@ -520,7 +520,7 @@ public class RestAPIsQueryAndFEJUnitTest {
       + "},"
       + "\"@new\" :" 
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Order\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
       + "\"purchaseOrderNo\": 11101," + "\"customerId\": 101,"
       + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\"," + "\"deliveryDate\": \"01/20/2014\","
       + "\"contact\": \"Nilkanthkumar N Patel\","
@@ -555,7 +555,7 @@ public class RestAPIsQueryAndFEJUnitTest {
   private final String MALFORMED_CAS_JSON = "{"
       + "\"@old\" :" 
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Order\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
       + "\"purchaseOrderNo\": 111," + "\"customerId\": 101,"
       + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\"," + "\"deliveryDate\": \"01/20/2014\","
       + "\"contact\": \"Nilkanthkumar N Patel\","
@@ -569,7 +569,7 @@ public class RestAPIsQueryAndFEJUnitTest {
       + "},"
        
       + "{"
-      + "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Order\","
+      + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
       + "\"purchaseOrderNo\": 11101," + "\"customerId\": 101,"
       + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\"," + "\"deliveryDate\": \"01/20/2014\","
       + "\"contact\": \"Nilkanthkumar N Patel\","
@@ -672,7 +672,7 @@ public class RestAPIsQueryAndFEJUnitTest {
     +        "\"@value\": 210"
     +    "},"
     +    "{"
-    +        "\"@type\": \"com.gemstone.gemfire.rest.internal.web.controllers.Item\","
+    +        "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Item\","
     +        "\"itemNo\": \"599\","
     +        "\"description\": \"Part X Free on Bumper Offer\","
     +        "\"quantity\": \"2\","
@@ -1477,11 +1477,11 @@ public class RestAPIsQueryAndFEJUnitTest {
       c.getLogger().info("<ExpectedException action=add>" + expectedEx + "</ExpectedException>");
       return expectedEx;
     } else if (index == 7) {
-      expectedEx = "com.gemstone.gemfire.cache.TimeoutException";
+      expectedEx = "org.apache.geode.cache.TimeoutException";
       c.getLogger().info("<ExpectedException action=add>" + expectedEx + "</ExpectedException>");
       return expectedEx;
     } else if (index == 11 || index == 15) {
-      expectedEx = "com.gemstone.gemfire.cache.CacheWriterException";
+      expectedEx = "org.apache.geode.cache.CacheWriterException";
       c.getLogger().info("<ExpectedException action=add>" + expectedEx + "</ExpectedException>");
       return expectedEx;
     } else if (index == 19) {
@@ -1489,7 +1489,7 @@ public class RestAPIsQueryAndFEJUnitTest {
       c.getLogger().info("<ExpectedException action=add>" + expectedEx + "</ExpectedException>");
       return expectedEx;
     } else if (index == 38 || index == 41 ) {
-      expectedEx = "com.gemstone.gemfire.cache.RegionDestroyedException";
+      expectedEx = "org.apache.geode.cache.RegionDestroyedException";
       c.getLogger().info("<ExpectedException action=add>" + expectedEx + "</ExpectedException>");
       return expectedEx;
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index 17c0dcf..cd6b590 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.BufferedReader;
@@ -51,33 +51,33 @@ import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.cache.RegionFactory;
-import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.cache.client.ClientCache;
-import com.gemstone.gemfire.cache.client.ClientCacheFactory;
-import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
-import com.gemstone.gemfire.cache.client.internal.LocatorTestBase;
-import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.internal.AvailablePortHelper;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.security.SecurableCommunicationChannel;
-import com.gemstone.gemfire.management.ManagementException;
-import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.IgnoredException;
-import com.gemstone.gemfire.test.dunit.NetworkUtils;
-import com.gemstone.gemfire.test.dunit.VM;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import com.gemstone.gemfire.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-import com.gemstone.gemfire.util.test.TestUtil;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.client.internal.LocatorTestBase;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.AvailablePort;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.security.SecurableCommunicationChannel;
+import org.apache.geode.management.ManagementException;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.NetworkUtils;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
+import org.apache.geode.util.test.TestUtil;
 
 /**
  * @since GemFire 8.0
@@ -335,7 +335,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
 
     IgnoredException.addIgnoredException("java.net.BindException");
     IgnoredException.addIgnoredException("java.rmi.server.ExportException");
-    IgnoredException.addIgnoredException("com.gemstone.gemfire.management.ManagementException");
+    IgnoredException.addIgnoredException("org.apache.geode.management.ManagementException");
 
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
@@ -490,8 +490,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
   public void testSimpleSSLWithMultiKey_KeyStore() throws Exception {
 
     Properties props = new Properties();
-    props.setProperty(SSL_KEYSTORE, TestUtil.getResourcePath(getClass(), "/com/gemstone/gemfire/internal/net/multiKey.jks"));
-    props.setProperty(SSL_TRUSTSTORE, TestUtil.getResourcePath(getClass(), "/com/gemstone/gemfire/internal/net/multiKeyTrust.jks"));
+    props.setProperty(SSL_KEYSTORE, TestUtil.getResourcePath(getClass(), "/org/apache/geode/internal/net/multiKey.jks"));
+    props.setProperty(SSL_TRUSTSTORE, TestUtil.getResourcePath(getClass(), "/org/apache/geode/internal/net/multiKeyTrust.jks"));
     props.setProperty(SSL_KEYSTORE_PASSWORD, "password");
     props.setProperty(SSL_TRUSTSTORE_PASSWORD, "password");
     props.setProperty(SSL_KEYSTORE_TYPE, "JKS");
@@ -506,8 +506,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
   public void testSimpleSSLWithMultiKey_KeyStore_WithInvalidClientKey() throws Exception {
 
     Properties props = new Properties();
-    props.setProperty(SSL_KEYSTORE, TestUtil.getResourcePath(getClass(), "/com/gemstone/gemfire/internal/net/multiKey.jks"));
-    props.setProperty(SSL_TRUSTSTORE, TestUtil.getResourcePath(getClass(), "/com/gemstone/gemfire/internal/net/multiKeyTrust.jks"));
+    props.setProperty(SSL_KEYSTORE, TestUtil.getResourcePath(getClass(), "/org/apache/geode/internal/net/multiKey.jks"));
+    props.setProperty(SSL_TRUSTSTORE, TestUtil.getResourcePath(getClass(), "/org/apache/geode/internal/net/multiKeyTrust.jks"));
     props.setProperty(SSL_KEYSTORE_PASSWORD, "password");
     props.setProperty(SSL_TRUSTSTORE_PASSWORD, "password");
     props.setProperty(SSL_KEYSTORE_TYPE, "JKS");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java
index edad9f8..233a6e0 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.rest.internal.web.controllers;
+package org.apache.geode.rest.internal.web.controllers;
 
 import java.net.URI;
 import java.text.SimpleDateFormat;
@@ -89,8 +89,8 @@ public class RestTestUtils  {
   protected static HttpMessageConverter<Object> createMarshallingHttpMessageConverter() {
     final Jaxb2Marshaller jaxbMarshaller = new Jaxb2Marshaller();
 
-    jaxbMarshaller.setContextPaths("com.gemstone.gemfire.web.rest.domain",
-        "com.gemstone.gemfire.web.controllers.support");
+    jaxbMarshaller.setContextPaths("org.apache.geode.web.rest.domain",
+        "org.apache.geode.web.controllers.support");
     jaxbMarshaller.setMarshallerProperties(Collections.singletonMap(
         "jaxb.formatted.output", Boolean.TRUE));
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-common/src/main/java/org/apache/geode/annotations/Experimental.java
----------------------------------------------------------------------
diff --git a/geode-common/src/main/java/org/apache/geode/annotations/Experimental.java b/geode-common/src/main/java/org/apache/geode/annotations/Experimental.java
index 0ce94a1..d628ea5 100755
--- a/geode-common/src/main/java/org/apache/geode/annotations/Experimental.java
+++ b/geode-common/src/main/java/org/apache/geode/annotations/Experimental.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 java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;