geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hiteshkhame...@apache.org
Subject [23/83] [abbrv] [partial] incubator-geode git commit: GEODE-37 changed import statement from com.gemstone.gemfire to org.apache.geode
Date Fri, 09 Sep 2016 21:43:20 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
index ab76d5c..d8c0223 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
 
 
-import com.gemstone.gemfire.distributed.internal.membership.gms.messages.*;
+import org.apache.geode.distributed.internal.membership.gms.messages.*;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 import java.io.DataInput;
@@ -29,388 +29,388 @@ import java.io.NotSerializableException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.InternalGemFireError;
-import com.gemstone.gemfire.admin.internal.FinishBackupRequest;
-import com.gemstone.gemfire.admin.internal.FinishBackupResponse;
-import com.gemstone.gemfire.admin.internal.FlushToDiskRequest;
-import com.gemstone.gemfire.admin.internal.FlushToDiskResponse;
-import com.gemstone.gemfire.admin.internal.PrepareBackupRequest;
-import com.gemstone.gemfire.admin.internal.PrepareBackupResponse;
-import com.gemstone.gemfire.admin.internal.SystemMemberCacheEventProcessor;
-import com.gemstone.gemfire.admin.jmx.internal.StatAlertNotification;
-import com.gemstone.gemfire.cache.InterestResultPolicy;
-import com.gemstone.gemfire.cache.client.internal.CacheServerLoadMessage;
-import com.gemstone.gemfire.cache.client.internal.locator.ClientConnectionRequest;
-import com.gemstone.gemfire.cache.client.internal.locator.ClientConnectionResponse;
-import com.gemstone.gemfire.cache.client.internal.locator.ClientReplacementRequest;
-import com.gemstone.gemfire.cache.client.internal.locator.GetAllServersRequest;
-import com.gemstone.gemfire.cache.client.internal.locator.GetAllServersResponse;
-import com.gemstone.gemfire.cache.client.internal.locator.LocatorListRequest;
-import com.gemstone.gemfire.cache.client.internal.locator.LocatorListResponse;
-import com.gemstone.gemfire.cache.client.internal.locator.LocatorStatusRequest;
-import com.gemstone.gemfire.cache.client.internal.locator.LocatorStatusResponse;
-import com.gemstone.gemfire.cache.client.internal.locator.QueueConnectionRequest;
-import com.gemstone.gemfire.cache.client.internal.locator.QueueConnectionResponse;
-import com.gemstone.gemfire.cache.query.QueryService;
-import com.gemstone.gemfire.cache.query.internal.CqEntry;
-import com.gemstone.gemfire.cache.query.internal.CumulativeNonDistinctResults;
-import com.gemstone.gemfire.cache.query.internal.LinkedResultSet;
-import com.gemstone.gemfire.cache.query.internal.LinkedStructSet;
-import com.gemstone.gemfire.cache.query.internal.NWayMergeResults;
-import com.gemstone.gemfire.cache.query.internal.NullToken;
-import com.gemstone.gemfire.cache.query.internal.PRQueryTraceInfo;
-import com.gemstone.gemfire.cache.query.internal.ResultsBag;
-import com.gemstone.gemfire.cache.query.internal.ResultsCollectionWrapper;
-import com.gemstone.gemfire.cache.query.internal.ResultsSet;
-import com.gemstone.gemfire.cache.query.internal.SortedResultSet;
-import com.gemstone.gemfire.cache.query.internal.SortedStructSet;
-import com.gemstone.gemfire.cache.query.internal.StructBag;
-import com.gemstone.gemfire.cache.query.internal.StructImpl;
-import com.gemstone.gemfire.cache.query.internal.StructSet;
-import com.gemstone.gemfire.cache.query.internal.Undefined;
-import com.gemstone.gemfire.cache.query.internal.index.IndexCreationData;
-import com.gemstone.gemfire.cache.query.internal.index.IndexManager;
-import com.gemstone.gemfire.cache.query.internal.types.CollectionTypeImpl;
-import com.gemstone.gemfire.cache.query.internal.types.MapTypeImpl;
-import com.gemstone.gemfire.cache.query.internal.types.ObjectTypeImpl;
-import com.gemstone.gemfire.cache.query.internal.types.StructTypeImpl;
-import com.gemstone.gemfire.distributed.internal.DistributionAdvisor;
-import com.gemstone.gemfire.distributed.internal.HighPriorityAckedMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyMessage;
-import com.gemstone.gemfire.distributed.internal.ReplyProcessor21;
-import com.gemstone.gemfire.distributed.internal.SerialAckedMessage;
-import com.gemstone.gemfire.distributed.internal.ShutdownMessage;
-import com.gemstone.gemfire.distributed.internal.StartupMessage;
-import com.gemstone.gemfire.distributed.internal.StartupResponseMessage;
-import com.gemstone.gemfire.distributed.internal.StartupResponseWithVersionMessage;
-import com.gemstone.gemfire.distributed.internal.WaitForViewInstallation;
-import com.gemstone.gemfire.distributed.internal.locks.DLockQueryProcessor;
-import com.gemstone.gemfire.distributed.internal.locks.DLockRecoverGrantorProcessor.DLockRecoverGrantorMessage;
-import com.gemstone.gemfire.distributed.internal.locks.DLockRecoverGrantorProcessor.DLockRecoverGrantorReplyMessage;
-import com.gemstone.gemfire.distributed.internal.locks.DLockReleaseProcessor;
-import com.gemstone.gemfire.distributed.internal.locks.DLockRemoteToken;
-import com.gemstone.gemfire.distributed.internal.locks.DLockRequestProcessor;
-import com.gemstone.gemfire.distributed.internal.locks.DLockService;
-import com.gemstone.gemfire.distributed.internal.locks.DeposeGrantorProcessor;
-import com.gemstone.gemfire.distributed.internal.locks.ElderInitProcessor;
-import com.gemstone.gemfire.distributed.internal.locks.GrantorRequestProcessor;
-import com.gemstone.gemfire.distributed.internal.locks.NonGrantorDestroyedProcessor;
-import com.gemstone.gemfire.distributed.internal.locks.NonGrantorDestroyedProcessor.NonGrantorDestroyedReplyMessage;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.distributed.internal.membership.NetView;
-import com.gemstone.gemfire.distributed.internal.membership.gms.GMSMember;
-import com.gemstone.gemfire.distributed.internal.membership.gms.locator.FindCoordinatorRequest;
-import com.gemstone.gemfire.distributed.internal.membership.gms.locator.FindCoordinatorResponse;
-import com.gemstone.gemfire.distributed.internal.membership.gms.locator.GetViewRequest;
-import com.gemstone.gemfire.distributed.internal.membership.gms.locator.GetViewResponse;
-import com.gemstone.gemfire.distributed.internal.streaming.StreamingOperation.StreamingReplyMessage;
-import com.gemstone.gemfire.internal.admin.ClientMembershipMessage;
-import com.gemstone.gemfire.internal.admin.remote.AddHealthListenerRequest;
-import com.gemstone.gemfire.internal.admin.remote.AddHealthListenerResponse;
-import com.gemstone.gemfire.internal.admin.remote.AddStatListenerRequest;
-import com.gemstone.gemfire.internal.admin.remote.AddStatListenerResponse;
-import com.gemstone.gemfire.internal.admin.remote.AdminConsoleDisconnectMessage;
-import com.gemstone.gemfire.internal.admin.remote.AdminConsoleMessage;
-import com.gemstone.gemfire.internal.admin.remote.AdminFailureResponse;
-import com.gemstone.gemfire.internal.admin.remote.AlertLevelChangeMessage;
-import com.gemstone.gemfire.internal.admin.remote.AlertListenerMessage;
-import com.gemstone.gemfire.internal.admin.remote.AlertsNotificationMessage;
-import com.gemstone.gemfire.internal.admin.remote.AppCacheSnapshotMessage;
-import com.gemstone.gemfire.internal.admin.remote.BridgeServerRequest;
-import com.gemstone.gemfire.internal.admin.remote.BridgeServerResponse;
-import com.gemstone.gemfire.internal.admin.remote.CacheConfigRequest;
-import com.gemstone.gemfire.internal.admin.remote.CacheConfigResponse;
-import com.gemstone.gemfire.internal.admin.remote.CacheInfoRequest;
-import com.gemstone.gemfire.internal.admin.remote.CacheInfoResponse;
-import com.gemstone.gemfire.internal.admin.remote.CancelStatListenerRequest;
-import com.gemstone.gemfire.internal.admin.remote.CancelStatListenerResponse;
-import com.gemstone.gemfire.internal.admin.remote.CancellationMessage;
-import com.gemstone.gemfire.internal.admin.remote.ChangeRefreshIntervalMessage;
-import com.gemstone.gemfire.internal.admin.remote.ClientHealthStats;
-import com.gemstone.gemfire.internal.admin.remote.CompactRequest;
-import com.gemstone.gemfire.internal.admin.remote.CompactResponse;
-import com.gemstone.gemfire.internal.admin.remote.DestroyEntryMessage;
-import com.gemstone.gemfire.internal.admin.remote.DestroyRegionMessage;
-import com.gemstone.gemfire.internal.admin.remote.DurableClientInfoRequest;
-import com.gemstone.gemfire.internal.admin.remote.DurableClientInfoResponse;
-import com.gemstone.gemfire.internal.admin.remote.FetchDistLockInfoRequest;
-import com.gemstone.gemfire.internal.admin.remote.FetchDistLockInfoResponse;
-import com.gemstone.gemfire.internal.admin.remote.FetchHealthDiagnosisRequest;
-import com.gemstone.gemfire.internal.admin.remote.FetchHealthDiagnosisResponse;
-import com.gemstone.gemfire.internal.admin.remote.FetchHostRequest;
-import com.gemstone.gemfire.internal.admin.remote.FetchHostResponse;
-import com.gemstone.gemfire.internal.admin.remote.FetchResourceAttributesRequest;
-import com.gemstone.gemfire.internal.admin.remote.FetchResourceAttributesResponse;
-import com.gemstone.gemfire.internal.admin.remote.FetchStatsRequest;
-import com.gemstone.gemfire.internal.admin.remote.FetchStatsResponse;
-import com.gemstone.gemfire.internal.admin.remote.FetchSysCfgRequest;
-import com.gemstone.gemfire.internal.admin.remote.FetchSysCfgResponse;
-import com.gemstone.gemfire.internal.admin.remote.FlushAppCacheSnapshotMessage;
-import com.gemstone.gemfire.internal.admin.remote.HealthListenerMessage;
-import com.gemstone.gemfire.internal.admin.remote.LicenseInfoRequest;
-import com.gemstone.gemfire.internal.admin.remote.LicenseInfoResponse;
-import com.gemstone.gemfire.internal.admin.remote.MissingPersistentIDsRequest;
-import com.gemstone.gemfire.internal.admin.remote.MissingPersistentIDsResponse;
-import com.gemstone.gemfire.internal.admin.remote.ObjectDetailsRequest;
-import com.gemstone.gemfire.internal.admin.remote.ObjectDetailsResponse;
-import com.gemstone.gemfire.internal.admin.remote.ObjectNamesRequest;
-import com.gemstone.gemfire.internal.admin.remote.ObjectNamesResponse;
-import com.gemstone.gemfire.internal.admin.remote.PrepareRevokePersistentIDRequest;
-import com.gemstone.gemfire.internal.admin.remote.RefreshMemberSnapshotRequest;
-import com.gemstone.gemfire.internal.admin.remote.RefreshMemberSnapshotResponse;
-import com.gemstone.gemfire.internal.admin.remote.RegionAttributesRequest;
-import com.gemstone.gemfire.internal.admin.remote.RegionAttributesResponse;
-import com.gemstone.gemfire.internal.admin.remote.RegionRequest;
-import com.gemstone.gemfire.internal.admin.remote.RegionResponse;
-import com.gemstone.gemfire.internal.admin.remote.RegionSizeRequest;
-import com.gemstone.gemfire.internal.admin.remote.RegionSizeResponse;
-import com.gemstone.gemfire.internal.admin.remote.RegionStatisticsRequest;
-import com.gemstone.gemfire.internal.admin.remote.RegionStatisticsResponse;
-import com.gemstone.gemfire.internal.admin.remote.RegionSubRegionSizeRequest;
-import com.gemstone.gemfire.internal.admin.remote.RegionSubRegionsSizeResponse;
-import com.gemstone.gemfire.internal.admin.remote.RemoveHealthListenerRequest;
-import com.gemstone.gemfire.internal.admin.remote.RemoveHealthListenerResponse;
-import com.gemstone.gemfire.internal.admin.remote.ResetHealthStatusRequest;
-import com.gemstone.gemfire.internal.admin.remote.ResetHealthStatusResponse;
-import com.gemstone.gemfire.internal.admin.remote.RevokePersistentIDRequest;
-import com.gemstone.gemfire.internal.admin.remote.RevokePersistentIDResponse;
-import com.gemstone.gemfire.internal.admin.remote.RootRegionRequest;
-import com.gemstone.gemfire.internal.admin.remote.RootRegionResponse;
-import com.gemstone.gemfire.internal.admin.remote.ShutdownAllGatewayHubsRequest;
-import com.gemstone.gemfire.internal.admin.remote.ShutdownAllRequest;
-import com.gemstone.gemfire.internal.admin.remote.ShutdownAllResponse;
-import com.gemstone.gemfire.internal.admin.remote.SnapshotResultMessage;
-import com.gemstone.gemfire.internal.admin.remote.StatAlertsManagerAssignMessage;
-import com.gemstone.gemfire.internal.admin.remote.StatListenerMessage;
-import com.gemstone.gemfire.internal.admin.remote.StoreSysCfgRequest;
-import com.gemstone.gemfire.internal.admin.remote.StoreSysCfgResponse;
-import com.gemstone.gemfire.internal.admin.remote.SubRegionRequest;
-import com.gemstone.gemfire.internal.admin.remote.SubRegionResponse;
-import com.gemstone.gemfire.internal.admin.remote.TailLogRequest;
-import com.gemstone.gemfire.internal.admin.remote.TailLogResponse;
-import com.gemstone.gemfire.internal.admin.remote.UpdateAlertDefinitionMessage;
-import com.gemstone.gemfire.internal.admin.remote.VersionInfoRequest;
-import com.gemstone.gemfire.internal.admin.remote.VersionInfoResponse;
-import com.gemstone.gemfire.internal.admin.statalerts.GaugeThresholdDecoratorImpl;
-import com.gemstone.gemfire.internal.admin.statalerts.NumberThresholdDecoratorImpl;
-import com.gemstone.gemfire.internal.cache.AddCacheServerProfileMessage;
-import com.gemstone.gemfire.internal.cache.ClientRegionEventImpl;
-import com.gemstone.gemfire.internal.cache.CacheServerAdvisor.CacheServerProfile;
-import com.gemstone.gemfire.internal.cache.BucketAdvisor;
-import com.gemstone.gemfire.internal.cache.CacheDistributionAdvisor;
-import com.gemstone.gemfire.internal.cache.CloseCacheMessage;
-import com.gemstone.gemfire.internal.cache.ControllerAdvisor.ControllerProfile;
-import com.gemstone.gemfire.internal.cache.CreateRegionProcessor;
-import com.gemstone.gemfire.internal.cache.DestroyOperation;
-import com.gemstone.gemfire.internal.cache.DestroyPartitionedRegionMessage;
-import com.gemstone.gemfire.internal.cache.DestroyRegionOperation;
-import com.gemstone.gemfire.internal.cache.DistTXPrecommitMessage;
-import com.gemstone.gemfire.internal.cache.DistTXCommitMessage;
-import com.gemstone.gemfire.internal.cache.DistTXRollbackMessage;
-import com.gemstone.gemfire.internal.cache.DistributedClearOperation.ClearRegionMessage;
-import com.gemstone.gemfire.internal.cache.DistributedClearOperation.ClearRegionWithContextMessage;
-import com.gemstone.gemfire.internal.cache.DistributedPutAllOperation.EntryVersionsList;
-import com.gemstone.gemfire.internal.cache.DistributedPutAllOperation.PutAllMessage;
-import com.gemstone.gemfire.internal.cache.DistributedRegionFunctionStreamingMessage;
-import com.gemstone.gemfire.internal.cache.DistributedRemoveAllOperation.RemoveAllMessage;
-import com.gemstone.gemfire.internal.cache.DistributedTombstoneOperation.TombstoneMessage;
-import com.gemstone.gemfire.internal.cache.EntryEventImpl;
-import com.gemstone.gemfire.internal.cache.EventID;
-import com.gemstone.gemfire.internal.cache.FilterProfile;
-import com.gemstone.gemfire.internal.cache.FindDurableQueueProcessor.FindDurableQueueMessage;
-import com.gemstone.gemfire.internal.cache.FindDurableQueueProcessor.FindDurableQueueReply;
-import com.gemstone.gemfire.internal.cache.FindRemoteTXMessage;
-import com.gemstone.gemfire.internal.cache.FindRemoteTXMessage.FindRemoteTXMessageReply;
-import com.gemstone.gemfire.internal.cache.FindVersionTagOperation.FindVersionTagMessage;
-import com.gemstone.gemfire.internal.cache.FindVersionTagOperation.VersionTagReply;
-import com.gemstone.gemfire.internal.cache.FunctionStreamingOrderedReplyMessage;
-import com.gemstone.gemfire.internal.cache.FunctionStreamingReplyMessage;
-import com.gemstone.gemfire.internal.cache.HARegion;
-import com.gemstone.gemfire.internal.cache.InitialImageFlowControl.FlowControlPermitMessage;
-import com.gemstone.gemfire.internal.cache.InitialImageOperation;
-import com.gemstone.gemfire.internal.cache.InitialImageOperation.InitialImageVersionedEntryList;
-import com.gemstone.gemfire.internal.cache.InvalidateOperation;
-import com.gemstone.gemfire.internal.cache.InvalidatePartitionedRegionMessage;
-import com.gemstone.gemfire.internal.cache.InvalidateRegionOperation.InvalidateRegionMessage;
-import com.gemstone.gemfire.internal.cache.JtaAfterCompletionMessage;
-import com.gemstone.gemfire.internal.cache.JtaBeforeCompletionMessage;
-import com.gemstone.gemfire.internal.cache.MemberFunctionStreamingMessage;
-import com.gemstone.gemfire.internal.cache.Node;
-import com.gemstone.gemfire.internal.cache.PRQueryProcessor;
-import com.gemstone.gemfire.internal.cache.PartitionRegionConfig;
-import com.gemstone.gemfire.internal.cache.PreferBytesCachedDeserializable;
-import com.gemstone.gemfire.internal.cache.RegionEventImpl;
-import com.gemstone.gemfire.internal.cache.ReleaseClearLockMessage;
-import com.gemstone.gemfire.internal.cache.RemoteContainsKeyValueMessage;
-import com.gemstone.gemfire.internal.cache.RemoteDestroyMessage;
-import com.gemstone.gemfire.internal.cache.RemoteFetchEntryMessage;
-import com.gemstone.gemfire.internal.cache.RemoteFetchVersionMessage;
-import com.gemstone.gemfire.internal.cache.RemoteGetMessage;
-import com.gemstone.gemfire.internal.cache.RemoteInvalidateMessage;
-import com.gemstone.gemfire.internal.cache.RemotePutAllMessage;
-import com.gemstone.gemfire.internal.cache.RemotePutMessage;
-import com.gemstone.gemfire.internal.cache.RemoteRegionOperation;
-import com.gemstone.gemfire.internal.cache.RemoteRegionOperation.RemoteRegionOperationReplyMessage;
-import com.gemstone.gemfire.internal.cache.RemoteRemoveAllMessage;
-import com.gemstone.gemfire.internal.cache.RoleEventImpl;
-import com.gemstone.gemfire.internal.cache.SearchLoadAndWriteProcessor;
-import com.gemstone.gemfire.internal.cache.SendQueueOperation.SendQueueMessage;
-import com.gemstone.gemfire.internal.cache.ServerPingMessage;
-import com.gemstone.gemfire.internal.cache.StateFlushOperation.StateMarkerMessage;
-import com.gemstone.gemfire.internal.cache.StateFlushOperation.StateStabilizationMessage;
-import com.gemstone.gemfire.internal.cache.StateFlushOperation.StateStabilizedMessage;
-import com.gemstone.gemfire.internal.cache.StoreAllCachedDeserializable;
-import com.gemstone.gemfire.internal.cache.TXCommitMessage;
-import com.gemstone.gemfire.internal.cache.TXCommitMessage.CommitProcessForLockIdMessage;
-import com.gemstone.gemfire.internal.cache.TXCommitMessage.CommitProcessForTXIdMessage;
-import com.gemstone.gemfire.internal.cache.TXCommitMessage.CommitProcessQueryMessage;
-import com.gemstone.gemfire.internal.cache.TXCommitMessage.CommitProcessQueryReplyMessage;
-import com.gemstone.gemfire.internal.cache.TXEntryState;
-import com.gemstone.gemfire.internal.cache.TXId;
-import com.gemstone.gemfire.internal.cache.TXManagerImpl;
-import com.gemstone.gemfire.internal.cache.TXRemoteCommitMessage;
-import com.gemstone.gemfire.internal.cache.TXRemoteCommitMessage.TXRemoteCommitReplyMessage;
-import com.gemstone.gemfire.internal.cache.TXRemoteRollbackMessage;
-import com.gemstone.gemfire.internal.cache.Token;
-import com.gemstone.gemfire.internal.cache.UpdateAttributesProcessor;
-import com.gemstone.gemfire.internal.cache.UpdateEntryVersionOperation.UpdateEntryVersionMessage;
-import com.gemstone.gemfire.internal.cache.UpdateOperation;
-import com.gemstone.gemfire.internal.cache.VMCachedDeserializable;
-import com.gemstone.gemfire.internal.cache.compression.SnappyCompressedCachedDeserializable;
-import com.gemstone.gemfire.internal.cache.control.ResourceAdvisor.ResourceManagerProfile;
-import com.gemstone.gemfire.internal.cache.control.ResourceAdvisor.ResourceProfileMessage;
-import com.gemstone.gemfire.internal.cache.ha.HARegionQueue.DispatchedAndCurrentEvents;
-import com.gemstone.gemfire.internal.cache.ha.QueueRemovalMessage;
-import com.gemstone.gemfire.internal.cache.locks.TXLockBatch;
-import com.gemstone.gemfire.internal.cache.locks.TXLockIdImpl;
-import com.gemstone.gemfire.internal.cache.locks.TXLockUpdateParticipantsMessage;
-import com.gemstone.gemfire.internal.cache.locks.TXLockUpdateParticipantsMessage.TXLockUpdateParticipantsReplyMessage;
-import com.gemstone.gemfire.internal.cache.locks.TXOriginatorRecoveryProcessor.TXOriginatorRecoveryMessage;
-import com.gemstone.gemfire.internal.cache.locks.TXOriginatorRecoveryProcessor.TXOriginatorRecoveryReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.AllBucketProfilesUpdateMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.BecomePrimaryBucketMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.BecomePrimaryBucketMessage.BecomePrimaryBucketReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.BucketBackupMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.BucketCountLoadProbe;
-import com.gemstone.gemfire.internal.cache.partitioned.BucketProfileUpdateMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.BucketSizeMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.BucketSizeMessage.BucketSizeReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.ContainsKeyValueMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.ContainsKeyValueMessage.ContainsKeyValueReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.CreateBucketMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.CreateBucketMessage.CreateBucketReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.DeposePrimaryBucketMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.DeposePrimaryBucketMessage.DeposePrimaryBucketReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.DestroyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.DestroyRegionOnDataStoreMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.DumpAllPRConfigMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.DumpB2NRegion;
-import com.gemstone.gemfire.internal.cache.partitioned.DumpB2NRegion.DumpB2NReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.DumpBucketsMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.EndBucketCreationMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.FetchBulkEntriesMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.FetchBulkEntriesMessage.FetchBulkEntriesReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.FetchEntriesMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.FetchEntriesMessage.FetchEntriesReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.FetchEntryMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.FetchEntryMessage.FetchEntryReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.FetchKeysMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.FetchKeysMessage.FetchKeysReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.FetchPartitionDetailsMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.FetchPartitionDetailsMessage.FetchPartitionDetailsReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.FlushMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.GetMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.GetMessage.GetReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.IdentityRequestMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.IdentityRequestMessage.IdentityReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.IdentityUpdateMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.IndexCreationMsg;
-import com.gemstone.gemfire.internal.cache.partitioned.IndexCreationMsg.IndexCreationReplyMsg;
-import com.gemstone.gemfire.internal.cache.partitioned.InterestEventMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.InterestEventMessage.InterestEventReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.InvalidateMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.ManageBackupBucketMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.ManageBackupBucketMessage.ManageBackupBucketReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.ManageBucketMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.ManageBucketMessage.ManageBucketReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.MoveBucketMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.MoveBucketMessage.MoveBucketReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.PRSanityCheckMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.PRTombstoneMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.PRUpdateEntryVersionMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.PartitionedRegionFunctionStreamingMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.PrimaryRequestMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.PrimaryRequestMessage.PrimaryRequestReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.PutAllPRMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.PutAllPRMessage.PutAllReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.PutMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.PutMessage.PutReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.QueryMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.RegionAdvisor;
-import com.gemstone.gemfire.internal.cache.partitioned.RemoteFetchKeysMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.RemoteSizeMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.RemoveAllPRMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.RemoveBucketMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.RemoveBucketMessage.RemoveBucketReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.RemoveIndexesMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.RemoveIndexesMessage.RemoveIndexesReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.SizeMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.SizeMessage.SizeReplyMessage;
-import com.gemstone.gemfire.internal.cache.partitioned.SizedBasedLoadProbe;
-import com.gemstone.gemfire.internal.cache.persistence.DiskStoreID;
-import com.gemstone.gemfire.internal.cache.persistence.MembershipFlushRequest;
-import com.gemstone.gemfire.internal.cache.persistence.MembershipViewRequest;
-import com.gemstone.gemfire.internal.cache.persistence.MembershipViewRequest.MembershipViewReplyMessage;
-import com.gemstone.gemfire.internal.cache.persistence.PersistentStateQueryMessage;
-import com.gemstone.gemfire.internal.cache.persistence.PersistentStateQueryMessage.PersistentStateQueryReplyMessage;
-import com.gemstone.gemfire.internal.cache.persistence.PrepareNewPersistentMemberMessage;
-import com.gemstone.gemfire.internal.cache.persistence.RemovePersistentMemberMessage;
-import com.gemstone.gemfire.internal.cache.snapshot.FlowController.FlowControlAbortMessage;
-import com.gemstone.gemfire.internal.cache.snapshot.FlowController.FlowControlAckMessage;
-import com.gemstone.gemfire.internal.cache.snapshot.SnapshotPacket;
-import com.gemstone.gemfire.internal.cache.snapshot.SnapshotPacket.SnapshotRecord;
-import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier.ServerInterestRegistrationMessage;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientBlacklistProcessor.ClientBlacklistMessage;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientDataSerializerMessage;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientInstantiatorMessage;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientInterestMessageImpl;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientMarkerMessageImpl;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientPingMessageImpl;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientTombstoneMessage;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessageImpl;
-import com.gemstone.gemfire.internal.cache.tier.sockets.HAEventWrapper;
-import com.gemstone.gemfire.internal.cache.tier.sockets.InterestResultPolicyImpl;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ObjectPartList;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ObjectPartList651;
-import com.gemstone.gemfire.internal.cache.tier.sockets.RemoveClientFromBlacklistMessage;
-import com.gemstone.gemfire.internal.cache.tier.sockets.SerializedObjectPartList;
-import com.gemstone.gemfire.internal.cache.tier.sockets.VersionedObjectList;
-import com.gemstone.gemfire.internal.cache.tx.DistTxEntryEvent;
-import com.gemstone.gemfire.internal.cache.versions.DiskRegionVersionVector;
-import com.gemstone.gemfire.internal.cache.versions.DiskVersionTag;
-import com.gemstone.gemfire.internal.cache.versions.VMRegionVersionVector;
-import com.gemstone.gemfire.internal.cache.versions.VMVersionTag;
-import com.gemstone.gemfire.internal.cache.wan.GatewaySenderAdvisor;
-import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventCallbackArgument;
-import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventImpl;
-import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelQueueBatchRemovalMessage;
-import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelQueueBatchRemovalMessage.BatchRemovalReplyMessage;
-import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelQueueRemovalMessage;
-import com.gemstone.gemfire.internal.cache.wan.serial.BatchDestroyOperation;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.management.internal.JmxManagerAdvisor.JmxManagerProfile;
-import com.gemstone.gemfire.management.internal.JmxManagerAdvisor.JmxManagerProfileMessage;
-import com.gemstone.gemfire.management.internal.JmxManagerLocatorRequest;
-import com.gemstone.gemfire.management.internal.JmxManagerLocatorResponse;
-import com.gemstone.gemfire.management.internal.ManagerStartupMessage;
-import com.gemstone.gemfire.management.internal.cli.functions.CliFunctionResult;
-import com.gemstone.gemfire.management.internal.configuration.messages.ConfigurationRequest;
-import com.gemstone.gemfire.management.internal.configuration.messages.ConfigurationResponse;
-import com.gemstone.gemfire.pdx.internal.CheckTypeRegistryState;
-import com.gemstone.gemfire.pdx.internal.EnumId;
-import com.gemstone.gemfire.pdx.internal.EnumInfo;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.admin.internal.FinishBackupRequest;
+import org.apache.geode.admin.internal.FinishBackupResponse;
+import org.apache.geode.admin.internal.FlushToDiskRequest;
+import org.apache.geode.admin.internal.FlushToDiskResponse;
+import org.apache.geode.admin.internal.PrepareBackupRequest;
+import org.apache.geode.admin.internal.PrepareBackupResponse;
+import org.apache.geode.admin.internal.SystemMemberCacheEventProcessor;
+import org.apache.geode.admin.jmx.internal.StatAlertNotification;
+import org.apache.geode.cache.InterestResultPolicy;
+import org.apache.geode.cache.client.internal.CacheServerLoadMessage;
+import org.apache.geode.cache.client.internal.locator.ClientConnectionRequest;
+import org.apache.geode.cache.client.internal.locator.ClientConnectionResponse;
+import org.apache.geode.cache.client.internal.locator.ClientReplacementRequest;
+import org.apache.geode.cache.client.internal.locator.GetAllServersRequest;
+import org.apache.geode.cache.client.internal.locator.GetAllServersResponse;
+import org.apache.geode.cache.client.internal.locator.LocatorListRequest;
+import org.apache.geode.cache.client.internal.locator.LocatorListResponse;
+import org.apache.geode.cache.client.internal.locator.LocatorStatusRequest;
+import org.apache.geode.cache.client.internal.locator.LocatorStatusResponse;
+import org.apache.geode.cache.client.internal.locator.QueueConnectionRequest;
+import org.apache.geode.cache.client.internal.locator.QueueConnectionResponse;
+import org.apache.geode.cache.query.QueryService;
+import org.apache.geode.cache.query.internal.CqEntry;
+import org.apache.geode.cache.query.internal.CumulativeNonDistinctResults;
+import org.apache.geode.cache.query.internal.LinkedResultSet;
+import org.apache.geode.cache.query.internal.LinkedStructSet;
+import org.apache.geode.cache.query.internal.NWayMergeResults;
+import org.apache.geode.cache.query.internal.NullToken;
+import org.apache.geode.cache.query.internal.PRQueryTraceInfo;
+import org.apache.geode.cache.query.internal.ResultsBag;
+import org.apache.geode.cache.query.internal.ResultsCollectionWrapper;
+import org.apache.geode.cache.query.internal.ResultsSet;
+import org.apache.geode.cache.query.internal.SortedResultSet;
+import org.apache.geode.cache.query.internal.SortedStructSet;
+import org.apache.geode.cache.query.internal.StructBag;
+import org.apache.geode.cache.query.internal.StructImpl;
+import org.apache.geode.cache.query.internal.StructSet;
+import org.apache.geode.cache.query.internal.Undefined;
+import org.apache.geode.cache.query.internal.index.IndexCreationData;
+import org.apache.geode.cache.query.internal.index.IndexManager;
+import org.apache.geode.cache.query.internal.types.CollectionTypeImpl;
+import org.apache.geode.cache.query.internal.types.MapTypeImpl;
+import org.apache.geode.cache.query.internal.types.ObjectTypeImpl;
+import org.apache.geode.cache.query.internal.types.StructTypeImpl;
+import org.apache.geode.distributed.internal.DistributionAdvisor;
+import org.apache.geode.distributed.internal.HighPriorityAckedMessage;
+import org.apache.geode.distributed.internal.ReplyMessage;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
+import org.apache.geode.distributed.internal.SerialAckedMessage;
+import org.apache.geode.distributed.internal.ShutdownMessage;
+import org.apache.geode.distributed.internal.StartupMessage;
+import org.apache.geode.distributed.internal.StartupResponseMessage;
+import org.apache.geode.distributed.internal.StartupResponseWithVersionMessage;
+import org.apache.geode.distributed.internal.WaitForViewInstallation;
+import org.apache.geode.distributed.internal.locks.DLockQueryProcessor;
+import org.apache.geode.distributed.internal.locks.DLockRecoverGrantorProcessor.DLockRecoverGrantorMessage;
+import org.apache.geode.distributed.internal.locks.DLockRecoverGrantorProcessor.DLockRecoverGrantorReplyMessage;
+import org.apache.geode.distributed.internal.locks.DLockReleaseProcessor;
+import org.apache.geode.distributed.internal.locks.DLockRemoteToken;
+import org.apache.geode.distributed.internal.locks.DLockRequestProcessor;
+import org.apache.geode.distributed.internal.locks.DLockService;
+import org.apache.geode.distributed.internal.locks.DeposeGrantorProcessor;
+import org.apache.geode.distributed.internal.locks.ElderInitProcessor;
+import org.apache.geode.distributed.internal.locks.GrantorRequestProcessor;
+import org.apache.geode.distributed.internal.locks.NonGrantorDestroyedProcessor;
+import org.apache.geode.distributed.internal.locks.NonGrantorDestroyedProcessor.NonGrantorDestroyedReplyMessage;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.membership.NetView;
+import org.apache.geode.distributed.internal.membership.gms.GMSMember;
+import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorRequest;
+import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorResponse;
+import org.apache.geode.distributed.internal.membership.gms.locator.GetViewRequest;
+import org.apache.geode.distributed.internal.membership.gms.locator.GetViewResponse;
+import org.apache.geode.distributed.internal.streaming.StreamingOperation.StreamingReplyMessage;
+import org.apache.geode.internal.admin.ClientMembershipMessage;
+import org.apache.geode.internal.admin.remote.AddHealthListenerRequest;
+import org.apache.geode.internal.admin.remote.AddHealthListenerResponse;
+import org.apache.geode.internal.admin.remote.AddStatListenerRequest;
+import org.apache.geode.internal.admin.remote.AddStatListenerResponse;
+import org.apache.geode.internal.admin.remote.AdminConsoleDisconnectMessage;
+import org.apache.geode.internal.admin.remote.AdminConsoleMessage;
+import org.apache.geode.internal.admin.remote.AdminFailureResponse;
+import org.apache.geode.internal.admin.remote.AlertLevelChangeMessage;
+import org.apache.geode.internal.admin.remote.AlertListenerMessage;
+import org.apache.geode.internal.admin.remote.AlertsNotificationMessage;
+import org.apache.geode.internal.admin.remote.AppCacheSnapshotMessage;
+import org.apache.geode.internal.admin.remote.BridgeServerRequest;
+import org.apache.geode.internal.admin.remote.BridgeServerResponse;
+import org.apache.geode.internal.admin.remote.CacheConfigRequest;
+import org.apache.geode.internal.admin.remote.CacheConfigResponse;
+import org.apache.geode.internal.admin.remote.CacheInfoRequest;
+import org.apache.geode.internal.admin.remote.CacheInfoResponse;
+import org.apache.geode.internal.admin.remote.CancelStatListenerRequest;
+import org.apache.geode.internal.admin.remote.CancelStatListenerResponse;
+import org.apache.geode.internal.admin.remote.CancellationMessage;
+import org.apache.geode.internal.admin.remote.ChangeRefreshIntervalMessage;
+import org.apache.geode.internal.admin.remote.ClientHealthStats;
+import org.apache.geode.internal.admin.remote.CompactRequest;
+import org.apache.geode.internal.admin.remote.CompactResponse;
+import org.apache.geode.internal.admin.remote.DestroyEntryMessage;
+import org.apache.geode.internal.admin.remote.DestroyRegionMessage;
+import org.apache.geode.internal.admin.remote.DurableClientInfoRequest;
+import org.apache.geode.internal.admin.remote.DurableClientInfoResponse;
+import org.apache.geode.internal.admin.remote.FetchDistLockInfoRequest;
+import org.apache.geode.internal.admin.remote.FetchDistLockInfoResponse;
+import org.apache.geode.internal.admin.remote.FetchHealthDiagnosisRequest;
+import org.apache.geode.internal.admin.remote.FetchHealthDiagnosisResponse;
+import org.apache.geode.internal.admin.remote.FetchHostRequest;
+import org.apache.geode.internal.admin.remote.FetchHostResponse;
+import org.apache.geode.internal.admin.remote.FetchResourceAttributesRequest;
+import org.apache.geode.internal.admin.remote.FetchResourceAttributesResponse;
+import org.apache.geode.internal.admin.remote.FetchStatsRequest;
+import org.apache.geode.internal.admin.remote.FetchStatsResponse;
+import org.apache.geode.internal.admin.remote.FetchSysCfgRequest;
+import org.apache.geode.internal.admin.remote.FetchSysCfgResponse;
+import org.apache.geode.internal.admin.remote.FlushAppCacheSnapshotMessage;
+import org.apache.geode.internal.admin.remote.HealthListenerMessage;
+import org.apache.geode.internal.admin.remote.LicenseInfoRequest;
+import org.apache.geode.internal.admin.remote.LicenseInfoResponse;
+import org.apache.geode.internal.admin.remote.MissingPersistentIDsRequest;
+import org.apache.geode.internal.admin.remote.MissingPersistentIDsResponse;
+import org.apache.geode.internal.admin.remote.ObjectDetailsRequest;
+import org.apache.geode.internal.admin.remote.ObjectDetailsResponse;
+import org.apache.geode.internal.admin.remote.ObjectNamesRequest;
+import org.apache.geode.internal.admin.remote.ObjectNamesResponse;
+import org.apache.geode.internal.admin.remote.PrepareRevokePersistentIDRequest;
+import org.apache.geode.internal.admin.remote.RefreshMemberSnapshotRequest;
+import org.apache.geode.internal.admin.remote.RefreshMemberSnapshotResponse;
+import org.apache.geode.internal.admin.remote.RegionAttributesRequest;
+import org.apache.geode.internal.admin.remote.RegionAttributesResponse;
+import org.apache.geode.internal.admin.remote.RegionRequest;
+import org.apache.geode.internal.admin.remote.RegionResponse;
+import org.apache.geode.internal.admin.remote.RegionSizeRequest;
+import org.apache.geode.internal.admin.remote.RegionSizeResponse;
+import org.apache.geode.internal.admin.remote.RegionStatisticsRequest;
+import org.apache.geode.internal.admin.remote.RegionStatisticsResponse;
+import org.apache.geode.internal.admin.remote.RegionSubRegionSizeRequest;
+import org.apache.geode.internal.admin.remote.RegionSubRegionsSizeResponse;
+import org.apache.geode.internal.admin.remote.RemoveHealthListenerRequest;
+import org.apache.geode.internal.admin.remote.RemoveHealthListenerResponse;
+import org.apache.geode.internal.admin.remote.ResetHealthStatusRequest;
+import org.apache.geode.internal.admin.remote.ResetHealthStatusResponse;
+import org.apache.geode.internal.admin.remote.RevokePersistentIDRequest;
+import org.apache.geode.internal.admin.remote.RevokePersistentIDResponse;
+import org.apache.geode.internal.admin.remote.RootRegionRequest;
+import org.apache.geode.internal.admin.remote.RootRegionResponse;
+import org.apache.geode.internal.admin.remote.ShutdownAllGatewayHubsRequest;
+import org.apache.geode.internal.admin.remote.ShutdownAllRequest;
+import org.apache.geode.internal.admin.remote.ShutdownAllResponse;
+import org.apache.geode.internal.admin.remote.SnapshotResultMessage;
+import org.apache.geode.internal.admin.remote.StatAlertsManagerAssignMessage;
+import org.apache.geode.internal.admin.remote.StatListenerMessage;
+import org.apache.geode.internal.admin.remote.StoreSysCfgRequest;
+import org.apache.geode.internal.admin.remote.StoreSysCfgResponse;
+import org.apache.geode.internal.admin.remote.SubRegionRequest;
+import org.apache.geode.internal.admin.remote.SubRegionResponse;
+import org.apache.geode.internal.admin.remote.TailLogRequest;
+import org.apache.geode.internal.admin.remote.TailLogResponse;
+import org.apache.geode.internal.admin.remote.UpdateAlertDefinitionMessage;
+import org.apache.geode.internal.admin.remote.VersionInfoRequest;
+import org.apache.geode.internal.admin.remote.VersionInfoResponse;
+import org.apache.geode.internal.admin.statalerts.GaugeThresholdDecoratorImpl;
+import org.apache.geode.internal.admin.statalerts.NumberThresholdDecoratorImpl;
+import org.apache.geode.internal.cache.AddCacheServerProfileMessage;
+import org.apache.geode.internal.cache.ClientRegionEventImpl;
+import org.apache.geode.internal.cache.CacheServerAdvisor.CacheServerProfile;
+import org.apache.geode.internal.cache.BucketAdvisor;
+import org.apache.geode.internal.cache.CacheDistributionAdvisor;
+import org.apache.geode.internal.cache.CloseCacheMessage;
+import org.apache.geode.internal.cache.ControllerAdvisor.ControllerProfile;
+import org.apache.geode.internal.cache.CreateRegionProcessor;
+import org.apache.geode.internal.cache.DestroyOperation;
+import org.apache.geode.internal.cache.DestroyPartitionedRegionMessage;
+import org.apache.geode.internal.cache.DestroyRegionOperation;
+import org.apache.geode.internal.cache.DistTXPrecommitMessage;
+import org.apache.geode.internal.cache.DistTXCommitMessage;
+import org.apache.geode.internal.cache.DistTXRollbackMessage;
+import org.apache.geode.internal.cache.DistributedClearOperation.ClearRegionMessage;
+import org.apache.geode.internal.cache.DistributedClearOperation.ClearRegionWithContextMessage;
+import org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
+import org.apache.geode.internal.cache.DistributedPutAllOperation.PutAllMessage;
+import org.apache.geode.internal.cache.DistributedRegionFunctionStreamingMessage;
+import org.apache.geode.internal.cache.DistributedRemoveAllOperation.RemoveAllMessage;
+import org.apache.geode.internal.cache.DistributedTombstoneOperation.TombstoneMessage;
+import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.FilterProfile;
+import org.apache.geode.internal.cache.FindDurableQueueProcessor.FindDurableQueueMessage;
+import org.apache.geode.internal.cache.FindDurableQueueProcessor.FindDurableQueueReply;
+import org.apache.geode.internal.cache.FindRemoteTXMessage;
+import org.apache.geode.internal.cache.FindRemoteTXMessage.FindRemoteTXMessageReply;
+import org.apache.geode.internal.cache.FindVersionTagOperation.FindVersionTagMessage;
+import org.apache.geode.internal.cache.FindVersionTagOperation.VersionTagReply;
+import org.apache.geode.internal.cache.FunctionStreamingOrderedReplyMessage;
+import org.apache.geode.internal.cache.FunctionStreamingReplyMessage;
+import org.apache.geode.internal.cache.HARegion;
+import org.apache.geode.internal.cache.InitialImageFlowControl.FlowControlPermitMessage;
+import org.apache.geode.internal.cache.InitialImageOperation;
+import org.apache.geode.internal.cache.InitialImageOperation.InitialImageVersionedEntryList;
+import org.apache.geode.internal.cache.InvalidateOperation;
+import org.apache.geode.internal.cache.InvalidatePartitionedRegionMessage;
+import org.apache.geode.internal.cache.InvalidateRegionOperation.InvalidateRegionMessage;
+import org.apache.geode.internal.cache.JtaAfterCompletionMessage;
+import org.apache.geode.internal.cache.JtaBeforeCompletionMessage;
+import org.apache.geode.internal.cache.MemberFunctionStreamingMessage;
+import org.apache.geode.internal.cache.Node;
+import org.apache.geode.internal.cache.PRQueryProcessor;
+import org.apache.geode.internal.cache.PartitionRegionConfig;
+import org.apache.geode.internal.cache.PreferBytesCachedDeserializable;
+import org.apache.geode.internal.cache.RegionEventImpl;
+import org.apache.geode.internal.cache.ReleaseClearLockMessage;
+import org.apache.geode.internal.cache.RemoteContainsKeyValueMessage;
+import org.apache.geode.internal.cache.RemoteDestroyMessage;
+import org.apache.geode.internal.cache.RemoteFetchEntryMessage;
+import org.apache.geode.internal.cache.RemoteFetchVersionMessage;
+import org.apache.geode.internal.cache.RemoteGetMessage;
+import org.apache.geode.internal.cache.RemoteInvalidateMessage;
+import org.apache.geode.internal.cache.RemotePutAllMessage;
+import org.apache.geode.internal.cache.RemotePutMessage;
+import org.apache.geode.internal.cache.RemoteRegionOperation;
+import org.apache.geode.internal.cache.RemoteRegionOperation.RemoteRegionOperationReplyMessage;
+import org.apache.geode.internal.cache.RemoteRemoveAllMessage;
+import org.apache.geode.internal.cache.RoleEventImpl;
+import org.apache.geode.internal.cache.SearchLoadAndWriteProcessor;
+import org.apache.geode.internal.cache.SendQueueOperation.SendQueueMessage;
+import org.apache.geode.internal.cache.ServerPingMessage;
+import org.apache.geode.internal.cache.StateFlushOperation.StateMarkerMessage;
+import org.apache.geode.internal.cache.StateFlushOperation.StateStabilizationMessage;
+import org.apache.geode.internal.cache.StateFlushOperation.StateStabilizedMessage;
+import org.apache.geode.internal.cache.StoreAllCachedDeserializable;
+import org.apache.geode.internal.cache.TXCommitMessage;
+import org.apache.geode.internal.cache.TXCommitMessage.CommitProcessForLockIdMessage;
+import org.apache.geode.internal.cache.TXCommitMessage.CommitProcessForTXIdMessage;
+import org.apache.geode.internal.cache.TXCommitMessage.CommitProcessQueryMessage;
+import org.apache.geode.internal.cache.TXCommitMessage.CommitProcessQueryReplyMessage;
+import org.apache.geode.internal.cache.TXEntryState;
+import org.apache.geode.internal.cache.TXId;
+import org.apache.geode.internal.cache.TXManagerImpl;
+import org.apache.geode.internal.cache.TXRemoteCommitMessage;
+import org.apache.geode.internal.cache.TXRemoteCommitMessage.TXRemoteCommitReplyMessage;
+import org.apache.geode.internal.cache.TXRemoteRollbackMessage;
+import org.apache.geode.internal.cache.Token;
+import org.apache.geode.internal.cache.UpdateAttributesProcessor;
+import org.apache.geode.internal.cache.UpdateEntryVersionOperation.UpdateEntryVersionMessage;
+import org.apache.geode.internal.cache.UpdateOperation;
+import org.apache.geode.internal.cache.VMCachedDeserializable;
+import org.apache.geode.internal.cache.compression.SnappyCompressedCachedDeserializable;
+import org.apache.geode.internal.cache.control.ResourceAdvisor.ResourceManagerProfile;
+import org.apache.geode.internal.cache.control.ResourceAdvisor.ResourceProfileMessage;
+import org.apache.geode.internal.cache.ha.HARegionQueue.DispatchedAndCurrentEvents;
+import org.apache.geode.internal.cache.ha.QueueRemovalMessage;
+import org.apache.geode.internal.cache.locks.TXLockBatch;
+import org.apache.geode.internal.cache.locks.TXLockIdImpl;
+import org.apache.geode.internal.cache.locks.TXLockUpdateParticipantsMessage;
+import org.apache.geode.internal.cache.locks.TXLockUpdateParticipantsMessage.TXLockUpdateParticipantsReplyMessage;
+import org.apache.geode.internal.cache.locks.TXOriginatorRecoveryProcessor.TXOriginatorRecoveryMessage;
+import org.apache.geode.internal.cache.locks.TXOriginatorRecoveryProcessor.TXOriginatorRecoveryReplyMessage;
+import org.apache.geode.internal.cache.partitioned.AllBucketProfilesUpdateMessage;
+import org.apache.geode.internal.cache.partitioned.BecomePrimaryBucketMessage;
+import org.apache.geode.internal.cache.partitioned.BecomePrimaryBucketMessage.BecomePrimaryBucketReplyMessage;
+import org.apache.geode.internal.cache.partitioned.BucketBackupMessage;
+import org.apache.geode.internal.cache.partitioned.BucketCountLoadProbe;
+import org.apache.geode.internal.cache.partitioned.BucketProfileUpdateMessage;
+import org.apache.geode.internal.cache.partitioned.BucketSizeMessage;
+import org.apache.geode.internal.cache.partitioned.BucketSizeMessage.BucketSizeReplyMessage;
+import org.apache.geode.internal.cache.partitioned.ContainsKeyValueMessage;
+import org.apache.geode.internal.cache.partitioned.ContainsKeyValueMessage.ContainsKeyValueReplyMessage;
+import org.apache.geode.internal.cache.partitioned.CreateBucketMessage;
+import org.apache.geode.internal.cache.partitioned.CreateBucketMessage.CreateBucketReplyMessage;
+import org.apache.geode.internal.cache.partitioned.DeposePrimaryBucketMessage;
+import org.apache.geode.internal.cache.partitioned.DeposePrimaryBucketMessage.DeposePrimaryBucketReplyMessage;
+import org.apache.geode.internal.cache.partitioned.DestroyMessage;
+import org.apache.geode.internal.cache.partitioned.DestroyRegionOnDataStoreMessage;
+import org.apache.geode.internal.cache.partitioned.DumpAllPRConfigMessage;
+import org.apache.geode.internal.cache.partitioned.DumpB2NRegion;
+import org.apache.geode.internal.cache.partitioned.DumpB2NRegion.DumpB2NReplyMessage;
+import org.apache.geode.internal.cache.partitioned.DumpBucketsMessage;
+import org.apache.geode.internal.cache.partitioned.EndBucketCreationMessage;
+import org.apache.geode.internal.cache.partitioned.FetchBulkEntriesMessage;
+import org.apache.geode.internal.cache.partitioned.FetchBulkEntriesMessage.FetchBulkEntriesReplyMessage;
+import org.apache.geode.internal.cache.partitioned.FetchEntriesMessage;
+import org.apache.geode.internal.cache.partitioned.FetchEntriesMessage.FetchEntriesReplyMessage;
+import org.apache.geode.internal.cache.partitioned.FetchEntryMessage;
+import org.apache.geode.internal.cache.partitioned.FetchEntryMessage.FetchEntryReplyMessage;
+import org.apache.geode.internal.cache.partitioned.FetchKeysMessage;
+import org.apache.geode.internal.cache.partitioned.FetchKeysMessage.FetchKeysReplyMessage;
+import org.apache.geode.internal.cache.partitioned.FetchPartitionDetailsMessage;
+import org.apache.geode.internal.cache.partitioned.FetchPartitionDetailsMessage.FetchPartitionDetailsReplyMessage;
+import org.apache.geode.internal.cache.partitioned.FlushMessage;
+import org.apache.geode.internal.cache.partitioned.GetMessage;
+import org.apache.geode.internal.cache.partitioned.GetMessage.GetReplyMessage;
+import org.apache.geode.internal.cache.partitioned.IdentityRequestMessage;
+import org.apache.geode.internal.cache.partitioned.IdentityRequestMessage.IdentityReplyMessage;
+import org.apache.geode.internal.cache.partitioned.IdentityUpdateMessage;
+import org.apache.geode.internal.cache.partitioned.IndexCreationMsg;
+import org.apache.geode.internal.cache.partitioned.IndexCreationMsg.IndexCreationReplyMsg;
+import org.apache.geode.internal.cache.partitioned.InterestEventMessage;
+import org.apache.geode.internal.cache.partitioned.InterestEventMessage.InterestEventReplyMessage;
+import org.apache.geode.internal.cache.partitioned.InvalidateMessage;
+import org.apache.geode.internal.cache.partitioned.ManageBackupBucketMessage;
+import org.apache.geode.internal.cache.partitioned.ManageBackupBucketMessage.ManageBackupBucketReplyMessage;
+import org.apache.geode.internal.cache.partitioned.ManageBucketMessage;
+import org.apache.geode.internal.cache.partitioned.ManageBucketMessage.ManageBucketReplyMessage;
+import org.apache.geode.internal.cache.partitioned.MoveBucketMessage;
+import org.apache.geode.internal.cache.partitioned.MoveBucketMessage.MoveBucketReplyMessage;
+import org.apache.geode.internal.cache.partitioned.PRSanityCheckMessage;
+import org.apache.geode.internal.cache.partitioned.PRTombstoneMessage;
+import org.apache.geode.internal.cache.partitioned.PRUpdateEntryVersionMessage;
+import org.apache.geode.internal.cache.partitioned.PartitionedRegionFunctionStreamingMessage;
+import org.apache.geode.internal.cache.partitioned.PrimaryRequestMessage;
+import org.apache.geode.internal.cache.partitioned.PrimaryRequestMessage.PrimaryRequestReplyMessage;
+import org.apache.geode.internal.cache.partitioned.PutAllPRMessage;
+import org.apache.geode.internal.cache.partitioned.PutAllPRMessage.PutAllReplyMessage;
+import org.apache.geode.internal.cache.partitioned.PutMessage;
+import org.apache.geode.internal.cache.partitioned.PutMessage.PutReplyMessage;
+import org.apache.geode.internal.cache.partitioned.QueryMessage;
+import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
+import org.apache.geode.internal.cache.partitioned.RemoteFetchKeysMessage;
+import org.apache.geode.internal.cache.partitioned.RemoteSizeMessage;
+import org.apache.geode.internal.cache.partitioned.RemoveAllPRMessage;
+import org.apache.geode.internal.cache.partitioned.RemoveBucketMessage;
+import org.apache.geode.internal.cache.partitioned.RemoveBucketMessage.RemoveBucketReplyMessage;
+import org.apache.geode.internal.cache.partitioned.RemoveIndexesMessage;
+import org.apache.geode.internal.cache.partitioned.RemoveIndexesMessage.RemoveIndexesReplyMessage;
+import org.apache.geode.internal.cache.partitioned.SizeMessage;
+import org.apache.geode.internal.cache.partitioned.SizeMessage.SizeReplyMessage;
+import org.apache.geode.internal.cache.partitioned.SizedBasedLoadProbe;
+import org.apache.geode.internal.cache.persistence.DiskStoreID;
+import org.apache.geode.internal.cache.persistence.MembershipFlushRequest;
+import org.apache.geode.internal.cache.persistence.MembershipViewRequest;
+import org.apache.geode.internal.cache.persistence.MembershipViewRequest.MembershipViewReplyMessage;
+import org.apache.geode.internal.cache.persistence.PersistentStateQueryMessage;
+import org.apache.geode.internal.cache.persistence.PersistentStateQueryMessage.PersistentStateQueryReplyMessage;
+import org.apache.geode.internal.cache.persistence.PrepareNewPersistentMemberMessage;
+import org.apache.geode.internal.cache.persistence.RemovePersistentMemberMessage;
+import org.apache.geode.internal.cache.snapshot.FlowController.FlowControlAbortMessage;
+import org.apache.geode.internal.cache.snapshot.FlowController.FlowControlAckMessage;
+import org.apache.geode.internal.cache.snapshot.SnapshotPacket;
+import org.apache.geode.internal.cache.snapshot.SnapshotPacket.SnapshotRecord;
+import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier.ServerInterestRegistrationMessage;
+import org.apache.geode.internal.cache.tier.sockets.ClientBlacklistProcessor.ClientBlacklistMessage;
+import org.apache.geode.internal.cache.tier.sockets.ClientDataSerializerMessage;
+import org.apache.geode.internal.cache.tier.sockets.ClientInstantiatorMessage;
+import org.apache.geode.internal.cache.tier.sockets.ClientInterestMessageImpl;
+import org.apache.geode.internal.cache.tier.sockets.ClientMarkerMessageImpl;
+import org.apache.geode.internal.cache.tier.sockets.ClientPingMessageImpl;
+import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.internal.cache.tier.sockets.ClientTombstoneMessage;
+import org.apache.geode.internal.cache.tier.sockets.ClientUpdateMessageImpl;
+import org.apache.geode.internal.cache.tier.sockets.HAEventWrapper;
+import org.apache.geode.internal.cache.tier.sockets.InterestResultPolicyImpl;
+import org.apache.geode.internal.cache.tier.sockets.ObjectPartList;
+import org.apache.geode.internal.cache.tier.sockets.ObjectPartList651;
+import org.apache.geode.internal.cache.tier.sockets.RemoveClientFromBlacklistMessage;
+import org.apache.geode.internal.cache.tier.sockets.SerializedObjectPartList;
+import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
+import org.apache.geode.internal.cache.tx.DistTxEntryEvent;
+import org.apache.geode.internal.cache.versions.DiskRegionVersionVector;
+import org.apache.geode.internal.cache.versions.DiskVersionTag;
+import org.apache.geode.internal.cache.versions.VMRegionVersionVector;
+import org.apache.geode.internal.cache.versions.VMVersionTag;
+import org.apache.geode.internal.cache.wan.GatewaySenderAdvisor;
+import org.apache.geode.internal.cache.wan.GatewaySenderEventCallbackArgument;
+import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
+import org.apache.geode.internal.cache.wan.parallel.ParallelQueueBatchRemovalMessage;
+import org.apache.geode.internal.cache.wan.parallel.ParallelQueueBatchRemovalMessage.BatchRemovalReplyMessage;
+import org.apache.geode.internal.cache.wan.parallel.ParallelQueueRemovalMessage;
+import org.apache.geode.internal.cache.wan.serial.BatchDestroyOperation;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.management.internal.JmxManagerAdvisor.JmxManagerProfile;
+import org.apache.geode.management.internal.JmxManagerAdvisor.JmxManagerProfileMessage;
+import org.apache.geode.management.internal.JmxManagerLocatorRequest;
+import org.apache.geode.management.internal.JmxManagerLocatorResponse;
+import org.apache.geode.management.internal.ManagerStartupMessage;
+import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
+import org.apache.geode.management.internal.configuration.messages.ConfigurationRequest;
+import org.apache.geode.management.internal.configuration.messages.ConfigurationResponse;
+import org.apache.geode.pdx.internal.CheckTypeRegistryState;
+import org.apache.geode.pdx.internal.EnumId;
+import org.apache.geode.pdx.internal.EnumInfo;
 
 /**
  * Factory for instances of DataSerializableFixedID instances.
@@ -1010,11 +1010,11 @@ public final class DSFIDFactory implements DataSerializableFixedID {
     registerDSFID(FLOW_CONTROL_ACK, FlowControlAckMessage.class);
     registerDSFID(FLOW_CONTROL_ABORT, FlowControlAbortMessage.class);
     registerDSFID(MGMT_COMPACT_REQUEST,
-        com.gemstone.gemfire.management.internal.messages.CompactRequest.class);
+        org.apache.geode.management.internal.messages.CompactRequest.class);
     registerDSFID(MGMT_COMPACT_RESPONSE,
-        com.gemstone.gemfire.management.internal.messages.CompactResponse.class);
+        org.apache.geode.management.internal.messages.CompactResponse.class);
     registerDSFID(MGMT_FEDERATION_COMPONENT,
-        com.gemstone.gemfire.management.internal.FederationComponent.class);
+        org.apache.geode.management.internal.FederationComponent.class);
     registerDSFID(LOCATOR_STATUS_REQUEST, LocatorStatusRequest.class);
     registerDSFID(LOCATOR_STATUS_RESPONSE, LocatorStatusResponse.class);
     registerDSFID(R_FETCH_VERSION_MESSAGE, RemoteFetchVersionMessage.class);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/DSFIDNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DSFIDNotFoundException.java b/geode-core/src/main/java/org/apache/geode/internal/DSFIDNotFoundException.java
index 895ddb9..f73965d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DSFIDNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DSFIDNotFoundException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
 import java.io.NotSerializableException;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java b/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
index d3e4846..d4829d0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
-import com.gemstone.gemfire.*;
+import org.apache.geode.*;
 
 import java.io.*;
 
@@ -531,10 +531,10 @@ public interface DataSerializableFixedID extends SerializationVersions {
   // Token.EndOfStream
   public static final byte END_OF_STREAM_TOKEN = 124;
 
-  /** {@link com.gemstone.gemfire.internal.cache.partitioned.GetMessage.GetReplyMessage} */
+  /** {@link org.apache.geode.internal.cache.partitioned.GetMessage.GetReplyMessage} */
   public static final byte PR_GET_REPLY_MESSAGE = 125;
 
