http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java index b741015..17303c1 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.*; import java.io.File; import java.io.IOException; @@ -42,73 +42,73 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.ForcedDisconnectException; -import com.gemstone.gemfire.GemFireConfigException; -import com.gemstone.gemfire.GemFireIOException; -import com.gemstone.gemfire.LogWriter; -import com.gemstone.gemfire.StatisticDescriptor; -import com.gemstone.gemfire.Statistics; -import com.gemstone.gemfire.StatisticsType; -import com.gemstone.gemfire.StatisticsTypeFactory; -import com.gemstone.gemfire.SystemConnectException; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.admin.AlertLevel; -import com.gemstone.gemfire.cache.CacheClosedException; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.execute.internal.FunctionServiceManager; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; -import com.gemstone.gemfire.distributed.DurableClientAttributes; -import com.gemstone.gemfire.distributed.internal.locks.GrantorRequestProcessor; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; -import com.gemstone.gemfire.distributed.internal.membership.QuorumChecker; -import com.gemstone.gemfire.distributed.internal.membership.gms.Services; -import com.gemstone.gemfire.distributed.internal.membership.gms.mgr.GMSMembershipManager; -import com.gemstone.gemfire.i18n.LogWriterI18n; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.DSFIDFactory; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.InternalInstantiator; -import com.gemstone.gemfire.internal.SystemTimer; -import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId; -import com.gemstone.gemfire.internal.cache.CacheConfig; -import com.gemstone.gemfire.internal.cache.CacheServerImpl; -import com.gemstone.gemfire.internal.cache.EventID; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.execute.FunctionServiceStats; -import com.gemstone.gemfire.internal.cache.execute.FunctionStats; -import com.gemstone.gemfire.internal.cache.tier.sockets.HandShake; -import com.gemstone.gemfire.internal.cache.xmlcache.CacheServerCreation; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.InternalLogWriter; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.LogWriterFactory; -import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; -import com.gemstone.gemfire.internal.logging.log4j.AlertAppender; -import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; -import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppender; -import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppenders; -import com.gemstone.gemfire.internal.net.SocketCreatorFactory; -import com.gemstone.gemfire.internal.offheap.MemoryAllocator; -import com.gemstone.gemfire.internal.offheap.OffHeapStorage; -import com.gemstone.gemfire.internal.statistics.DummyStatisticsImpl; -import com.gemstone.gemfire.internal.statistics.GemFireStatSampler; -import com.gemstone.gemfire.internal.statistics.platform.LinuxProcFsStatistics; -import com.gemstone.gemfire.internal.statistics.LocalStatisticsImpl; -import com.gemstone.gemfire.internal.statistics.platform.OsStatisticsFactory; -import com.gemstone.gemfire.internal.statistics.StatisticsImpl; -import com.gemstone.gemfire.internal.statistics.StatisticsManager; -import com.gemstone.gemfire.internal.statistics.StatisticsTypeFactoryImpl; -import com.gemstone.gemfire.internal.tcp.ConnectionTable; -import com.gemstone.gemfire.internal.util.concurrent.StoppableCondition; -import com.gemstone.gemfire.internal.util.concurrent.StoppableReentrantLock; -import com.gemstone.gemfire.management.ManagementException; -import com.gemstone.gemfire.security.GemFireSecurityException; +import org.apache.geode.CancelCriterion; +import org.apache.geode.CancelException; +import org.apache.geode.ForcedDisconnectException; +import org.apache.geode.GemFireConfigException; +import org.apache.geode.GemFireIOException; +import org.apache.geode.LogWriter; +import org.apache.geode.StatisticDescriptor; +import org.apache.geode.Statistics; +import org.apache.geode.StatisticsType; +import org.apache.geode.StatisticsTypeFactory; +import org.apache.geode.SystemConnectException; +import org.apache.geode.SystemFailure; +import org.apache.geode.admin.AlertLevel; +import org.apache.geode.cache.CacheClosedException; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.execute.internal.FunctionServiceManager; +import org.apache.geode.cache.server.CacheServer; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.distributed.DistributedSystemDisconnectedException; +import org.apache.geode.distributed.DurableClientAttributes; +import org.apache.geode.distributed.internal.locks.GrantorRequestProcessor; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.MembershipManager; +import org.apache.geode.distributed.internal.membership.QuorumChecker; +import org.apache.geode.distributed.internal.membership.gms.Services; +import org.apache.geode.distributed.internal.membership.gms.mgr.GMSMembershipManager; +import org.apache.geode.i18n.LogWriterI18n; +import org.apache.geode.internal.Assert; +import org.apache.geode.internal.DSFIDFactory; +import org.apache.geode.internal.InternalDataSerializer; +import org.apache.geode.internal.InternalInstantiator; +import org.apache.geode.internal.SystemTimer; +import org.apache.geode.internal.admin.remote.DistributionLocatorId; +import org.apache.geode.internal.cache.CacheConfig; +import org.apache.geode.internal.cache.CacheServerImpl; +import org.apache.geode.internal.cache.EventID; +import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.internal.cache.execute.FunctionServiceStats; +import org.apache.geode.internal.cache.execute.FunctionStats; +import org.apache.geode.internal.cache.tier.sockets.HandShake; +import org.apache.geode.internal.cache.xmlcache.CacheServerCreation; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.InternalLogWriter; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.logging.LogWriterFactory; +import org.apache.geode.internal.logging.LoggingThreadGroup; +import org.apache.geode.internal.logging.log4j.AlertAppender; +import org.apache.geode.internal.logging.log4j.LocalizedMessage; +import org.apache.geode.internal.logging.log4j.LogWriterAppender; +import org.apache.geode.internal.logging.log4j.LogWriterAppenders; +import org.apache.geode.internal.net.SocketCreatorFactory; +import org.apache.geode.internal.offheap.MemoryAllocator; +import org.apache.geode.internal.offheap.OffHeapStorage; +import org.apache.geode.internal.statistics.DummyStatisticsImpl; +import org.apache.geode.internal.statistics.GemFireStatSampler; +import org.apache.geode.internal.statistics.platform.LinuxProcFsStatistics; +import org.apache.geode.internal.statistics.LocalStatisticsImpl; +import org.apache.geode.internal.statistics.platform.OsStatisticsFactory; +import org.apache.geode.internal.statistics.StatisticsImpl; +import org.apache.geode.internal.statistics.StatisticsManager; +import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl; +import org.apache.geode.internal.tcp.ConnectionTable; +import org.apache.geode.internal.util.concurrent.StoppableCondition; +import org.apache.geode.internal.util.concurrent.StoppableReentrantLock; +import org.apache.geode.management.ManagementException; +import org.apache.geode.security.GemFireSecurityException; /** * The concrete implementation of {@link DistributedSystem} that @@ -479,7 +479,7 @@ public class InternalDistributedSystem extends DistributedSystem implements OsSt // if (DistributionConfigImpl.forceDisableTcp) { // this.logger.warning("Use of UDP has been forced"); // } - // if (com.gemstone.gemfire.distributed.internal.membership.jgroup.JGroupMembershipManager.multicastTest) { + // if (org.apache.geode.distributed.internal.membership.jgroup.JGroupMembershipManager.multicastTest) { // this.logger.warning("Use of multicast for all distributed cache operations has been forced"); // } @@ -1509,7 +1509,7 @@ public class InternalDistributedSystem extends DistributedSystem implements OsSt * Returns the id of this connection to the distributed system. * This is actually the port of the distribution manager's * distribution channel. - * @see com.gemstone.gemfire.distributed.internal.DistributionChannel#getId + * @see org.apache.geode.distributed.internal.DistributionChannel#getId */ @Override public long getId() { @@ -2860,7 +2860,7 @@ public class InternalDistributedSystem extends DistributedSystem implements OsSt } /** - * see {@link com.gemstone.gemfire.admin.AdminDistributedSystemFactory} + * see {@link org.apache.geode.admin.AdminDistributedSystemFactory} * @since GemFire 5.7 */ public static void setEnableAdministrationOnly(boolean adminOnly) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java index 0125ef2..817a727 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.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; +package org.apache.geode.distributed.internal; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.*; import java.io.File; import java.io.IOException; @@ -36,55 +36,55 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.client.internal.locator.ClientConnectionRequest; -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.LocatorListRequest; -import com.gemstone.gemfire.cache.client.internal.locator.LocatorStatusRequest; -import com.gemstone.gemfire.cache.client.internal.locator.QueueConnectionRequest; -import com.gemstone.gemfire.cache.client.internal.locator.ServerLocationRequest; -import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.Locator; -import com.gemstone.gemfire.distributed.LockServiceDestroyedException; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem.ConnectListener; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem.DisconnectListener; -import com.gemstone.gemfire.distributed.internal.membership.MemberFactory; -import com.gemstone.gemfire.distributed.internal.membership.QuorumChecker; -import com.gemstone.gemfire.distributed.internal.membership.gms.NetLocator; -import com.gemstone.gemfire.distributed.internal.membership.gms.locator.PeerLocatorRequest; -import com.gemstone.gemfire.distributed.internal.tcpserver.LocatorCancelException; -import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient; -import com.gemstone.gemfire.distributed.internal.tcpserver.TcpHandler; -import com.gemstone.gemfire.distributed.internal.tcpserver.TcpServer; -import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.wan.WANServiceProvider; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.InternalLogWriter; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.LogWriterFactory; -import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; -import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; -import com.gemstone.gemfire.internal.logging.log4j.LogMarker; -import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppenders; -import com.gemstone.gemfire.internal.logging.log4j.LogWriterLogger; -import com.gemstone.gemfire.internal.net.SocketCreator; -import com.gemstone.gemfire.internal.net.SocketCreatorFactory; -import com.gemstone.gemfire.management.internal.JmxManagerLocator; -import com.gemstone.gemfire.management.internal.JmxManagerLocatorRequest; -import com.gemstone.gemfire.management.internal.JmxManagerLocatorResponse; -import com.gemstone.gemfire.management.internal.cli.CliUtil; -import com.gemstone.gemfire.management.internal.configuration.domain.SharedConfigurationStatus; -import com.gemstone.gemfire.management.internal.configuration.handlers.ConfigurationRequestHandler; -import com.gemstone.gemfire.management.internal.configuration.handlers.SharedConfigurationStatusRequestHandler; -import com.gemstone.gemfire.management.internal.configuration.messages.ConfigurationRequest; -import com.gemstone.gemfire.management.internal.configuration.messages.SharedConfigurationStatusRequest; -import com.gemstone.gemfire.management.internal.configuration.messages.SharedConfigurationStatusResponse; +import org.apache.geode.CancelException; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.client.internal.locator.ClientConnectionRequest; +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.LocatorListRequest; +import org.apache.geode.cache.client.internal.locator.LocatorStatusRequest; +import org.apache.geode.cache.client.internal.locator.QueueConnectionRequest; +import org.apache.geode.cache.client.internal.locator.ServerLocationRequest; +import org.apache.geode.cache.client.internal.locator.wan.LocatorMembershipListener; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.distributed.Locator; +import org.apache.geode.distributed.LockServiceDestroyedException; +import org.apache.geode.distributed.internal.InternalDistributedSystem.ConnectListener; +import org.apache.geode.distributed.internal.InternalDistributedSystem.DisconnectListener; +import org.apache.geode.distributed.internal.membership.MemberFactory; +import org.apache.geode.distributed.internal.membership.QuorumChecker; +import org.apache.geode.distributed.internal.membership.gms.NetLocator; +import org.apache.geode.distributed.internal.membership.gms.locator.PeerLocatorRequest; +import org.apache.geode.distributed.internal.tcpserver.LocatorCancelException; +import org.apache.geode.distributed.internal.tcpserver.TcpClient; +import org.apache.geode.distributed.internal.tcpserver.TcpHandler; +import org.apache.geode.distributed.internal.tcpserver.TcpServer; +import org.apache.geode.internal.admin.remote.DistributionLocatorId; +import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.internal.cache.wan.WANServiceProvider; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.InternalLogWriter; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.logging.LogWriterFactory; +import org.apache.geode.internal.logging.LoggingThreadGroup; +import org.apache.geode.internal.logging.log4j.LocalizedMessage; +import org.apache.geode.internal.logging.log4j.LogMarker; +import org.apache.geode.internal.logging.log4j.LogWriterAppenders; +import org.apache.geode.internal.logging.log4j.LogWriterLogger; +import org.apache.geode.internal.net.SocketCreator; +import org.apache.geode.internal.net.SocketCreatorFactory; +import org.apache.geode.management.internal.JmxManagerLocator; +import org.apache.geode.management.internal.JmxManagerLocatorRequest; +import org.apache.geode.management.internal.JmxManagerLocatorResponse; +import org.apache.geode.management.internal.cli.CliUtil; +import org.apache.geode.management.internal.configuration.domain.SharedConfigurationStatus; +import org.apache.geode.management.internal.configuration.handlers.ConfigurationRequestHandler; +import org.apache.geode.management.internal.configuration.handlers.SharedConfigurationStatusRequestHandler; +import org.apache.geode.management.internal.configuration.messages.ConfigurationRequest; +import org.apache.geode.management.internal.configuration.messages.SharedConfigurationStatusRequest; +import org.apache.geode.management.internal.configuration.messages.SharedConfigurationStatusResponse; /** * Provides the implementation of a distribution <code>Locator</code> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java index 4933e25..67373f9 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorLoadSnapshot.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; +package org.apache.geode.distributed.internal; import java.util.ArrayList; import java.util.Collection; @@ -35,9 +35,9 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import com.gemstone.gemfire.cache.server.ServerLoad; -import com.gemstone.gemfire.cache.wan.GatewayReceiver; -import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID; +import org.apache.geode.cache.server.ServerLoad; +import org.apache.geode.cache.wan.GatewayReceiver; +import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID; /** * A data structure used to hold load information for a locator http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java index 897b8c3..6f9c42d 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LocatorStats.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; +package org.apache.geode.distributed.internal; -import com.gemstone.gemfire.*; -import com.gemstone.gemfire.internal.statistics.StatisticsTypeFactoryImpl; +import org.apache.geode.*; +import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; /** * This class maintains statistics for the locator http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java index b59a0c9..a02a6b5 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; - -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.InternalGemFireError; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DurableClientAttributes; -import com.gemstone.gemfire.distributed.Role; -import com.gemstone.gemfire.distributed.internal.locks.ElderState; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.MemberAttributes; -import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; -import com.gemstone.gemfire.i18n.LogWriterI18n; -import com.gemstone.gemfire.internal.net.SocketCreator; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.InternalLogWriter; +package org.apache.geode.distributed.internal; + +import org.apache.geode.CancelCriterion; +import org.apache.geode.InternalGemFireError; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.DurableClientAttributes; +import org.apache.geode.distributed.Role; +import org.apache.geode.distributed.internal.locks.ElderState; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.MemberAttributes; +import org.apache.geode.distributed.internal.membership.MembershipManager; +import org.apache.geode.i18n.LogWriterI18n; +import org.apache.geode.internal.net.SocketCreator; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.InternalLogWriter; import java.io.Serializable; import java.net.InetAddress; @@ -88,7 +88,7 @@ public class LonerDistributionManager implements DM { try { host = InetAddress.getLocalHost().getCanonicalHostName(); MemberAttributes.setDefaults(65535, - com.gemstone.gemfire.internal.OSProcess.getId(), + org.apache.geode.internal.OSProcess.getId(), DistributionManager.LONER_DM_TYPE, MemberAttributes.parseRoles(system.getConfig().getRoles())); id = new InternalDistributedMember(host, 65535); // noise value for port number @@ -895,7 +895,7 @@ public class LonerDistributionManager implements DM { } /* (non-Javadoc) - * @see com.gemstone.gemfire.distributed.internal.DM#getMembershipManager() + * @see org.apache.geode.distributed.internal.DM#getMembershipManager() */ public MembershipManager getMembershipManager() { // no membership manager @@ -903,20 +903,20 @@ public class LonerDistributionManager implements DM { } /* (non-Javadoc) - * @see com.gemstone.gemfire.distributed.internal.DM#getRootCause() + * @see org.apache.geode.distributed.internal.DM#getRootCause() */ public Throwable getRootCause() { return null; } /* (non-Javadoc) - * @see com.gemstone.gemfire.distributed.internal.DM#setRootCause(java.lang.Throwable) + * @see org.apache.geode.distributed.internal.DM#setRootCause(java.lang.Throwable) */ public void setRootCause(Throwable t) { } /* (non-Javadoc) - * @see com.gemstone.gemfire.distributed.internal.DM#getMembersOnThisHost() + * @see org.apache.geode.distributed.internal.DM#getMembersOnThisHost() * @since GemFire 5.9 */ public Set<InternalDistributedMember> getMembersInThisZone() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/MQueue.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/MQueue.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/MQueue.java index 304a7fa..b9e169e 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/MQueue.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/MQueue.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; +package org.apache.geode.distributed.internal; import java.util.concurrent.BlockingQueue; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/MembershipListener.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/MembershipListener.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/MembershipListener.java index 8fe2d67..4255bab 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/MembershipListener.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/MembershipListener.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; import java.util.List; import java.util.Set; -import com.gemstone.gemfire.distributed.internal.membership.*; +import org.apache.geode.distributed.internal.membership.*; /** * This interface specifies callback methods that are invoked when http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/MessageFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/MessageFactory.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/MessageFactory.java index ec09bd7..5b62a0f 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/MessageFactory.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/MessageFactory.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; +package org.apache.geode.distributed.internal; -import com.gemstone.gemfire.InternalGemFireException; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.InternalGemFireException; +import org.apache.geode.internal.i18n.LocalizedStrings; /** * This class is a factory that creates instances http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/MessageWithReply.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/MessageWithReply.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/MessageWithReply.java index a5c028c..219d7da 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/MessageWithReply.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/MessageWithReply.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; +package org.apache.geode.distributed.internal; -import com.gemstone.gemfire.distributed.internal.membership.*; +import org.apache.geode.distributed.internal.membership.*; /** * A marker interface that denotes {@link DistributionMessage}s that @@ -30,7 +30,7 @@ public interface MessageWithReply { /** * Returns the id of the {@link - * com.gemstone.gemfire.distributed.internal.ReplyProcessor21} that is used to + * org.apache.geode.distributed.internal.ReplyProcessor21} that is used to * handle the reply to this message. */ public int getProcessorId(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/OverflowQueueWithDMStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/OverflowQueueWithDMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/OverflowQueueWithDMStats.java index 03b7f64..54f5d8f 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/OverflowQueueWithDMStats.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/OverflowQueueWithDMStats.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/PoolStatHelper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/PoolStatHelper.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/PoolStatHelper.java index f4b8f83..ba03294 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/PoolStatHelper.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/PoolStatHelper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; /** * Used to implement statistics on a pool. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java index 2f22918..ea1a2a1 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledDistributionMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; /** * A PooledDistributionMessage passes processing off to a thread that http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java index 5bb82f0..31760c8 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.SystemFailure; +import org.apache.geode.internal.i18n.LocalizedStrings; import java.util.List; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ProcessorKeeper21.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProcessorKeeper21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProcessorKeeper21.java index 650a02c..bb7df56 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProcessorKeeper21.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProcessorKeeper21.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; +package org.apache.geode.distributed.internal; -import com.gemstone.gemfire.internal.*; +import org.apache.geode.internal.*; import java.lang.ref.WeakReference; import java.util.concurrent.atomic.AtomicInteger; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java index c8e066d..18b51b9 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProductUseLog.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; +package org.apache.geode.distributed.internal; import java.io.File; import java.io.FileNotFoundException; @@ -23,12 +23,12 @@ import java.io.PrintStream; import java.util.List; import java.util.Set; -import com.gemstone.gemfire.GemFireIOException; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.InternalLogWriter; -import com.gemstone.gemfire.internal.logging.PureLogWriter; +import org.apache.geode.GemFireIOException; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.MembershipManager; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.InternalLogWriter; +import org.apache.geode.internal.logging.PureLogWriter; /** * A log intended for recording product-use. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ProfileListener.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProfileListener.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProfileListener.java index 5797f84..8619a05 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ProfileListener.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ProfileListener.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; +package org.apache.geode.distributed.internal; -import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.Profile; +import org.apache.geode.distributed.internal.DistributionAdvisor.Profile; /** * Callback for changes to profiles in a DistributionAdvisor. A ProfileListener http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/QueueStatHelper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/QueueStatHelper.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/QueueStatHelper.java index dd1837f..e347c62 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/QueueStatHelper.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/QueueStatHelper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; /** * Used to implement statistics on a queue. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyException.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyException.java index 272dbe8..fc6fa5a 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyException.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyException.java @@ -17,7 +17,7 @@ /** * */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; /** * thrown by {@linkplain ReliableReplyProcessor21} when a message has not been delivered http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java index 93f89a3..f8ad122 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReliableReplyProcessor21.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; import java.util.*; -import com.gemstone.gemfire.distributed.internal.membership.*; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.distributed.internal.membership.*; +import org.apache.geode.internal.i18n.LocalizedStrings; /** * This is a reply processor which tracks departed members in order for http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyException.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyException.java index 646243a..656ab64 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyException.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyException.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; -import com.gemstone.gemfire.GemFireException; -import com.gemstone.gemfire.InternalGemFireException; -import com.gemstone.gemfire.SerializationException; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.GemFireException; +import org.apache.geode.InternalGemFireException; +import org.apache.geode.SerializationException; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.i18n.LocalizedStrings; /** * Exception thrown when a DistributionMessage is processed to be propagated http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java index 20c75b0..2d8c5c1 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; import java.io.DataInput; import java.io.DataOutput; @@ -23,13 +23,13 @@ import java.io.IOException; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.InvalidDeltaException; -import com.gemstone.gemfire.cache.EntryNotFoundException; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.cache.versions.ConcurrentCacheModificationException; -import com.gemstone.gemfire.internal.logging.LogService; +import org.apache.geode.DataSerializer; +import org.apache.geode.InvalidDeltaException; +import org.apache.geode.cache.EntryNotFoundException; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.Assert; +import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException; +import org.apache.geode.internal.logging.LogService; /** * A message that acknowledges that an operation completed http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java index ced0f49..84f63d2 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplyProcessor21.java @@ -15,25 +15,25 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; - -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.InternalGemFireException; -import com.gemstone.gemfire.cache.TimeoutException; -import com.gemstone.gemfire.cache.UnsupportedVersionException; -import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; -import com.gemstone.gemfire.distributed.internal.deadlock.MessageDependencyMonitor; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.i18n.StringId; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.DSFIDNotFoundException; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.cache.versions.ConcurrentCacheModificationException; -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.util.Breadcrumbs; -import com.gemstone.gemfire.internal.util.concurrent.StoppableCountDownLatch; +package org.apache.geode.distributed.internal; + +import org.apache.geode.CancelCriterion; +import org.apache.geode.InternalGemFireException; +import org.apache.geode.cache.TimeoutException; +import org.apache.geode.cache.UnsupportedVersionException; +import org.apache.geode.distributed.DistributedSystemDisconnectedException; +import org.apache.geode.distributed.internal.deadlock.MessageDependencyMonitor; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.i18n.StringId; +import org.apache.geode.internal.Assert; +import org.apache.geode.internal.DSFIDNotFoundException; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException; +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.util.Breadcrumbs; +import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch; import org.apache.logging.log4j.Logger; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplySender.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplySender.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplySender.java index c177a4b..708da50 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplySender.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ReplySender.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; +package org.apache.geode.distributed.internal; import java.util.Set; -import com.gemstone.gemfire.i18n.LogWriterI18n; -import com.gemstone.gemfire.internal.cache.DirectReplyMessage; +import org.apache.geode.i18n.LogWriterI18n; +import org.apache.geode.internal.cache.DirectReplyMessage; /** * This interface is used by direct ack messages to send a reply http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEvent.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEvent.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEvent.java index 584975e..9dfb1c8 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEvent.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEvent.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; +package org.apache.geode.distributed.internal; /** * GemFire Resource Events http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEventsListener.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEventsListener.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEventsListener.java index bd2895b..f8f2008 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEventsListener.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ResourceEventsListener.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; +package org.apache.geode.distributed.internal; /** * Internal interface to be implemented to catch various resource events http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java index c1384c3..a625ecc 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; -import com.gemstone.gemfire.GemFireIOException; -import com.gemstone.gemfire.internal.ConfigSource; -import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppenders; +import org.apache.geode.GemFireIOException; +import org.apache.geode.internal.ConfigSource; +import org.apache.geode.internal.logging.log4j.LogWriterAppenders; import java.io.File; import java.util.Arrays; import java.util.List; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.*; /** * Provides an implementation of <code>DistributionConfig</code> that http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java index f7e1c19..a09df7d 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialAckedMessage.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; +package org.apache.geode.distributed.internal; import java.io.DataInput; import java.io.DataOutput; @@ -25,11 +25,11 @@ import java.util.Set; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.logging.LogService; +import org.apache.geode.DataSerializer; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.Assert; +import org.apache.geode.internal.logging.LogService; /** * A message that is sent to a given collection of managers and then http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialDistributionMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialDistributionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialDistributionMessage.java index 4fe5140..96c8c48 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialDistributionMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialDistributionMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; /** * A SerialDistributionMessage is processed in the order http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java index 26c0feb..4c194f1 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SerialQueuedExecutorWithDMStats.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; +package org.apache.geode.distributed.internal; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ThreadFactory; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java index 622f7ee..2a4caa4 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocation.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; +package org.apache.geode.distributed.internal; import java.io.DataInput; import java.io.DataOutput; @@ -22,9 +22,9 @@ import java.io.IOException; import java.net.UnknownHostException; import java.util.concurrent.atomic.AtomicInteger; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.internal.net.SocketCreator; +import org.apache.geode.DataSerializable; +import org.apache.geode.DataSerializer; +import org.apache.geode.internal.net.SocketCreator; /** * Represents the location of a bridge server. This class is http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.java index 85db34d..866646b 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocator.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; +package org.apache.geode.distributed.internal; import java.io.File; import java.io.IOException; @@ -29,38 +29,38 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import com.gemstone.gemfire.internal.DataSerializableFixedID; +import org.apache.geode.internal.DataSerializableFixedID; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.InternalGemFireException; -import com.gemstone.gemfire.cache.GemFireCache; -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.LocatorStatusResponse; -import com.gemstone.gemfire.cache.client.internal.locator.QueueConnectionRequest; -import com.gemstone.gemfire.cache.client.internal.locator.QueueConnectionResponse; -import com.gemstone.gemfire.cache.client.internal.locator.ServerLocationRequest; -import com.gemstone.gemfire.cache.server.ServerLoad; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.Profile; -import com.gemstone.gemfire.distributed.internal.tcpserver.TcpHandler; -import com.gemstone.gemfire.distributed.internal.tcpserver.TcpServer; -import com.gemstone.gemfire.i18n.LogWriterI18n; -import com.gemstone.gemfire.internal.net.SocketCreator; -import com.gemstone.gemfire.internal.cache.CacheServerAdvisor.CacheServerProfile; -import com.gemstone.gemfire.internal.cache.ControllerAdvisor; -import com.gemstone.gemfire.internal.cache.ControllerAdvisor.ControllerProfile; -import com.gemstone.gemfire.internal.cache.FindDurableQueueProcessor; -import com.gemstone.gemfire.internal.cache.GridAdvisor.GridProfile; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LogService; +import org.apache.geode.CancelCriterion; +import org.apache.geode.InternalGemFireException; +import org.apache.geode.cache.GemFireCache; +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.LocatorStatusResponse; +import org.apache.geode.cache.client.internal.locator.QueueConnectionRequest; +import org.apache.geode.cache.client.internal.locator.QueueConnectionResponse; +import org.apache.geode.cache.client.internal.locator.ServerLocationRequest; +import org.apache.geode.cache.server.ServerLoad; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.distributed.internal.DistributionAdvisor.Profile; +import org.apache.geode.distributed.internal.tcpserver.TcpHandler; +import org.apache.geode.distributed.internal.tcpserver.TcpServer; +import org.apache.geode.i18n.LogWriterI18n; +import org.apache.geode.internal.net.SocketCreator; +import org.apache.geode.internal.cache.CacheServerAdvisor.CacheServerProfile; +import org.apache.geode.internal.cache.ControllerAdvisor; +import org.apache.geode.internal.cache.ControllerAdvisor.ControllerProfile; +import org.apache.geode.internal.cache.FindDurableQueueProcessor; +import org.apache.geode.internal.cache.GridAdvisor.GridProfile; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.LogService; /** * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/SharedConfiguration.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SharedConfiguration.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SharedConfiguration.java index 1c32050..2e6677f 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SharedConfiguration.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SharedConfiguration.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; +package org.apache.geode.distributed.internal; import java.io.BufferedWriter; import java.io.File; @@ -48,42 +48,42 @@ import org.apache.logging.log4j.Logger; import org.w3c.dom.Document; import org.xml.sax.SAXException; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.cache.AttributesFactory; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.DiskStore; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.cache.execute.ResultCollector; -import com.gemstone.gemfire.distributed.DistributedLockService; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.locks.DLockService; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.InternalRegionArguments; -import com.gemstone.gemfire.internal.cache.persistence.PersistentMemberID; -import com.gemstone.gemfire.internal.cache.persistence.PersistentMemberManager; -import com.gemstone.gemfire.internal.cache.persistence.PersistentMemberPattern; -import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml; -import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator; -import com.gemstone.gemfire.internal.lang.StringUtils; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.management.internal.cli.CliUtil; -import com.gemstone.gemfire.management.internal.cli.functions.ImportSharedConfigurationArtifactsFunction; -import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; -import com.gemstone.gemfire.management.internal.configuration.callbacks.ConfigurationChangeListener; -import com.gemstone.gemfire.management.internal.configuration.domain.Configuration; -import com.gemstone.gemfire.management.internal.configuration.domain.SharedConfigurationStatus; -import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity; -import com.gemstone.gemfire.management.internal.configuration.functions.GetAllJarsFunction; -import com.gemstone.gemfire.management.internal.configuration.messages.ConfigurationRequest; -import com.gemstone.gemfire.management.internal.configuration.messages.ConfigurationResponse; -import com.gemstone.gemfire.management.internal.configuration.messages.SharedConfigurationStatusResponse; -import com.gemstone.gemfire.management.internal.configuration.utils.XmlUtils; -import com.gemstone.gemfire.management.internal.configuration.utils.ZipUtils; - -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; +import org.apache.geode.CancelException; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.DiskStore; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.Scope; +import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.distributed.DistributedLockService; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.distributed.internal.locks.DLockService; +import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.internal.cache.InternalRegionArguments; +import org.apache.geode.internal.cache.persistence.PersistentMemberID; +import org.apache.geode.internal.cache.persistence.PersistentMemberManager; +import org.apache.geode.internal.cache.persistence.PersistentMemberPattern; +import org.apache.geode.internal.cache.xmlcache.CacheXml; +import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator; +import org.apache.geode.internal.lang.StringUtils; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.management.internal.cli.CliUtil; +import org.apache.geode.management.internal.cli.functions.ImportSharedConfigurationArtifactsFunction; +import org.apache.geode.management.internal.cli.i18n.CliStrings; +import org.apache.geode.management.internal.configuration.callbacks.ConfigurationChangeListener; +import org.apache.geode.management.internal.configuration.domain.Configuration; +import org.apache.geode.management.internal.configuration.domain.SharedConfigurationStatus; +import org.apache.geode.management.internal.configuration.domain.XmlEntity; +import org.apache.geode.management.internal.configuration.functions.GetAllJarsFunction; +import org.apache.geode.management.internal.configuration.messages.ConfigurationRequest; +import org.apache.geode.management.internal.configuration.messages.ConfigurationResponse; +import org.apache.geode.management.internal.configuration.messages.SharedConfigurationStatusResponse; +import org.apache.geode.management.internal.configuration.utils.XmlUtils; +import org.apache.geode.management.internal.configuration.utils.ZipUtils; + +import static org.apache.geode.distributed.ConfigurationProperties.*; @SuppressWarnings({ "deprecation", "unchecked" }) public class SharedConfiguration { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java index b96850e..9cfc129 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ShutdownMessage.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; +package org.apache.geode.distributed.internal; -import com.gemstone.gemfire.*; -import com.gemstone.gemfire.internal.*; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.*; +import org.apache.geode.internal.*; +import org.apache.geode.internal.i18n.LocalizedStrings; import java.io.*; -import com.gemstone.gemfire.distributed.internal.membership.*; +import org.apache.geode.distributed.internal.membership.*; /** * A message that is sent to all other distribution manager when http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/Sizeable.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/Sizeable.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/Sizeable.java index 76deee0..df486d4 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/Sizeable.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/Sizeable.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; +package org.apache.geode.distributed.internal; /** Sizeable objects have a getSize() method that returns the approximate size of the object. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/SizeableRunnable.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SizeableRunnable.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SizeableRunnable.java index e6896e4..d53a759 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SizeableRunnable.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SizeableRunnable.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; +package org.apache.geode.distributed.internal; /** SizeableRunnable is a Runnable with a size. It implements the Sizeable interface http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java index 7109385..0bda213 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; - -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.Instantiator; -import com.gemstone.gemfire.SystemConnectException; -import com.gemstone.gemfire.internal.*; -import com.gemstone.gemfire.internal.InternalDataSerializer.SerializerAttributesHolder; -import com.gemstone.gemfire.internal.InternalInstantiator.InstantiatorAttributesHolder; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.net.SocketCreator; +package org.apache.geode.distributed.internal; + +import org.apache.geode.DataSerializer; +import org.apache.geode.Instantiator; +import org.apache.geode.SystemConnectException; +import org.apache.geode.internal.*; +import org.apache.geode.internal.InternalDataSerializer.SerializerAttributesHolder; +import org.apache.geode.internal.InternalInstantiator.InstantiatorAttributesHolder; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.net.SocketCreator; import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.Logger; @@ -224,7 +224,7 @@ public final class StartupMessage extends HighPriorityDistributionMessage implem if (rejectionMessage == null) { // change state only if there's no rejectionMessage yet if (this.interfaces == null || this.interfaces.size() == 0) { - final com.gemstone.gemfire.i18n.StringId msg = + final org.apache.geode.i18n.StringId msg = LocalizedStrings.StartupMessage_REJECTED_NEW_SYSTEM_NODE_0_BECAUSE_PEER_HAS_NO_NETWORK_INTERFACES; rejectionMessage = msg.toLocalizedString(getSender()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageData.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageData.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageData.java index ad61b88..22dc1c4 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageData.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageData.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; +package org.apache.geode.distributed.internal; import java.io.DataInput; import java.io.DataOutput; @@ -26,8 +26,8 @@ import java.util.Collection; import java.util.Properties; import java.util.StringTokenizer; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.internal.GemFireVersion; +import org.apache.geode.DataSerializer; +import org.apache.geode.internal.GemFireVersion; /** * Provides optional data fields as properties for StartupMessage and http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java index d248d2a..e7115ce 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessageReplyProcessor.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; import java.util.Set; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.i18n.LogWriterI18n; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.i18n.LogWriterI18n; public class StartupMessageReplyProcessor extends ReplyProcessor21 { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupOperation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupOperation.java index 721f95b..46d1390 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupOperation.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupOperation.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; +package org.apache.geode.distributed.internal; import java.io.IOException; import java.util.HashSet; @@ -23,11 +23,11 @@ import java.util.Set; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.admin.remote.RemoteTransportConfig; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.logging.log4j.LocalizedMessage; public class StartupOperation { private static final Logger logger = LogService.getLogger(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java index 3fbf7c7..7d2b2a2 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.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; +package org.apache.geode.distributed.internal; import java.io.DataInput; import java.io.DataOutput; @@ -24,17 +24,17 @@ import java.util.Set; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.Instantiator; +import org.apache.geode.DataSerializer; +import org.apache.geode.Instantiator; //import java.util.*; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.InternalDataSerializer.SerializerAttributesHolder; -import com.gemstone.gemfire.internal.InternalInstantiator; -import com.gemstone.gemfire.internal.InternalInstantiator.InstantiatorAttributesHolder; -import com.gemstone.gemfire.internal.Version; -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.internal.InternalDataSerializer; +import org.apache.geode.internal.InternalDataSerializer.SerializerAttributesHolder; +import org.apache.geode.internal.InternalInstantiator; +import org.apache.geode.internal.InternalInstantiator.InstantiatorAttributesHolder; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.logging.log4j.LogMarker; /** * A message that is sent to all other distribution manager when http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java index 3027486..9aa03c9 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseWithVersionMessage.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; +package org.apache.geode.distributed.internal; import java.io.DataInput; import java.io.DataOutput; @@ -23,12 +23,12 @@ import java.util.Collection; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.GemFireVersion; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.logging.LogService; +import org.apache.geode.DataSerializer; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.GemFireVersion; +import org.apache.geode.internal.InternalDataSerializer; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.logging.LogService; /** * @since GemFire 6.6.2 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledMemQueueStatHelper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledMemQueueStatHelper.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledMemQueueStatHelper.java index ee4cd91..ec45032 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledMemQueueStatHelper.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledMemQueueStatHelper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; /** * Used to implement statistics on a throttled queue. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledQueueStatHelper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledQueueStatHelper.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledQueueStatHelper.java index e7244c7..511d1c0 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledQueueStatHelper.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottledQueueStatHelper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; /** * Used to implement statistics on a throttled queue. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java index 0c1c988..ca3c4be 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; -import com.gemstone.gemfire.distributed.internal.DistributionStats; +import org.apache.geode.distributed.internal.DistributionStats; import java.util.*; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/WaitForViewInstallation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/WaitForViewInstallation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/WaitForViewInstallation.java index 5b0bc61..e3f2351 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/WaitForViewInstallation.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/WaitForViewInstallation.java @@ -17,7 +17,7 @@ /** * */ -package com.gemstone.gemfire.distributed.internal; +package org.apache.geode.distributed.internal; import java.io.DataInput; import java.io.DataOutput; @@ -25,8 +25,8 @@ import java.io.IOException; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.internal.logging.LogService; +import org.apache.geode.CancelException; +import org.apache.geode.internal.logging.LogService; /** * @@ -85,7 +85,7 @@ public class WaitForViewInstallation extends HighPriorityDistributionMessage } /* (non-Javadoc) - * @see com.gemstone.gemfire.internal.DataSerializableFixedID#getDSFID() + * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID() */ public int getDSFID() { return WAIT_FOR_VIEW_INSTALLATION; @@ -106,7 +106,7 @@ public class WaitForViewInstallation extends HighPriorityDistributionMessage } /* (non-Javadoc) - * @see com.gemstone.gemfire.distributed.internal.DistributionMessage#process(com.gemstone.gemfire.distributed.internal.DistributionManager) + * @see org.apache.geode.distributed.internal.DistributionMessage#process(org.apache.geode.distributed.internal.DistributionManager) */ @Override protected void process(DistributionManager dm) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/WanLocatorDiscoverer.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/WanLocatorDiscoverer.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/WanLocatorDiscoverer.java index 05e04e0..3b4f692 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/WanLocatorDiscoverer.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/WanLocatorDiscoverer.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; +package org.apache.geode.distributed.internal; -import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener; +import org.apache.geode.cache.client.internal.locator.wan.LocatorMembershipListener; public interface WanLocatorDiscoverer { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DLockDependencyMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DLockDependencyMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DLockDependencyMonitor.java index 02e5b6a..5421dd7 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DLockDependencyMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DLockDependencyMonitor.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.Collections; @@ -22,9 +22,9 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.locks.DLockService; -import com.gemstone.gemfire.distributed.internal.locks.DLockToken; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.distributed.internal.locks.DLockService; +import org.apache.geode.distributed.internal.locks.DLockToken; /** * Report dependencies on dlocks that exist in theis VM.
