geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hiteshkhame...@apache.org
Subject [26/65] [abbrv] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode
Date Thu, 15 Sep 2016 01:59:47 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java
index 23513d6..2c70418 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.distributed.internal.deadlock;
+package org.apache.geode.distributed.internal.deadlock;
 
 import java.io.BufferedInputStream;
 import java.io.File;

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

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java
index 0c67bb8..a6c8dd7 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.distributed.internal.deadlock;
+package org.apache.geode.distributed.internal.deadlock;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -27,8 +27,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.gemstone.gemfire.distributed.internal.deadlock.MessageDependencyMonitor.MessageKey;
-import com.gemstone.gemfire.internal.util.PluckStacks;
+import org.apache.geode.distributed.internal.deadlock.MessageDependencyMonitor.MessageKey;
+import org.apache.geode.internal.util.PluckStacks;
 
 /**
  * This class holds a graph of dependencies between objects

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java
index 6a40596..ee72bd3 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.distributed.internal.deadlock;
+package org.apache.geode.distributed.internal.deadlock;
 
 import java.io.Serializable;
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java
index cbd3a8c..95c5eca 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.distributed.internal.deadlock;
+package org.apache.geode.distributed.internal.deadlock;
 
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.gemstone.gemfire.internal.CopyOnWriteHashSet;
+import org.apache.geode.internal.CopyOnWriteHashSet;
 
 /**
  * A singleton which keeps track of all of the dependency monitors registered in

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector.java
index a972ed6..dfbe0dc 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.distributed.internal.deadlock;
+package org.apache.geode.distributed.internal.deadlock;
 
 import java.io.Serializable;
 import java.util.HashSet;
@@ -22,17 +22,17 @@ import java.util.LinkedList;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import com.gemstone.gemfire.cache.execute.Execution;
-import com.gemstone.gemfire.cache.execute.Function;
-import com.gemstone.gemfire.cache.execute.FunctionContext;
-import com.gemstone.gemfire.cache.execute.FunctionException;
-import com.gemstone.gemfire.cache.execute.FunctionService;
-import com.gemstone.gemfire.cache.execute.ResultCollector;
-import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.internal.cache.execute.AbstractExecution;
+import org.apache.geode.cache.execute.Execution;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.cache.execute.FunctionException;
+import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.cache.execute.ResultCollector;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.execute.AbstractExecution;
 
 /**
  * This class uses gemfire function execution to get the dependencies between

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalLockInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalLockInfo.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalLockInfo.java
index 67c02f9..fb5c4ea 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalLockInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalLockInfo.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.distributed.internal.deadlock;
+package org.apache.geode.distributed.internal.deadlock;
 
 import java.io.Serializable;
 import java.lang.management.LockInfo;
 import java.lang.management.MonitorInfo;
 
-import com.gemstone.gemfire.internal.concurrent.LI;
+import org.apache.geode.internal.concurrent.LI;
 
 /**
  * This class is serializable version of the java 1.6 lock info

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalThread.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalThread.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalThread.java
index 6280346..32eb6bc 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalThread.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalThread.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.distributed.internal.deadlock;
+package org.apache.geode.distributed.internal.deadlock;
 
 import java.io.Serializable;
 import java.lang.management.LockInfo;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor.java
index fe590aa..c041dc6 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.distributed.internal.deadlock;
+package org.apache.geode.distributed.internal.deadlock;
 
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.gemstone.gemfire.distributed.internal.DistributionMessage;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.distributed.internal.MessageWithReply;
-import com.gemstone.gemfire.distributed.internal.ReplyProcessor21;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.MessageWithReply;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 
 /**
  * 

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

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocal.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocal.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocal.java
index 9d99aa8..1a69aec 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocal.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocal.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.distributed.internal.deadlock;
+package org.apache.geode.distributed.internal.deadlock;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
index 6ac4657..61dba05 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
@@ -15,26 +15,26 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.direct;
-
-import com.gemstone.gemfire.*;
-import com.gemstone.gemfire.cache.TimeoutException;
-import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
-import com.gemstone.gemfire.distributed.internal.*;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.distributed.internal.membership.MembershipManager;
-import com.gemstone.gemfire.i18n.StringId;
-import com.gemstone.gemfire.internal.net.SocketCreator;
-import com.gemstone.gemfire.internal.cache.DirectReplyMessage;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.AlertAppender;
-import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
-import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
-import com.gemstone.gemfire.internal.tcp.*;
-import com.gemstone.gemfire.internal.util.Breadcrumbs;
-import com.gemstone.gemfire.internal.util.concurrent.ReentrantSemaphore;
+package org.apache.geode.distributed.internal.direct;
+
+import org.apache.geode.*;
+import org.apache.geode.cache.TimeoutException;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.DistributedSystemDisconnectedException;
+import org.apache.geode.distributed.internal.*;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.membership.MembershipManager;
+import org.apache.geode.i18n.StringId;
+import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.internal.cache.DirectReplyMessage;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.AlertAppender;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.tcp.*;
+import org.apache.geode.internal.util.Breadcrumbs;
+import org.apache.geode.internal.util.concurrent.ReentrantSemaphore;
 import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
@@ -47,7 +47,7 @@ import java.util.concurrent.Semaphore;
 /**
  * DirectChannel is used to interact directly with other Direct servers to
  * distribute GemFire messages to other nodes.  It is held by a
- * com.gemstone.gemfire.internal.cache.distribution.DistributionChannel,
+ * org.apache.geode.internal.cache.distribution.DistributionChannel,
  * which is used by the DistributionManager to send and receive asynchronous
  * messages.
  */
