http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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 0e7430c..b8795d5 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.SocketCreator; +import org.apache.geode.DataSerializable; +import org.apache.geode.DataSerializer; +import org.apache.geode.internal.SocketCreator; /** * Represents the location of a bridge server. This class is http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/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 f5b774f..feef18a 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.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.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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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 7b6d853..2b03b5e 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,16 +14,16 @@ * 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.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 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.commons.lang.StringUtils; import org.apache.logging.log4j.Logger; @@ -223,7 +223,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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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/939fcf2f/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. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java index 23513d6..2c70418 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.io.BufferedInputStream; import java.io.File; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/Dependency.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/Dependency.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/Dependency.java index 362300f..c470a97 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/Dependency.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/Dependency.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java index 0c67bb8..a6c8dd7 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyGraph.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.io.Serializable; import java.util.Collection; @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.gemstone.gemfire.distributed.internal.deadlock.MessageDependencyMonitor.MessageKey; -import com.gemstone.gemfire.internal.util.PluckStacks; +import org.apache.geode.distributed.internal.deadlock.MessageDependencyMonitor.MessageKey; +import org.apache.geode.internal.util.PluckStacks; /** * This class holds a graph of dependencies between objects http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java index 6a40596..ee72bd3 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.io.Serializable; import java.util.Set; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java index cbd3a8c..95c5eca 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DependencyMonitorManager.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.io.Serializable; import java.util.HashSet; import java.util.Map; import java.util.Set; -import com.gemstone.gemfire.internal.CopyOnWriteHashSet; +import org.apache.geode.internal.CopyOnWriteHashSet; /** * A singleton which keeps track of all of the dependency monitors registered in http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector.java index a972ed6..dfbe0dc 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.io.Serializable; import java.util.HashSet; @@ -22,17 +22,17 @@ import java.util.LinkedList; import java.util.Set; import java.util.concurrent.TimeUnit; -import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.Function; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.FunctionException; -import com.gemstone.gemfire.cache.execute.FunctionService; -import com.gemstone.gemfire.cache.execute.ResultCollector; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.cache.execute.AbstractExecution; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.FunctionContext; +import org.apache.geode.cache.execute.FunctionException; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.cache.execute.AbstractExecution; /** * This class uses gemfire function execution to get the dependencies between http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalLockInfo.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalLockInfo.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalLockInfo.java index 67c02f9..fb5c4ea 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalLockInfo.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalLockInfo.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.io.Serializable; import java.lang.management.LockInfo; import java.lang.management.MonitorInfo; -import com.gemstone.gemfire.internal.concurrent.LI; +import org.apache.geode.internal.concurrent.LI; /** * This class is serializable version of the java 1.6 lock info http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalThread.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalThread.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalThread.java index 6280346..32eb6bc 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalThread.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/LocalThread.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.io.Serializable; import java.lang.management.LockInfo; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor.java index fe590aa..c041dc6 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.io.Serializable; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.MessageWithReply; -import com.gemstone.gemfire.distributed.internal.ReplyProcessor21; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.DistributionMessage; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.distributed.internal.MessageWithReply; +import org.apache.geode.distributed.internal.ReplyProcessor21; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; /** * http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/ThreadReference.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/ThreadReference.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/ThreadReference.java index 815834d..8c201d0 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/ThreadReference.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/ThreadReference.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocal.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocal.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocal.java index 9d99aa8..1a69aec 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocal.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/UnsafeThreadLocal.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.deadlock; +package org.apache.geode.distributed.internal.deadlock; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java index 9f18e62..f6582ba 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java @@ -15,26 +15,26 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.direct; - -import com.gemstone.gemfire.*; -import com.gemstone.gemfire.cache.TimeoutException; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; -import com.gemstone.gemfire.distributed.internal.*; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; -import com.gemstone.gemfire.i18n.StringId; -import com.gemstone.gemfire.internal.SocketCreator; -import com.gemstone.gemfire.internal.cache.DirectReplyMessage; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.log4j.AlertAppender; -import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; -import com.gemstone.gemfire.internal.logging.log4j.LogMarker; -import com.gemstone.gemfire.internal.tcp.*; -import com.gemstone.gemfire.internal.util.Breadcrumbs; -import com.gemstone.gemfire.internal.util.concurrent.ReentrantSemaphore; +package org.apache.geode.distributed.internal.direct; + +import org.apache.geode.*; +import org.apache.geode.cache.TimeoutException; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.DistributedSystemDisconnectedException; +import org.apache.geode.distributed.internal.*; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.MembershipManager; +import org.apache.geode.i18n.StringId; +import org.apache.geode.internal.SocketCreator; +import org.apache.geode.internal.cache.DirectReplyMessage; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.logging.log4j.AlertAppender; +import org.apache.geode.internal.logging.log4j.LocalizedMessage; +import org.apache.geode.internal.logging.log4j.LogMarker; +import org.apache.geode.internal.tcp.*; +import org.apache.geode.internal.util.Breadcrumbs; +import org.apache.geode.internal.util.concurrent.ReentrantSemaphore; import org.apache.logging.log4j.Logger; import java.io.IOException; @@ -47,7 +47,7 @@ import java.util.concurrent.Semaphore; /** * DirectChannel is used to interact directly with other Direct servers to * distribute GemFire messages to other nodes. It is held by a - * com.gemstone.gemfire.internal.cache.distribution.DistributionChannel, + * org.apache.geode.internal.cache.distribution.DistributionChannel, * which is used by the DistributionManager to send and receive asynchronous * messages. */ @@ -176,7 +176,7 @@ public class DirectChannel { } private void acquireGroupSendPermission(boolean ordered) { if (this.disconnected) { - throw new com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException(LocalizedStrings.DirectChannel_DIRECT_CHANNEL_HAS_BEEN_STOPPED.toLocalizedString()); + throw new org.apache.geode.distributed.DistributedSystemDisconnectedException(LocalizedStrings.DirectChannel_DIRECT_CHANNEL_HAS_BEEN_STOPPED.toLocalizedString()); } // @todo darrel: add some stats final Semaphore s = getGroupSem(ordered); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannelListener.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannelListener.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannelListener.java index a97676d..df414db 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannelListener.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannelListener.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.direct; +package org.apache.geode.distributed.internal.direct; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.DistributionMessage; public interface DirectChannelListener { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/ShunnedMemberException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/ShunnedMemberException.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/ShunnedMemberException.java index 59db762..c439d4a 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/ShunnedMemberException.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/ShunnedMemberException.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.direct; +package org.apache.geode.distributed.internal.direct; -import com.gemstone.gemfire.GemFireCheckedException; +import org.apache.geode.GemFireCheckedException; /** * Exception thrown when a member is no longer in the distributed system http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/distribution-overview.html ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/distribution-overview.html b/geode-core/src/main/java/org/apache/geode/distributed/internal/distribution-overview.html index 9e07ead..d151c1c 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/distribution-overview.html +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/distribution-overview.html @@ -21,10 +21,10 @@ limitations under the License. Distributed GemFire moves information between physical machines in a number of different ways. The JCache implementation uses {@link -com.gemstone.gemfire.distributed.internal.DistributionMessage}s +org.apache.geode.distributed.internal.DistributionMessage}s to send information back and forth between VMs. The distributed collections use the remote method invocation built on top of a {@link -com.gemstone.gemfire.tcp.TCPConuit} to access elements in remote +org.apache.geode.tcp.TCPConuit} to access elements in remote collections. GemFire distirbution uses underlying technologies such as JavaGroups, and sockets to implement data transfer. @@ -35,7 +35,7 @@ exposed to concepts such as the "distribution manager" and the fact that multicast networking or "locators" are used to discover the other members of the distributed group. The user-level configuration is grouped together in the {@link -com.gemstone.gemfire.distributed.DistributedSystem} class which +org.apache.geode.distributed.DistributedSystem} class which provides a "connection" or entry point to the distributed system. </BODY> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/Collaboration.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/Collaboration.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/Collaboration.java index 061154a..ef33f2a 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/Collaboration.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/Collaboration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.locks; +package org.apache.geode.distributed.internal.locks; import java.util.ArrayList; import java.util.HashMap; @@ -25,10 +25,10 @@ import java.util.concurrent.TimeUnit; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LogService; +import org.apache.geode.CancelCriterion; +import org.apache.geode.internal.Assert; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.LogService; /** * Synchronization structure which allows multiple threads to lock the http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatch.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatch.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatch.java index 832f949..6690893 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatch.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatch.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.locks; +package org.apache.geode.distributed.internal.locks; import java.util.*; -import com.gemstone.gemfire.distributed.internal.membership.*; +import org.apache.geode.distributed.internal.membership.*; /** * Collection of distributed locks to be processed as a batch. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatchId.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatchId.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatchId.java index e3a7892..94f2cf3 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatchId.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockBatchId.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.locks; +package org.apache.geode.distributed.internal.locks; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.distributed.internal.locks.LockGrantorId; +import org.apache.geode.DataSerializable; +import org.apache.geode.distributed.internal.locks.LockGrantorId; /** * Identifies a {@link DLockBatch}. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java index 3fcc720..5ef7647 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java @@ -15,28 +15,28 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.locks; - -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.cache.CommitConflictException; -import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; -import com.gemstone.gemfire.distributed.LockServiceDestroyedException; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.MembershipListener; -import com.gemstone.gemfire.distributed.internal.locks.DLockQueryProcessor.DLockQueryMessage; -import com.gemstone.gemfire.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.cache.IdentityArrayList; -import com.gemstone.gemfire.internal.cache.TXReservationMgr; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; -import com.gemstone.gemfire.internal.logging.log4j.LogMarker; -import com.gemstone.gemfire.internal.util.concurrent.StoppableCountDownLatch; -import com.gemstone.gemfire.internal.util.concurrent.StoppableReentrantReadWriteLock; +package org.apache.geode.distributed.internal.locks; + +import org.apache.geode.CancelCriterion; +import org.apache.geode.CancelException; +import org.apache.geode.cache.CommitConflictException; +import org.apache.geode.distributed.DistributedSystemDisconnectedException; +import org.apache.geode.distributed.LockServiceDestroyedException; +import org.apache.geode.distributed.internal.DM; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.MembershipListener; +import org.apache.geode.distributed.internal.locks.DLockQueryProcessor.DLockQueryMessage; +import org.apache.geode.distributed.internal.locks.DLockRequestProcessor.DLockRequestMessage; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.Assert; +import org.apache.geode.internal.cache.IdentityArrayList; +import org.apache.geode.internal.cache.TXReservationMgr; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.logging.log4j.LocalizedMessage; +import org.apache.geode.internal.logging.log4j.LogMarker; +import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch; +import org.apache.geode.internal.util.concurrent.StoppableReentrantReadWriteLock; import org.apache.logging.log4j.Logger; import java.util.*; @@ -585,12 +585,12 @@ public class DLockGrantor { * <p> * Acquires acquireDestroyReadLock. Synchronizes on batchLocks. * <p> - * see com.gemstone.gemfire.internal.cache.TXCommitMessage#updateLockMembers() + * see org.apache.geode.internal.cache.TXCommitMessage#updateLockMembers() * * @param batchId the identifier for the batch to retrieve * @return the transaction lock batch identified by the given batchId - * @see com.gemstone.gemfire.internal.cache.locks.TXLockUpdateParticipantsMessage - * @see com.gemstone.gemfire.internal.cache.locks.TXLockBatch#getBatchId() + * @see org.apache.geode.internal.cache.locks.TXLockUpdateParticipantsMessage + * @see org.apache.geode.internal.cache.locks.TXLockBatch#getBatchId() */ public DLockBatch getLockBatch(Object batchId) throws InterruptedException { DLockBatch ret = null; @@ -624,12 +624,12 @@ public class DLockGrantor { * <p> * Acquires acquireDestroyReadLock. Synchronizes on batchLocks. * <p> - * see com.gemstone.gemfire.internal.cache.locks.TXCommitMessage#updateLockMembers() + * see org.apache.geode.internal.cache.locks.TXCommitMessage#updateLockMembers() * * @param batchId the identify of the transaction lock batch * @param newBatch the new lock batch to be used - * @see com.gemstone.gemfire.internal.cache.locks.TXLockUpdateParticipantsMessage - * @see com.gemstone.gemfire.internal.cache.locks.TXLockBatch#getBatchId() + * @see org.apache.geode.internal.cache.locks.TXLockUpdateParticipantsMessage + * @see org.apache.geode.internal.cache.locks.TXLockBatch#getBatchId() */ public void updateLockBatch(Object batchId, DLockBatch newBatch) throws InterruptedException { final boolean isDebugEnabled_DLS = logger.isTraceEnabled(LogMarker.DLS); @@ -1115,7 +1115,7 @@ public class DLockGrantor { throws InterruptedException { // bug 32657 has another cause in this method... interrupted thread from // connection/channel layer caused acquireDestroyReadLock to fail... - // fixed by Darrel in com.gemstone.gemfire.internal.tcp.Connection + // fixed by Darrel in org.apache.geode.internal.tcp.Connection final boolean isDebugEnabled_DLS = logger.isTraceEnabled(LogMarker.DLS); if (acquireDestroyReadLock(0)) { try { @@ -3112,7 +3112,7 @@ public class DLockGrantor { * Returns true if this lock represents suspend locking. * * @return true if this lock represents suspend locking - * @see com.gemstone.gemfire.distributed.DistributedLockService#suspendLocking(long) + * @see org.apache.geode.distributed.DistributedLockService#suspendLocking(long) */ boolean isSuspendLockingToken() { return DLockService.SUSPEND_LOCKING_TOKEN.equals(this.lockName); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java index 5909e24..8b38665 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.locks; +package org.apache.geode.distributed.internal.locks; -import com.gemstone.gemfire.distributed.internal.membership.*; +import org.apache.geode.distributed.internal.membership.*; /** * Provides hook for handling departure of a lease holder (lessor). http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/939fcf2f/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java index 7ac74b4..760e15e 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockQueryProcessor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.locks; +package org.apache.geode.distributed.internal.locks; import java.io.DataInput; import java.io.DataOutput; @@ -23,22 +23,22 @@ import java.io.IOException; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.LockServiceDestroyedException; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.distributed.internal.MessageWithReply; -import com.gemstone.gemfire.distributed.internal.PooledDistributionMessage; -import com.gemstone.gemfire.distributed.internal.ReplyException; -import com.gemstone.gemfire.distributed.internal.ReplyMessage; -import com.gemstone.gemfire.distributed.internal.ReplyProcessor21; -import com.gemstone.gemfire.distributed.internal.locks.DLockGrantor.DLockGrantToken; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.log4j.LogMarker; +import org.apache.geode.DataSerializer; +import org.apache.geode.SystemFailure; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.LockServiceDestroyedException; +import org.apache.geode.distributed.internal.DM; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.DistributionMessage; +import org.apache.geode.distributed.internal.MessageWithReply; +import org.apache.geode.distributed.internal.PooledDistributionMessage; +import org.apache.geode.distributed.internal.ReplyException; +import org.apache.geode.distributed.internal.ReplyMessage; +import org.apache.geode.distributed.internal.ReplyProcessor21; +import org.apache.geode.distributed.internal.locks.DLockGrantor.DLockGrantToken; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.logging.log4j.LogMarker; /** * Queries the grantor for current leasing information of a lock.