-  /** {@link com.gemstone.gemfire.internal.cache.Node} */
+  /** {@link org.apache.geode.internal.cache.Node} */
   public static final byte PR_NODE = 126;
 
   /** A header byte meaning that the next element in the stream is a

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/DistributionLocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DistributionLocator.java b/geode-core/src/main/java/org/apache/geode/internal/DistributionLocator.java
index 2549c7a..8c10e91 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DistributionLocator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DistributionLocator.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal;
-
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.distributed.internal.InternalLocator;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+package org.apache.geode.internal;
+
+import org.apache.geode.SystemFailure;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.InternalLocator;
+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.logging.log4j.Logger;
 
 import java.io.File;
@@ -33,7 +33,7 @@ import java.util.Properties;
 
 /**
  * This class is used to work with a managed VM that hosts a {@link
- * com.gemstone.gemfire.distributed.Locator}.
+ * org.apache.geode.distributed.Locator}.
  *
  * @since GemFire 2.0
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java b/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
index 13a86d3..009df2e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ExternalizableDSFID.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
 import java.io.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/FileUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/FileUtil.java b/geode-core/src/main/java/org/apache/geode/internal/FileUtil.java
index 276f6aa..8ac9a21 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/FileUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/FileUtil.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.DistributionConfig;
 
 import java.io.*;
 import java.net.URL;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/GemFireVersion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/GemFireVersion.java b/geode-core/src/main/java/org/apache/geode/internal/GemFireVersion.java
index d8fa21b..ea6b16d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/GemFireVersion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/GemFireVersion.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
 import java.io.File;
 import java.io.InputStream;
@@ -28,9 +28,9 @@ import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
 
-import com.gemstone.gemfire.InternalGemFireError;
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 /**
  * This class provides build and version information about GemFire.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java b/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
index 2ad94a6..b3ee75b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/GfeConsoleReaderFactory.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
 import java.io.Console;
 
-import com.gemstone.gemfire.management.internal.cli.CliUtil;
-import com.gemstone.gemfire.management.internal.cli.LogWrapper;
-import com.gemstone.gemfire.management.internal.cli.util.GfshConsoleReader;
+import org.apache.geode.management.internal.cli.CliUtil;
+import org.apache.geode.management.internal.cli.LogWrapper;
+import org.apache.geode.management.internal.cli.util.GfshConsoleReader;
 
 /**
  * Factory for Console Reader Utility.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
index eaad26e..f45193d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/HeapDataOutputStream.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.internal.cache.BytesAndBitsForCompactor;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.tcp.ByteBufferInputStream.ByteSource;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.cache.BytesAndBitsForCompactor;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.tcp.ByteBufferInputStream.ByteSource;
 import org.apache.logging.log4j.Logger;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/HistogramStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/HistogramStats.java b/geode-core/src/main/java/org/apache/geode/internal/HistogramStats.java
index eeff10a..7636db2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/HistogramStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/HistogramStats.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
-import com.gemstone.gemfire.StatisticDescriptor;
-import com.gemstone.gemfire.Statistics;
-import com.gemstone.gemfire.StatisticsFactory;
-import com.gemstone.gemfire.StatisticsType;
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.StatisticsType;
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
index 730fe6f..6e7aa55 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
@@ -14,30 +14,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal;
-
-import com.gemstone.gemfire.*;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheClosedException;
-import com.gemstone.gemfire.cache.execute.Function;
-import com.gemstone.gemfire.distributed.internal.*;
-import com.gemstone.gemfire.i18n.StringId;
-import com.gemstone.gemfire.internal.cache.EnumListenerEvent;
-import com.gemstone.gemfire.internal.cache.EventID;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.cache.PoolManagerImpl;
-import com.gemstone.gemfire.internal.cache.tier.sockets.*;
-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.CopyOnWriteHashMap;
-import com.gemstone.gemfire.pdx.NonPortableClassException;
-import com.gemstone.gemfire.pdx.PdxInstance;
-import com.gemstone.gemfire.pdx.PdxSerializable;
-import com.gemstone.gemfire.pdx.PdxSerializer;
-import com.gemstone.gemfire.pdx.internal.*;
-import com.gemstone.gemfire.pdx.internal.AutoSerializableManager.AutoClassInfo;
+package org.apache.geode.internal;
+
+import org.apache.geode.*;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.distributed.internal.*;
+import org.apache.geode.i18n.StringId;
+import org.apache.geode.internal.cache.EnumListenerEvent;
+import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.PoolManagerImpl;
+import org.apache.geode.internal.cache.tier.sockets.*;
+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.CopyOnWriteHashMap;
+import org.apache.geode.pdx.NonPortableClassException;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.pdx.PdxSerializable;
+import org.apache.geode.pdx.PdxSerializer;
+import org.apache.geode.pdx.internal.*;
+import org.apache.geode.pdx.internal.AutoSerializableManager.AutoClassInfo;
 import org.apache.logging.log4j.Logger;
 
 import java.io.*;
@@ -1566,7 +1566,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
    */
   private static boolean isGemfireObject(Object o) {
     return ((o instanceof Function) // fixes 43691
-            || o.getClass().getName().startsWith("com.gemstone.")
+            || o.getClass().getName().startsWith("org.apache.")
              || o.getClass().getName().startsWith("org.apache.geode"))
       && !(o instanceof PdxSerializerObject);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/InternalEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalEntity.java b/geode-core/src/main/java/org/apache/geode/internal/InternalEntity.java
index 2b76546..0a41064 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalEntity.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
 /**
  * A marker interface to identify internal objects that are stored in the Cache at the same place that user objects

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java b/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
index 0398787..bb15097 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalInstantiator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -29,29 +29,29 @@ import java.util.concurrent.ConcurrentMap;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.Instantiator;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.distributed.internal.SerialDistributionMessage;
-import com.gemstone.gemfire.internal.cache.EnumListenerEvent;
-import com.gemstone.gemfire.internal.cache.EventID;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.cache.PoolManagerImpl;
-import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
-import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientUpdater;
-import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerHelper;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientInstantiatorMessage;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
-import com.gemstone.gemfire.internal.cache.tier.sockets.Part;
-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.i18n.StringId;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.Instantiator;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.SerialDistributionMessage;
+import org.apache.geode.internal.cache.EnumListenerEvent;
+import org.apache.geode.internal.cache.EventID;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.PoolManagerImpl;
+import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
+import org.apache.geode.internal.cache.tier.sockets.CacheClientUpdater;
+import org.apache.geode.internal.cache.tier.sockets.CacheServerHelper;
+import org.apache.geode.internal.cache.tier.sockets.ClientInstantiatorMessage;
+import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
+import org.apache.geode.internal.cache.tier.sockets.Part;
+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.i18n.StringId;
 
 /**
- * Contains the implementation of {@link com.gemstone.gemfire.Instantiator}
+ * Contains the implementation of {@link org.apache.geode.Instantiator}
  * registration and distribution messaging (and shared memory management).
  *
  * @since GemFire 3.5

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/InternalStatisticsDisabledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/InternalStatisticsDisabledException.java b/geode-core/src/main/java/org/apache/geode/internal/InternalStatisticsDisabledException.java
index 09a474a..9382989 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/InternalStatisticsDisabledException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/InternalStatisticsDisabledException.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
-import com.gemstone.gemfire.GemFireCheckedException;
+import org.apache.geode.GemFireCheckedException;
 
 /**
  * Thrown if statistics are requested when statistics are disabled on the
@@ -25,10 +25,10 @@ import com.gemstone.gemfire.GemFireCheckedException;
  *
  *
  *
- * @see com.gemstone.gemfire.cache.AttributesFactory#setStatisticsEnabled(boolean)
- * @see com.gemstone.gemfire.cache.RegionAttributes#getStatisticsEnabled
- * @see com.gemstone.gemfire.cache.Region#getStatistics
- * @see com.gemstone.gemfire.cache.Region.Entry#getStatistics
+ * @see org.apache.geode.cache.AttributesFactory#setStatisticsEnabled(boolean)
+ * @see org.apache.geode.cache.RegionAttributes#getStatisticsEnabled
+ * @see org.apache.geode.cache.Region#getStatistics
+ * @see org.apache.geode.cache.Region.Entry#getStatistics
  * @since GemFire 3.0
  */
 public class InternalStatisticsDisabledException extends GemFireCheckedException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/JarClassLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/JarClassLoader.java b/geode-core/src/main/java/org/apache/geode/internal/JarClassLoader.java
index 183a477..f261400 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/JarClassLoader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/JarClassLoader.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -46,14 +46,14 @@ import java.util.jar.JarInputStream;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.cache.CacheClosedException;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.Declarable;
-import com.gemstone.gemfire.cache.execute.Function;
-import com.gemstone.gemfire.cache.execute.FunctionService;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.pdx.internal.TypeRegistry;
+import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Declarable;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.pdx.internal.TypeRegistry;
 
 /**
  * ClassLoader for a single JAR file.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/JarDeployer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/JarDeployer.java b/geode-core/src/main/java/org/apache/geode/internal/JarDeployer.java
index 020d429..28026db 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/JarDeployer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/JarDeployer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
@@ -42,8 +42,8 @@ import java.util.regex.Pattern;
 
 import org.apache.logging.log4j.Logger;
 
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.internal.logging.LogService;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.internal.logging.LogService;
 
 public class JarDeployer implements Serializable {
   private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/ManagerInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/ManagerInfo.java b/geode-core/src/main/java/org/apache/geode/internal/ManagerInfo.java
index ed18275..3a9db41 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/ManagerInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/ManagerInfo.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
    
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
-import com.gemstone.gemfire.*;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import org.apache.geode.*;
+import org.apache.geode.internal.i18n.LocalizedStrings;
 
 import java.io.*;
 import java.net.InetAddress;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/internal/MigrationClient.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/MigrationClient.java b/geode-core/src/main/java/org/apache/geode/internal/MigrationClient.java
index 2c81e90..6be14ee 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/MigrationClient.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/MigrationClient.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.internal;
+package org.apache.geode.internal;
 
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
 
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
 
 import java.io.*;
 import java.net.InetAddress;
@@ -33,8 +33,8 @@ import java.net.Socket;
 import java.net.SocketAddress;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * MigrationClient is used to retrieve all of the data for a region from


Mime
View raw message