@@ -176,7 +176,7 @@ public class DirectChannel {
   }
   private void acquireGroupSendPermission(boolean ordered) {
     if (this.disconnected) {
-      throw new com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException(LocalizedStrings.DirectChannel_DIRECT_CHANNEL_HAS_BEEN_STOPPED.toLocalizedString());
+      throw new org.apache.geode.distributed.DistributedSystemDisconnectedException(LocalizedStrings.DirectChannel_DIRECT_CHANNEL_HAS_BEEN_STOPPED.toLocalizedString());
     }
     // @todo darrel: add some stats
     final Semaphore s = getGroupSem(ordered);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannelListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannelListener.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannelListener.java
index a97676d..df414db 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannelListener.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannelListener.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.distributed.internal.direct;
+package org.apache.geode.distributed.internal.direct;
 
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
 
 public interface DirectChannelListener {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/ShunnedMemberException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/ShunnedMemberException.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/ShunnedMemberException.java
index 59db762..c439d4a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/ShunnedMemberException.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/ShunnedMemberException.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.distributed.internal.direct;
+package org.apache.geode.distributed.internal.direct;
 
-import com.gemstone.gemfire.GemFireCheckedException;
+import org.apache.geode.GemFireCheckedException;
 
 /**
  * Exception thrown when a member is no longer in the distributed system

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/distribution-overview.html
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/distribution-overview.html b/geode-core/src/main/java/org/apache/geode/distributed/internal/distribution-overview.html
index 9e07ead..d151c1c 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/distribution-overview.html
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/distribution-overview.html
@@ -21,10 +21,10 @@ limitations under the License.
 
 Distributed GemFire moves information between physical machines in a
 number of different ways.  The JCache implementation uses {@link
-com.gemstone.gemfire.distributed.internal.DistributionMessage}s
+org.apache.geode.distributed.internal.DistributionMessage}s
 to send information back and forth between VMs.  The distributed
 collections use the remote method invocation built on top of a {@link
-com.gemstone.gemfire.tcp.TCPConuit} to access elements in remote
+org.apache.geode.tcp.TCPConuit} to access elements in remote
 collections.  GemFire distirbution uses underlying technologies such
 as JavaGroups, and sockets to implement data transfer.
 
@@ -35,7 +35,7 @@ exposed to concepts such as the "distribution manager" and the fact
 that multicast networking or "locators" are used to discover the other
 members of the distributed group.  The user-level configuration is
 grouped together in the {@link
-com.gemstone.gemfire.distributed.DistributedSystem} class which
+org.apache.geode.distributed.DistributedSystem} class which
 provides a "connection" or entry point to the distributed system.
 
 </BODY>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/Collaboration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/Collaboration.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/Collaboration.java
index 061154a..ef33f2a 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/Collaboration.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/Collaboration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,10 +25,10 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.CancelCriterion;
-import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
+import org.apache.geode.CancelCriterion;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
 
 /**
  * Synchronization structure which allows multiple threads to lock the

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatch.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatch.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatch.java
index 832f949..6690893 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatch.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatch.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
 import java.util.*;
-import com.gemstone.gemfire.distributed.internal.membership.*;
+import org.apache.geode.distributed.internal.membership.*;
 
 /**
  * Collection of distributed locks to be processed as a batch. 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatchId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatchId.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatchId.java
index e3a7892..94f2cf3 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatchId.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatchId.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
-import com.gemstone.gemfire.DataSerializable;
-import com.gemstone.gemfire.distributed.internal.locks.LockGrantorId;
+import org.apache.geode.DataSerializable;
+import org.apache.geode.distributed.internal.locks.LockGrantorId;
 
 /** 
  * Identifies a {@link DLockBatch}.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java
index 3fcc720..5ef7647 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java
@@ -15,28 +15,28 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
-
-import com.gemstone.gemfire.CancelCriterion;
-import com.gemstone.gemfire.CancelException;
-import com.gemstone.gemfire.cache.CommitConflictException;
-import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
-import com.gemstone.gemfire.distributed.LockServiceDestroyedException;
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.distributed.internal.MembershipListener;
-import com.gemstone.gemfire.distributed.internal.locks.DLockQueryProcessor.DLockQueryMessage;
-import com.gemstone.gemfire.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.cache.IdentityArrayList;
-import com.gemstone.gemfire.internal.cache.TXReservationMgr;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
-import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
-import com.gemstone.gemfire.internal.util.concurrent.StoppableCountDownLatch;
-import com.gemstone.gemfire.internal.util.concurrent.StoppableReentrantReadWriteLock;
+package org.apache.geode.distributed.internal.locks;
+
+import org.apache.geode.CancelCriterion;
+import org.apache.geode.CancelException;
+import org.apache.geode.cache.CommitConflictException;
+import org.apache.geode.distributed.DistributedSystemDisconnectedException;
+import org.apache.geode.distributed.LockServiceDestroyedException;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.locks.DLockQueryProcessor.DLockQueryMessage;
+import org.apache.geode.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.cache.IdentityArrayList;
+import org.apache.geode.internal.cache.TXReservationMgr;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch;
+import org.apache.geode.internal.util.concurrent.StoppableReentrantReadWriteLock;
 import org.apache.logging.log4j.Logger;
 
 import java.util.*;
@@ -585,12 +585,12 @@ public class DLockGrantor {
    * <p>
    * Acquires acquireDestroyReadLock. Synchronizes on batchLocks.
    * <p>
-   * see com.gemstone.gemfire.internal.cache.TXCommitMessage#updateLockMembers()
+   * see org.apache.geode.internal.cache.TXCommitMessage#updateLockMembers()
    *  
    * @param batchId the identifier for the batch to retrieve
    * @return the transaction lock batch identified by the given batchId
-   * @see com.gemstone.gemfire.internal.cache.locks.TXLockUpdateParticipantsMessage
-   * @see com.gemstone.gemfire.internal.cache.locks.TXLockBatch#getBatchId()
+   * @see org.apache.geode.internal.cache.locks.TXLockUpdateParticipantsMessage
+   * @see org.apache.geode.internal.cache.locks.TXLockBatch#getBatchId()
    */
   public DLockBatch getLockBatch(Object batchId) throws InterruptedException {
     DLockBatch ret = null;
@@ -624,12 +624,12 @@ public class DLockGrantor {
    * <p>
    * Acquires acquireDestroyReadLock. Synchronizes on batchLocks.
    * <p>
-   * see com.gemstone.gemfire.internal.cache.locks.TXCommitMessage#updateLockMembers()
+   * see org.apache.geode.internal.cache.locks.TXCommitMessage#updateLockMembers()
    * 
    * @param batchId the identify of the transaction lock batch
    * @param newBatch the new lock batch to be used
-   * @see com.gemstone.gemfire.internal.cache.locks.TXLockUpdateParticipantsMessage
-   * @see com.gemstone.gemfire.internal.cache.locks.TXLockBatch#getBatchId()
+   * @see org.apache.geode.internal.cache.locks.TXLockUpdateParticipantsMessage
+   * @see org.apache.geode.internal.cache.locks.TXLockBatch#getBatchId()
    */
   public void updateLockBatch(Object batchId, DLockBatch newBatch) throws InterruptedException {
     final boolean isDebugEnabled_DLS = logger.isTraceEnabled(LogMarker.DLS);
@@ -1115,7 +1115,7 @@ public class DLockGrantor {
       throws InterruptedException {
     // bug 32657 has another cause in this method... interrupted thread from
     // connection/channel layer caused acquireDestroyReadLock to fail... 
-    // fixed by Darrel in com.gemstone.gemfire.internal.tcp.Connection
+    // fixed by Darrel in org.apache.geode.internal.tcp.Connection
     final boolean isDebugEnabled_DLS = logger.isTraceEnabled(LogMarker.DLS);
     if (acquireDestroyReadLock(0)) {
       try {
@@ -3112,7 +3112,7 @@ public class DLockGrantor {
      * Returns true if this lock represents suspend locking.
      * 
      * @return true if this lock represents suspend locking
-     * @see com.gemstone.gemfire.distributed.DistributedLockService#suspendLocking(long)
+     * @see org.apache.geode.distributed.DistributedLockService#suspendLocking(long)
      */
     boolean isSuspendLockingToken() {
       return DLockService.SUSPEND_LOCKING_TOKEN.equals(this.lockName);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java
index 5909e24..8b38665 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
-import com.gemstone.gemfire.distributed.internal.membership.*;
+import org.apache.geode.distributed.internal.membership.*;
 
 /**
  * Provides hook for handling departure of a lease holder (lessor).

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java
index 7ac74b4..760e15e 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -23,22 +23,22 @@ import java.io.IOException;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.distributed.LockServiceDestroyedException;
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.DistributionMessage;
-import com.gemstone.gemfire.distributed.internal.MessageWithReply;
-import com.gemstone.gemfire.distributed.internal.PooledDistributionMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyException;
-import com.gemstone.gemfire.distributed.internal.ReplyMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyProcessor21;
-import com.gemstone.gemfire.distributed.internal.locks.DLockGrantor.DLockGrantToken;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.LockServiceDestroyedException;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.MessageWithReply;
+import org.apache.geode.distributed.internal.PooledDistributionMessage;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.distributed.internal.locks.DLockGrantor.DLockGrantToken;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LogMarker;
 
 /**
  * Queries the grantor for current leasing information of a lock.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
index 5f283c6..7a9d658 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -26,21 +26,21 @@ import java.util.Set;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.DistributionMessage;
-import com.gemstone.gemfire.distributed.internal.MessageWithReply;
-import com.gemstone.gemfire.distributed.internal.PooledDistributionMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyException;
-import com.gemstone.gemfire.distributed.internal.ReplyMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyProcessor21;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
-import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.MessageWithReply;
+import org.apache.geode.distributed.internal.PooledDistributionMessage;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.logging.log4j.LogMarker;
 
 /**
  * Handles messaging to all members of a lock service for the purposes of

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java
index d94a82c..c649756 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockReleaseProcessor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
   
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -23,21 +23,21 @@ import java.io.IOException;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.distributed.LockServiceDestroyedException;
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.DistributionMessage;
-import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage;
-import com.gemstone.gemfire.distributed.internal.MessageWithReply;
-import com.gemstone.gemfire.distributed.internal.ReplyException;
-import com.gemstone.gemfire.distributed.internal.ReplyMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyProcessor21;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.distributed.LockServiceDestroyedException;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.HighPriorityDistributionMessage;
+import org.apache.geode.distributed.internal.MessageWithReply;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LogMarker;
 
 /**
  * Synchronously releases a lock.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRemoteToken.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRemoteToken.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRemoteToken.java
index 783a65e..5f890db 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRemoteToken.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRemoteToken.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
-import com.gemstone.gemfire.internal.DataSerializableFixedID;
-import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.Version;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 
 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/distributed/internal/locks/DLockRequestProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRequestProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRequestProcessor.java
index 7d34840..50681ce 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRequestProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRequestProcessor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -23,27 +23,27 @@ import java.io.IOException;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.CancelCriterion;
-import com.gemstone.gemfire.CancelException;
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.InternalGemFireError;
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.distributed.LockServiceDestroyedException;
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.DistributionMessage;
-import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage;
-import com.gemstone.gemfire.distributed.internal.MessageWithReply;
-import com.gemstone.gemfire.distributed.internal.ProcessorKeeper21;
-import com.gemstone.gemfire.distributed.internal.ReplyException;
-import com.gemstone.gemfire.distributed.internal.ReplyMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyProcessor21;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
-import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
+import org.apache.geode.CancelCriterion;
+import org.apache.geode.CancelException;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.distributed.LockServiceDestroyedException;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.HighPriorityDistributionMessage;
+import org.apache.geode.distributed.internal.MessageWithReply;
+import org.apache.geode.distributed.internal.ProcessorKeeper21;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.logging.log4j.LogMarker;
 
 /**
  * Provides handling of remote and local lock requests.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
index 7314b61..7d4b8c6 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
@@ -15,28 +15,28 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
-
-import com.gemstone.gemfire.*;
-import com.gemstone.gemfire.distributed.*;
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.distributed.internal.ResourceEvent;
-import com.gemstone.gemfire.distributed.internal.deadlock.UnsafeThreadLocal;
-import com.gemstone.gemfire.distributed.internal.locks.DLockQueryProcessor.DLockQueryReplyMessage;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.DataSerializableFixedID;
-import com.gemstone.gemfire.internal.OSProcess;
-import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
-import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
-import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
-import com.gemstone.gemfire.internal.util.StopWatch;
-import com.gemstone.gemfire.internal.util.concurrent.FutureResult;
+package org.apache.geode.distributed.internal.locks;
+
+import org.apache.geode.*;
+import org.apache.geode.distributed.*;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.ResourceEvent;
+import org.apache.geode.distributed.internal.deadlock.UnsafeThreadLocal;
+import org.apache.geode.distributed.internal.locks.DLockQueryProcessor.DLockQueryReplyMessage;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.OSProcess;
+import org.apache.geode.internal.Version;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.LoggingThreadGroup;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.util.StopWatch;
+import org.apache.geode.internal.util.concurrent.FutureResult;
 import org.apache.logging.log4j.Logger;
 
 import java.io.DataInput;
@@ -2069,7 +2069,7 @@ public class DLockService extends DistributedLockService {
    * Caller must be synchronized on {@link 
    * DLockService#services}.
    * 
-   * @see com.gemstone.gemfire.distributed.DistributedLockService#create(String, DistributedSystem)
+   * @see org.apache.geode.distributed.DistributedLockService#create(String, DistributedSystem)
    */
   static DLockService basicCreate(String serviceName, 
                                   InternalDistributedSystem ds,
@@ -2338,7 +2338,7 @@ public class DLockService extends DistributedLockService {
    * Returns copy of the tokens map. Synchronizes on token map.
    * <p>
    * Called by {@link 
-   * com.gemstone.gemfire.internal.admin.remote.FetchDistLockInfoResponse}.
+   * org.apache.geode.internal.admin.remote.FetchDistLockInfoResponse}.
    * 
    * @return copy of the tokens map
    */
@@ -2406,7 +2406,7 @@ public class DLockService extends DistributedLockService {
   }
 
   /**
-   * @see com.gemstone.gemfire.distributed.DistributedLockService#destroy(String)
+   * @see org.apache.geode.distributed.DistributedLockService#destroy(String)
    */
   public static void destroyServiceNamed(String serviceName)
   throws IllegalArgumentException {
@@ -2930,7 +2930,7 @@ public class DLockService extends DistributedLockService {
   // -------------------------------------------------------------------------
   
   /**
-   * @see com.gemstone.gemfire.distributed.DistributedLockService#getServiceNamed(String)
+   * @see org.apache.geode.distributed.DistributedLockService#getServiceNamed(String)
    */
   public static DistributedLockService getServiceNamed(String serviceName) {
     DLockService svc = null;
@@ -2967,7 +2967,7 @@ public class DLockService extends DistributedLockService {
    *
    * @throws IllegalStateException if system is in process of disconnecting
    *
-   * @see com.gemstone.gemfire.distributed.DistributedLockService#create(String, DistributedSystem)
+   * @see org.apache.geode.distributed.DistributedLockService#create(String, DistributedSystem)
    */
   public static DistributedLockService create(String serviceName, 
                                               InternalDistributedSystem ds,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockStats.java
index ac83d14..7e1ab96 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockStats.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
-import com.gemstone.gemfire.*;
-import com.gemstone.gemfire.distributed.internal.*;
-import com.gemstone.gemfire.internal.statistics.StatisticsTypeFactoryImpl;
+import org.apache.geode.*;
+import org.apache.geode.distributed.internal.*;
+import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
 
 /**
  * This class maintains statistics in GemFire about the distributed lock 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockToken.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockToken.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockToken.java
index 301b047..6eb94ed 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockToken.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockToken.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
 import java.util.WeakHashMap;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.distributed.LeaseExpiredException;
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
+import org.apache.geode.distributed.LeaseExpiredException;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LogMarker;
 
 /**
  * A DistributedLockService contains a collection of DLockToken
@@ -79,7 +79,7 @@ public class DLockToken {
    
   /** 
    * Tracks expired leases so that the leasing thread can report a
-   * {@link com.gemstone.gemfire.distributed.LeaseExpiredException}.
+   * {@link org.apache.geode.distributed.LeaseExpiredException}.
    * Keys are threads that have had their lease expire on this lock,
    * but may not yet have noticed.  Would use weak set if available.
    * Entry is removed upon throwing LeaseExpiredException. Protected by
@@ -131,7 +131,7 @@ public class DLockToken {
    * no current lease. Caller must synchronize on this lock token. 
    * <p>
    * Public because {@link 
-   * com.gemstone.gemfire.internal.admin.remote.RemoteDLockInfo} is a caller.
+   * org.apache.geode.internal.admin.remote.RemoteDLockInfo} is a caller.
    * 
    * @return the lock re-entry recursion of the current lease or -1 if none
    */
@@ -144,7 +144,7 @@ public class DLockToken {
    * if there is no lease. Caller must synchronize on this lock token. 
    * <p>
    * Public because {@link 
-   * com.gemstone.gemfire.internal.admin.remote.RemoteDLockInfo} is a caller.
+   * org.apache.geode.internal.admin.remote.RemoteDLockInfo} is a caller.
    * 
    * @return the name of the actual local thread leasing this lock or null
    */
@@ -165,7 +165,7 @@ public class DLockToken {
    * if there is no lease. Caller must synchronize on this lock token.
    * <p>
    * Public because {@link 
-   * com.gemstone.gemfire.internal.admin.remote.RemoteDLockInfo} is a caller.
+   * org.apache.geode.internal.admin.remote.RemoteDLockInfo} is a caller.
    * 
    * @return the absolute time at which the current lease will expire or -1
    */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java
index 08d459b..e9ae9fe 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -23,17 +23,17 @@ import java.io.IOException;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.MessageWithReply;
-import com.gemstone.gemfire.distributed.internal.PooledDistributionMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyException;
-import com.gemstone.gemfire.distributed.internal.ReplyMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyProcessor21;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MessageWithReply;
+import org.apache.geode.distributed.internal.PooledDistributionMessage;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LogMarker;
 
 /**
  * A processor for telling the old grantor that he is deposed by a new grantor. 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedLockStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedLockStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedLockStats.java
index 9a8b8a6..8c1abca 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedLockStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedLockStats.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
-import com.gemstone.gemfire.distributed.internal.*;
+import org.apache.geode.distributed.internal.*;
 
 /**
  * Defines the interface used to access and modify distributed lock statistics.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java
index 9655bda..596685c 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DistributedMemberLock.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
 import java.io.Serializable;
 
-import com.gemstone.gemfire.distributed.DistributedLockService;
-import com.gemstone.gemfire.distributed.internal.locks.DLockService.ThreadRequestState;
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.distributed.DistributedLockService;
+import org.apache.geode.distributed.internal.locks.DLockService.ThreadRequestState;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
@@ -31,7 +31,7 @@ import java.util.concurrent.locks.Lock;
 /**
  * Distributed lock which is owned by a member rather than a single thread.
  * Any thread within the {@link 
- * com.gemstone.gemfire.distributed.DistributedMember} may unlock a held
+ * org.apache.geode.distributed.DistributedMember} may unlock a held
  * <code>DistributedMemberLock</code>.
  *
  * While this member holds the lock, another member will not be able to
@@ -39,7 +39,7 @@ import java.util.concurrent.locks.Lock;
  * lock.
  * 
  * Operations delegate to {@link 
- * com.gemstone.gemfire.distributed.DistributedLockService} and may throw
+ * org.apache.geode.distributed.DistributedLockService} and may throw
  * LockNotHeldException or LockServiceDestroyedException.
  * 
  * @since GemFire 5.1

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DummyDLockStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DummyDLockStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DummyDLockStats.java
index 0c8e2e6..a0dfdb0 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DummyDLockStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DummyDLockStats.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
-import com.gemstone.gemfire.distributed.internal.*;
+import org.apache.geode.distributed.internal.*;
 
 /**
  * Empty implementation of <code>DistributedLockStats</code> used when there is

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java
index 5d2833d..cf4d354 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderInitProcessor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -28,21 +28,21 @@ import java.util.Set;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.DistributionMessage;
-import com.gemstone.gemfire.distributed.internal.MessageWithReply;
-import com.gemstone.gemfire.distributed.internal.PooledDistributionMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyException;
-import com.gemstone.gemfire.distributed.internal.ReplyMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyProcessor21;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
-import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.MessageWithReply;
+import org.apache.geode.distributed.internal.PooledDistributionMessage;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.logging.log4j.LogMarker;
 
 /**
  * A processor for initializing the ElderState. This may involve sending

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
index 8b1d631..dafa7ea 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
@@ -15,21 +15,21 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
 import java.util.HashMap;
 import java.util.Iterator;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.InternalGemFireError;
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
-import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.logging.log4j.LogMarker;
 
 /**
  * Keeps track of all the information kept by the elder.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
index 664921b..3609778 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorInfo.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
-import com.gemstone.gemfire.distributed.internal.membership.*;
+import org.apache.geode.distributed.internal.membership.*;
 
 /**
  * Used to provide information on a grantor request made to the elder.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
index 5a6b867..2870c0b 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/GrantorRequestProcessor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -26,25 +26,25 @@ import java.util.concurrent.locks.*;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.CancelCriterion;
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.DistributionMessage;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.distributed.internal.MessageWithReply;
-import com.gemstone.gemfire.distributed.internal.PooledDistributionMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyException;
-import com.gemstone.gemfire.distributed.internal.ReplyMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyProcessor21;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
-import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
-import com.gemstone.gemfire.internal.util.concurrent.StoppableCondition;
-import com.gemstone.gemfire.internal.util.concurrent.StoppableReentrantLock;
+import org.apache.geode.CancelCriterion;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.MessageWithReply;
+import org.apache.geode.distributed.internal.PooledDistributionMessage;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.util.concurrent.StoppableCondition;
+import org.apache.geode.internal.util.concurrent.StoppableReentrantLock;
 
 /**
  * A processor for sending a message to the elder asking it for the

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorDestroyedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorDestroyedException.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorDestroyedException.java
index aede763..0fc5c80 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorDestroyedException.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorDestroyedException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
 /**
  * A <code>LockGrantorDestroyedException</code> is thrown when attempting

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorId.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorId.java
index 448c382..e394985 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorId.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/LockGrantorId.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * Identifies specific lock grantor member and version.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java
index d371ad2..105dfc1 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -23,23 +23,23 @@ import java.io.IOException;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.distributed.LockServiceDestroyedException;
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.DistributionMessage;
-import com.gemstone.gemfire.distributed.internal.MessageWithReply;
-import com.gemstone.gemfire.distributed.internal.PooledDistributionMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyException;
-import com.gemstone.gemfire.distributed.internal.ReplyMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyProcessor21;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.LockServiceDestroyedException;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.MessageWithReply;
+import org.apache.geode.distributed.internal.PooledDistributionMessage;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
 //import java.util.*;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-//import com.gemstone.gemfire.distributed.internal.DistributionAdvisor;
-//import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.Profile;
-import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+//import org.apache.geode.distributed.internal.DistributionAdvisor;
+//import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LogMarker;
 
 /**
  * A processor for telling the grantor that a lock service participant has

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/RemoteThread.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/RemoteThread.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/RemoteThread.java
index 7e55203..5ed1d10 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/RemoteThread.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/RemoteThread.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.distributed.internal.locks;
+package org.apache.geode.distributed.internal.locks;
 
-import com.gemstone.gemfire.distributed.DistributedMember;
+import org.apache.geode.distributed.DistributedMember;
 
 /**
  * Uniquely identifies a remote thread by DistributedMember and threadId

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/package.html
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/package.html b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/package.html
index 65949ac..5e6911d 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/package.html
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/package.html
@@ -22,7 +22,7 @@ limitations under the License.
 The GemFire Distributed Lock Service (also know as "dlock" or "DLS")
 provides synchronization locks that span multiple members of a
 distributed system.  The user creates a {@link
-com.gemstone.gemfire.distributed.DistributedLockService} with a given
+org.apache.geode.distributed.DistributedLockService} with a given
 name and uses to acquire distributed locks.  Lock coordination and
 management is provided by an instance of the distributed lock service
 referred to as the "grantor".  Each lock service instance knows which
@@ -39,7 +39,7 @@ out which member hosts the lock service's "grantor".  The "elder"
 member is defined as the oldest member in the JavaGroups view of the
 distributed system.  The member that is creating the lock service
 sends the elder a {@link
-com.gemstone.gemfire.distributed.internal.locks.GrantorRequestProcessor.GrantorRequestMessage} to
+org.apache.geode.distributed.internal.locks.GrantorRequestProcessor.GrantorRequestMessage} to
 find out who the current grantor is.  If no member is currently the
 grantor of the distributed lock service, then the member that sent the
 request is chosen to be the grantor.
@@ -68,21 +68,21 @@ need it.
 Once a distributed lock service has been created and initialized, it
 can be used to obtain a distributed lock.  The member that wishes to
 obtain a lock sends a {@link
-com.gemstone.gemfire.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage} to the
+org.apache.geode.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage} to the
 lock service's grantor.  The grantor will process the lock request and
 will grant the lock once it becomes available.
 
 <P>
 
 However, it is possible that the member that the requester sent the
-{@link com.gemstone.gemfire.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage}
+{@link org.apache.geode.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage}
 to is no longer the grantor.  That is, there can be a race between the
 requester requesting the lock and the grantor lock service being
 destroyed.  In this scenario, the member replies to the requester with
 a <code>LockResponseMessage</code> that
 indicates that the member is not the grantor.  The requester will then
 send a {@link
-com.gemstone.gemfire.distributed.internal.locks.GrantorRequestProcessor.GrantorRequestMessage} to
+org.apache.geode.distributed.internal.locks.GrantorRequestProcessor.GrantorRequestMessage} to
 the elder to determine who the new grantor is.
 
 <P>
@@ -93,14 +93,14 @@ is the grantor.  That is, the elder might inform a requester of the
 identity of a grantor before the grantor member has fully initialized
 (or has even heard back from the elder that it is the grantor).  This
 race condition is resolved by blocking the processing of a {@link
-com.gemstone.gemfire.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage} until
+org.apache.geode.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage} until
 the member knows whether or not it is the grantor.
 
 <H2>Lock Service Destruction</H2>
 
 When an application has finished using a lock service, the service can
 be {@linkplain
-com.gemstone.gemfire.distributed.DistributedLockService#destroy
+org.apache.geode.distributed.DistributedLockService#destroy
 destroyed}.  When a non-grantor distributed lock service is destroyed,
 the member destroying the lock service sends a
 <code>DestroyServiceMessage</code> to the grantor.  Upon receiving the
@@ -197,7 +197,7 @@ to optimize this scenario by ensuring that the member that requests
 the locks is also the grantor.  The grantor member can grant itself
 locks faster that it can grant locks to other members because there is
 no messaging involved.  The {@link
-com.gemstone.gemfire.distributed.DistributedLockService#becomeLockGrantor}
+org.apache.geode.distributed.DistributedLockService#becomeLockGrantor}
 transfers grantorship to a distributed lock service instance.
 
 <P>
@@ -208,10 +208,10 @@ to the elder.  The elder notes that the young turk is now the grantor
 and instructs the current grantor that it is no longer the grantor and
 that it should expect to hear from the young turk shortly.  Once the
 current grantor has received this message, it will reply to {@link
-com.gemstone.gemfire.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage}s with a
+org.apache.geode.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage}s with a
 response that indicates that it is not the grantor.  Note that the
 young turk will not reply to {@link
-com.gemstone.gemfire.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage}s until
+org.apache.geode.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage}s until
 grantorship has been fully transferred.
 
 <P>
@@ -239,7 +239,7 @@ transfer from another young turk, the older turk gives up its dreams
 of becoming grantor and "passes through" the lock information to the
 younger turk when that information arrives.  After the older turk
 gives up, it replies to any pending {@link
-com.gemstone.gemfire.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage}s with
+org.apache.geode.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage}s with
 "not grantor".
 
 <P>
@@ -276,7 +276,7 @@ member is the eldest.  (Note that we assume that all members of the
 distributed system have identical JavaGroups views and will, thus,
 choose the same member as the elder.)  The member then sends a
 grantor-related message (such as a {@link
-com.gemstone.gemfire.distributed.internal.locks.GrantorRequestProcessor.GrantorRequestMessage}) to
+org.apache.geode.distributed.internal.locks.GrantorRequestProcessor.GrantorRequestMessage}) to
 the member it believes to the elder.  If a member receives a
 grantor-related message, it assumes it is the elder and begins to act
 as such.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/DistributedMembershipListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/DistributedMembershipListener.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/DistributedMembershipListener.java
index d970b6b..73ed239 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/DistributedMembershipListener.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/DistributedMembershipListener.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.distributed.internal.membership;
+package org.apache.geode.distributed.internal.membership;
 
 import java.util.List;
 import java.util.Set;
 
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.DistributionMessage;
-import com.gemstone.gemfire.distributed.internal.direct.DirectChannelListener;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.direct.DirectChannelListener;
 
 public interface DistributedMembershipListener extends DirectChannelListener {
 



Mime
View raw message