Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 20178200B85 for ; Thu, 15 Sep 2016 23:02:29 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1E8A6160ABA; Thu, 15 Sep 2016 21:02:29 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 021F3160AC6 for ; Thu, 15 Sep 2016 23:02:25 +0200 (CEST) Received: (qmail 502 invoked by uid 500); 15 Sep 2016 21:02:25 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 493 invoked by uid 99); 15 Sep 2016 21:02:25 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Sep 2016 21:02:25 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id A03A1C0B4C for ; Thu, 15 Sep 2016 21:02:24 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id fQ1zprB1Lkcg for ; Thu, 15 Sep 2016 21:01:41 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id EEFE360E46 for ; Thu, 15 Sep 2016 21:01:20 +0000 (UTC) Received: (qmail 91131 invoked by uid 99); 15 Sep 2016 21:01:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Sep 2016 21:01:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 57782EEE29; Thu, 15 Sep 2016 21:01:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dschneider@apache.org To: commits@geode.incubator.apache.org Date: Thu, 15 Sep 2016 21:01:42 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [25/76] [abbrv] [partial] incubator-geode git commit: GEODE-37 changed import to org.apache.geode archived-at: Thu, 15 Sep 2016 21:02:29 -0000 http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java index 0f84549..775fa24 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.membership; - -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.InternalGemFireError; -import com.gemstone.gemfire.cache.UnsupportedVersionException; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DurableClientAttributes; -import com.gemstone.gemfire.distributed.Role; -import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.ProfileId; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.internal.*; -import com.gemstone.gemfire.internal.cache.versions.VersionSource; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.net.SocketCreator; +package org.apache.geode.distributed.internal.membership; + +import org.apache.geode.DataSerializer; +import org.apache.geode.InternalGemFireError; +import org.apache.geode.cache.UnsupportedVersionException; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.DurableClientAttributes; +import org.apache.geode.distributed.Role; +import org.apache.geode.distributed.internal.DistributionAdvisor.ProfileId; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.internal.*; +import org.apache.geode.internal.cache.versions.VersionSource; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.net.SocketCreator; import java.io.*; import java.net.Inet4Address; @@ -98,7 +98,7 @@ public class InternalDistributedMember /** * The name of this member's distributed system connection. - * @see com.gemstone.gemfire.distributed.DistributedSystem#getName + * @see org.apache.geode.distributed.DistributedSystem#getName */ private String name = null; @@ -329,7 +329,7 @@ public class InternalDistributedMember public InternalDistributedMember(String host, int p, String n, String u, int vmKind, String[] groups, DurableClientAttributes attr) throws UnknownHostException { MemberAttributes mattr = new MemberAttributes(p, - com.gemstone.gemfire.internal.OSProcess.getId(), + org.apache.geode.internal.OSProcess.getId(), vmKind, -1, n, groups, attr); @@ -432,8 +432,8 @@ public class InternalDistributedMember * [GemStone] Returns the kind of VM that hosts the distribution manager with * this address. * - * @see com.gemstone.gemfire.distributed.internal.DistributionManager#getDMType() - * @see com.gemstone.gemfire.distributed.internal.DistributionManager#NORMAL_DM_TYPE + * @see org.apache.geode.distributed.internal.DistributionManager#getDMType() + * @see org.apache.geode.distributed.internal.DistributionManager#NORMAL_DM_TYPE */ public int getVmKind() { @@ -538,7 +538,7 @@ public class InternalDistributedMember /** * Returns the name of this member's distributed system connection or null * if no name was specified. - * @see com.gemstone.gemfire.distributed.DistributedSystem#getName + * @see org.apache.geode.distributed.DistributedSystem#getName */ public String getName() { String result = this.name; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java index 62ba859..f52e4f7 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalRole.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.membership; +package org.apache.geode.distributed.internal.membership; -import com.gemstone.gemfire.distributed.Role; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.distributed.Role; +import org.apache.geode.distributed.internal.DM; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.internal.i18n.LocalizedStrings; import java.util.*; @@ -35,12 +35,12 @@ import org.apache.commons.lang.StringUtils; * Any serializable object which has instances of InternalRole should flag * those variables as transient. Objects that implement DataSerializable * should convert the roles to String names. For an example, please see - * {@link com.gemstone.gemfire.cache.MembershipAttributes}.

+ * {@link org.apache.geode.cache.MembershipAttributes}.

* *

Serializable classes which hold references to Roles should customize * serialization to transfer string names for Roles. See {@link - * com.gemstone.gemfire.cache.RegionAccessException RegionAccessException} - * and {@link com.gemstone.gemfire.cache.RegionDistributionException + * org.apache.geode.cache.RegionAccessException RegionAccessException} + * and {@link org.apache.geode.cache.RegionDistributionException * RegionDistributionException} for examples on how to do this.

* * @deprecated this feature is scheduled to be removed http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.java index 7f2e92a..cd2dad0 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.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.membership; +package org.apache.geode.distributed.internal.membership; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import com.gemstone.gemfire.distributed.DurableClientAttributes; +import org.apache.geode.distributed.DurableClientAttributes; /** * The attributes of a distributed member. This is largely deprecated as http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberFactory.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberFactory.java index f10731b..e9ed567 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberFactory.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.membership; +package org.apache.geode.distributed.internal.membership; -import com.gemstone.gemfire.distributed.internal.DMStats; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.LocatorStats; -import com.gemstone.gemfire.distributed.internal.membership.gms.GMSMemberFactory; -import com.gemstone.gemfire.distributed.internal.membership.gms.NetLocator; -import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; +import org.apache.geode.distributed.internal.DMStats; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.LocatorStats; +import org.apache.geode.distributed.internal.membership.gms.GMSMemberFactory; +import org.apache.geode.distributed.internal.membership.gms.NetLocator; +import org.apache.geode.internal.admin.remote.RemoteTransportConfig; import java.io.File; import java.net.InetAddress; @@ -30,7 +30,7 @@ import java.net.InetAddress; * Create a new Member based on the given inputs. * TODO: need to implement a real factory implementation based on gemfire.properties * - * @see com.gemstone.gemfire.distributed.internal.membership.NetMember + * @see org.apache.geode.distributed.internal.membership.NetMember */ public class MemberFactory { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberServices.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberServices.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberServices.java index 235373f..2a04dac 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberServices.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberServices.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.membership; +package org.apache.geode.distributed.internal.membership; -import com.gemstone.gemfire.distributed.internal.DMStats; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.LocatorStats; -import com.gemstone.gemfire.distributed.internal.membership.gms.NetLocator; -import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; +import org.apache.geode.distributed.internal.DMStats; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.LocatorStats; +import org.apache.geode.distributed.internal.membership.gms.NetLocator; +import org.apache.geode.internal.admin.remote.RemoteTransportConfig; import java.io.File; import java.net.InetAddress; @@ -28,7 +28,7 @@ import java.net.InetAddress; /** * This is the SPI for a provider of membership services. * - * @see com.gemstone.gemfire.distributed.internal.membership.NetMember + * @see org.apache.geode.distributed.internal.membership.NetMember */ public interface MemberServices { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipManager.java index 95eff07..9df3c33 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipManager.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipManager.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.membership; +package org.apache.geode.distributed.internal.membership; import java.io.NotSerializableException; import java.util.Map; @@ -22,11 +22,11 @@ import java.util.Set; import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.ReadWriteLock; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DMStats; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.internal.logging.InternalLogWriter; +import org.apache.geode.SystemFailure; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.DMStats; +import org.apache.geode.distributed.internal.DistributionMessage; +import org.apache.geode.internal.logging.InternalLogWriter; /** * A MembershipManager is responsible for reporting a MemberView, as well as http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipTestHook.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipTestHook.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipTestHook.java index a6209ee..c23cb2e 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipTestHook.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MembershipTestHook.java @@ -17,7 +17,7 @@ /** * */ -package com.gemstone.gemfire.distributed.internal.membership; +package org.apache.geode.distributed.internal.membership; /** * Test hook for hydra test development http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java index 1bab0d1..f20f637 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.membership; +package org.apache.geode.distributed.internal.membership; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.net.InetAddress; -import com.gemstone.gemfire.internal.Version; +import org.apache.geode.internal.Version; /** * This is the SPI for the basic element of membership provided in the http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetView.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetView.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetView.java index 470d5e0..0ba8fcf 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetView.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetView.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.membership; +package org.apache.geode.distributed.internal.membership; import java.io.DataInput; import java.io.DataOutput; @@ -25,12 +25,12 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.internal.DataSerializableFixedID; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.Version; +import org.apache.geode.DataSerializer; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.internal.DataSerializableFixedID; +import org.apache.geode.internal.InternalDataSerializer; +import org.apache.geode.internal.Version; /** * The NetView class represents a membership view. Note that http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/QuorumChecker.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/QuorumChecker.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/QuorumChecker.java index 41106a3..abe8696 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/QuorumChecker.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/QuorumChecker.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.membership; +package org.apache.geode.distributed.internal.membership; /** * A QuorumChecker is created after a forced-disconnect in order http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java index 969933b..e31d445 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.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.membership.gms; - -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.DurableClientAttributes; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.membership.MemberAttributes; -import com.gemstone.gemfire.distributed.internal.membership.NetMember; -import com.gemstone.gemfire.internal.DataSerializableFixedID; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +package org.apache.geode.distributed.internal.membership.gms; + +import org.apache.geode.DataSerializer; +import org.apache.geode.distributed.DurableClientAttributes; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.membership.MemberAttributes; +import org.apache.geode.distributed.internal.membership.NetMember; +import org.apache.geode.internal.DataSerializableFixedID; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.i18n.LocalizedStrings; import org.jgroups.util.UUID; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberFactory.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberFactory.java index 6aad7e9..08178e9 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberFactory.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberFactory.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.membership.gms; +package org.apache.geode.distributed.internal.membership.gms; -import com.gemstone.gemfire.GemFireConfigException; -import com.gemstone.gemfire.SystemConnectException; -import com.gemstone.gemfire.distributed.internal.DMStats; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionException; -import com.gemstone.gemfire.distributed.internal.LocatorStats; -import com.gemstone.gemfire.distributed.internal.membership.*; -import com.gemstone.gemfire.distributed.internal.membership.gms.locator.GMSLocator; -import com.gemstone.gemfire.internal.net.SocketCreator; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.tcp.ConnectionException; -import com.gemstone.gemfire.security.AuthenticationFailedException; -import com.gemstone.gemfire.security.AuthenticationRequiredException; +import org.apache.geode.GemFireConfigException; +import org.apache.geode.SystemConnectException; +import org.apache.geode.distributed.internal.DMStats; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.DistributionException; +import org.apache.geode.distributed.internal.LocatorStats; +import org.apache.geode.distributed.internal.membership.*; +import org.apache.geode.distributed.internal.membership.gms.locator.GMSLocator; +import org.apache.geode.internal.net.SocketCreator; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.admin.remote.RemoteTransportConfig; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.tcp.ConnectionException; +import org.apache.geode.security.AuthenticationFailedException; +import org.apache.geode.security.AuthenticationRequiredException; import java.io.File; import java.net.InetAddress; @@ -39,7 +39,7 @@ import java.net.UnknownHostException; /** * Create a new Member based on the given inputs. * - * @see com.gemstone.gemfire.distributed.internal.membership.NetMember + * @see org.apache.geode.distributed.internal.membership.NetMember */ public class GMSMemberFactory implements MemberServices { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java index ab1a655..531093d 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSUtil.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.membership.gms; +package org.apache.geode.distributed.internal.membership.gms; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -25,8 +25,8 @@ import java.util.StringTokenizer; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.GemFireConfigException; -import com.gemstone.gemfire.internal.net.SocketCreator; +import org.apache.geode.GemFireConfigException; +import org.apache.geode.internal.net.SocketCreator; public class GMSUtil { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/NetLocator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/NetLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/NetLocator.java index 7e82523..5fecd9a 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/NetLocator.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/NetLocator.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.membership.gms; +package org.apache.geode.distributed.internal.membership.gms; -import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; -import com.gemstone.gemfire.distributed.internal.tcpserver.TcpHandler; +import org.apache.geode.distributed.internal.membership.MembershipManager; +import org.apache.geode.distributed.internal.tcpserver.TcpHandler; public interface NetLocator extends TcpHandler { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java index 884a78b..eec4080 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/ServiceConfig.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.membership.gms; +package org.apache.geode.distributed.internal.membership.gms; -import com.gemstone.gemfire.distributed.Locator; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.InternalLocator; -import com.gemstone.gemfire.internal.net.SocketCreator; -import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; +import org.apache.geode.distributed.Locator; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.InternalLocator; +import org.apache.geode.internal.net.SocketCreator; +import org.apache.geode.internal.admin.remote.RemoteTransportConfig; import java.net.InetAddress; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java index 9ff1636..5764d73 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java @@ -14,30 +14,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.membership.gms; +package org.apache.geode.distributed.internal.membership.gms; -import com.gemstone.gemfire.CancelCriterion; -import com.gemstone.gemfire.ForcedDisconnectException; -import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; -import com.gemstone.gemfire.distributed.internal.DMStats; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.InternalLocator; -import com.gemstone.gemfire.distributed.internal.membership.DistributedMembershipListener; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.distributed.internal.membership.gms.auth.GMSAuthenticator; -import com.gemstone.gemfire.distributed.internal.membership.gms.fd.GMSHealthMonitor; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.*; -import com.gemstone.gemfire.distributed.internal.membership.gms.locator.GMSLocator; -import com.gemstone.gemfire.distributed.internal.membership.gms.membership.GMSJoinLeave; -import com.gemstone.gemfire.distributed.internal.membership.gms.messenger.JGroupsMessenger; -import com.gemstone.gemfire.distributed.internal.membership.gms.mgr.GMSMembershipManager; -import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; -import com.gemstone.gemfire.internal.logging.InternalLogWriter; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.logging.LoggingThreadGroup; -import com.gemstone.gemfire.security.AuthenticationFailedException; +import org.apache.geode.CancelCriterion; +import org.apache.geode.ForcedDisconnectException; +import org.apache.geode.distributed.DistributedSystemDisconnectedException; +import org.apache.geode.distributed.internal.DMStats; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.InternalLocator; +import org.apache.geode.distributed.internal.membership.DistributedMembershipListener; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.MembershipManager; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.distributed.internal.membership.gms.auth.GMSAuthenticator; +import org.apache.geode.distributed.internal.membership.gms.fd.GMSHealthMonitor; +import org.apache.geode.distributed.internal.membership.gms.interfaces.*; +import org.apache.geode.distributed.internal.membership.gms.locator.GMSLocator; +import org.apache.geode.distributed.internal.membership.gms.membership.GMSJoinLeave; +import org.apache.geode.distributed.internal.membership.gms.messenger.JGroupsMessenger; +import org.apache.geode.distributed.internal.membership.gms.mgr.GMSMembershipManager; +import org.apache.geode.internal.admin.remote.RemoteTransportConfig; +import org.apache.geode.internal.logging.InternalLogWriter; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.logging.LoggingThreadGroup; +import org.apache.geode.security.AuthenticationFailedException; import org.apache.logging.log4j.Logger; import java.util.Timer; @@ -137,7 +137,7 @@ public class Services { this.manager.init(this); this.joinLeave.init(this); this.healthMon.init(this); - InternalLocator l = (InternalLocator)com.gemstone.gemfire.distributed.Locator.getLocator(); + InternalLocator l = (InternalLocator)org.apache.geode.distributed.Locator.getLocator(); if (l != null && l.getLocatorHandler() != null) { if (l.getLocatorHandler().setMembershipManager((MembershipManager)this.manager)) { this.locator = (Locator)l.getLocatorHandler(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/SuspectMember.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/SuspectMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/SuspectMember.java index 37180b6..8d5547a 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/SuspectMember.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/SuspectMember.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.membership.gms; +package org.apache.geode.distributed.internal.membership.gms; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; /** represents a suspicion raised about a member */ public class SuspectMember http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java index 9ecd2b7..68ec0c0 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/auth/GMSAuthenticator.java @@ -14,28 +14,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.membership.gms.auth; +package org.apache.geode.distributed.internal.membership.gms.auth; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; -import static com.gemstone.gemfire.internal.i18n.LocalizedStrings.*; +import static org.apache.geode.distributed.ConfigurationProperties.*; +import static org.apache.geode.internal.i18n.LocalizedStrings.*; import java.security.Principal; import java.util.Properties; -import com.gemstone.gemfire.LogWriter; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.distributed.internal.membership.gms.Services; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Authenticator; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.InternalLogWriter; -import com.gemstone.gemfire.internal.security.IntegratedSecurityService; -import com.gemstone.gemfire.internal.security.SecurityService; -import com.gemstone.gemfire.security.AuthInitialize; -import com.gemstone.gemfire.security.AuthenticationFailedException; -import com.gemstone.gemfire.security.AuthenticationRequiredException; -import com.gemstone.gemfire.security.GemFireSecurityException; +import org.apache.geode.LogWriter; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.distributed.internal.membership.gms.Services; +import org.apache.geode.distributed.internal.membership.gms.interfaces.Authenticator; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.InternalLogWriter; +import org.apache.geode.internal.security.IntegratedSecurityService; +import org.apache.geode.internal.security.SecurityService; +import org.apache.geode.security.AuthInitialize; +import org.apache.geode.security.AuthenticationFailedException; +import org.apache.geode.security.AuthenticationRequiredException; +import org.apache.geode.security.GemFireSecurityException; public class GMSAuthenticator implements Authenticator { @@ -141,9 +141,9 @@ public class GMSAuthenticator implements Authenticator { */ Principal invokeAuthenticator(Properties securityProps, DistributedMember member, Properties credentials) throws AuthenticationFailedException { String authMethod = securityProps.getProperty(SECURITY_PEER_AUTHENTICATOR); - com.gemstone.gemfire.security.Authenticator auth = null; + org.apache.geode.security.Authenticator auth = null; try { - auth = SecurityService.getObjectOfTypeFromFactoryMethod(authMethod, com.gemstone.gemfire.security.Authenticator.class); + auth = SecurityService.getObjectOfTypeFromFactoryMethod(authMethod, org.apache.geode.security.Authenticator.class); LogWriter logWriter = this.services.getLogWriter(); LogWriter securityLogWriter = this.services.getSecurityLogWriter(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java index b8cdbe9..5717c30 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.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.membership.gms.fd; +package org.apache.geode.distributed.internal.membership.gms.fd; -import static com.gemstone.gemfire.internal.DataSerializableFixedID.HEARTBEAT_REQUEST; -import static com.gemstone.gemfire.internal.DataSerializableFixedID.HEARTBEAT_RESPONSE; -import static com.gemstone.gemfire.internal.DataSerializableFixedID.SUSPECT_MEMBERS_MESSAGE; +import static org.apache.geode.internal.DataSerializableFixedID.HEARTBEAT_REQUEST; +import static org.apache.geode.internal.DataSerializableFixedID.HEARTBEAT_RESPONSE; +import static org.apache.geode.internal.DataSerializableFixedID.SUSPECT_MEMBERS_MESSAGE; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -45,28 +45,28 @@ import java.util.stream.*; import org.apache.logging.log4j.Logger; import org.jgroups.util.UUID; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.GemFireConfigException; -import com.gemstone.gemfire.SystemConnectException; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DMStats; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.distributed.internal.membership.gms.GMSMember; -import com.gemstone.gemfire.distributed.internal.membership.gms.Services; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.HealthMonitor; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.MessageHandler; -import com.gemstone.gemfire.distributed.internal.membership.gms.messages.HeartbeatMessage; -import com.gemstone.gemfire.distributed.internal.membership.gms.messages.HeartbeatRequestMessage; -import com.gemstone.gemfire.distributed.internal.membership.gms.messages.SuspectMembersMessage; -import com.gemstone.gemfire.distributed.internal.membership.gms.messages.SuspectRequest; -import com.gemstone.gemfire.internal.ConnectionWatcher; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.net.SocketCreatorFactory; -import com.gemstone.gemfire.internal.security.SecurableCommunicationChannel; -import com.gemstone.gemfire.internal.security.SecurableComponent; +import org.apache.geode.CancelException; +import org.apache.geode.GemFireConfigException; +import org.apache.geode.SystemConnectException; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.DMStats; +import org.apache.geode.distributed.internal.DistributionMessage; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.distributed.internal.membership.gms.GMSMember; +import org.apache.geode.distributed.internal.membership.gms.Services; +import org.apache.geode.distributed.internal.membership.gms.interfaces.HealthMonitor; +import org.apache.geode.distributed.internal.membership.gms.interfaces.MessageHandler; +import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatMessage; +import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatRequestMessage; +import org.apache.geode.distributed.internal.membership.gms.messages.SuspectMembersMessage; +import org.apache.geode.distributed.internal.membership.gms.messages.SuspectRequest; +import org.apache.geode.internal.ConnectionWatcher; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.net.SocketCreatorFactory; +import org.apache.geode.internal.security.SecurableCommunicationChannel; +import org.apache.geode.internal.security.SecurableComponent; /** * Failure Detection http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Authenticator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Authenticator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Authenticator.java index 9660267..fe15ace 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Authenticator.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Authenticator.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.membership.gms.interfaces; +package org.apache.geode.distributed.internal.membership.gms.interfaces; import java.util.Properties; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.security.AuthenticationFailedException; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.security.AuthenticationFailedException; public interface Authenticator extends Service { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/HealthMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/HealthMonitor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/HealthMonitor.java index 3541f80..5058aed 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/HealthMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/HealthMonitor.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.membership.gms.interfaces; +package org.apache.geode.distributed.internal.membership.gms.interfaces; import java.net.InetSocketAddress; import java.util.List; import java.util.Map; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.NetMember; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.NetMember; public interface HealthMonitor extends Service { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/JoinLeave.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/JoinLeave.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/JoinLeave.java index 202a125..addfec3 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/JoinLeave.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/JoinLeave.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.membership.gms.interfaces; +package org.apache.geode.distributed.internal.membership.gms.interfaces; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.NetMember; -import com.gemstone.gemfire.distributed.internal.membership.NetView; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.NetMember; +import org.apache.geode.distributed.internal.membership.NetView; public interface JoinLeave extends Service { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Locator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Locator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Locator.java index c36f6ea..68390ee 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Locator.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Locator.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.membership.gms.interfaces; +package org.apache.geode.distributed.internal.membership.gms.interfaces; -import com.gemstone.gemfire.distributed.internal.membership.NetView; +import org.apache.geode.distributed.internal.membership.NetView; /** * The Locator interface allows member services to interact with the http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Manager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Manager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Manager.java index 8353af6..233aa3a 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Manager.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Manager.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.membership.gms.interfaces; +package org.apache.geode.distributed.internal.membership.gms.interfaces; import java.io.NotSerializableException; import java.util.Collection; import java.util.Set; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.NetMember; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.distributed.internal.membership.gms.SuspectMember; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.DistributionMessage; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.NetMember; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.distributed.internal.membership.gms.SuspectMember; /** * Manager presents the GMS services to the outside world and http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/MessageHandler.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/MessageHandler.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/MessageHandler.java index 8e2073b..fcd944c 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/MessageHandler.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/MessageHandler.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.membership.gms.interfaces; +package org.apache.geode.distributed.internal.membership.gms.interfaces; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; +import org.apache.geode.distributed.internal.DistributionMessage; /** * MessageHandler processes a message received by Messenger. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Messenger.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Messenger.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Messenger.java index 51c74da..470fd1f 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Messenger.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Messenger.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.membership.gms.interfaces; +package org.apache.geode.distributed.internal.membership.gms.interfaces; import java.util.Map; import java.util.Set; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.distributed.internal.membership.QuorumChecker; +import org.apache.geode.distributed.internal.DistributionMessage; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.distributed.internal.membership.QuorumChecker; public interface Messenger extends Service { /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Service.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Service.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Service.java index 9eac344..4fc68b9 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Service.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/interfaces/Service.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.membership.gms.interfaces; +package org.apache.geode.distributed.internal.membership.gms.interfaces; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.distributed.internal.membership.gms.Services; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.distributed.internal.membership.gms.Services; /** * Services in GMS all implement this interface http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest.java index d9d5dc9..3e346a5 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest.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.membership.gms.locator; +package org.apache.geode.distributed.internal.membership.gms.locator; import java.io.DataInput; import java.io.DataOutput; @@ -22,13 +22,13 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.DataSerializableFixedID; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.Version; +import org.apache.geode.DataSerializer; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.HighPriorityDistributionMessage; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.DataSerializableFixedID; +import org.apache.geode.internal.InternalDataSerializer; +import org.apache.geode.internal.Version; public class FindCoordinatorRequest extends HighPriorityDistributionMessage implements PeerLocatorRequest { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java index 66e5982..b81cf4a 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse.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.membership.gms.locator; +package org.apache.geode.distributed.internal.membership.gms.locator; import java.io.DataInput; import java.io.DataOutput; @@ -23,14 +23,14 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.internal.DataSerializableFixedID; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.Version; +import org.apache.geode.DataSerializer; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.HighPriorityDistributionMessage; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.internal.DataSerializableFixedID; +import org.apache.geode.internal.InternalDataSerializer; +import org.apache.geode.internal.Version; public class FindCoordinatorResponse extends HighPriorityDistributionMessage implements DataSerializableFixedID { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java index 5f88fd9..0ab30c9 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.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.membership.gms.locator; +package org.apache.geode.distributed.internal.membership.gms.locator; import java.io.File; import java.io.FileInputStream; @@ -34,33 +34,33 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import com.gemstone.gemfire.InternalGemFireException; +import org.apache.geode.InternalGemFireException; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.LocatorStats; -import com.gemstone.gemfire.distributed.internal.SharedConfiguration; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.MembershipManager; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember.InternalDistributedMemberWrapper; -import com.gemstone.gemfire.distributed.internal.membership.gms.GMSUtil; -import com.gemstone.gemfire.distributed.internal.membership.gms.NetLocator; -import com.gemstone.gemfire.distributed.internal.membership.gms.Services; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Locator; -import com.gemstone.gemfire.distributed.internal.membership.gms.mgr.GMSMembershipManager; -import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient; -import com.gemstone.gemfire.distributed.internal.tcpserver.TcpServer; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.VersionedObjectInput; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.net.*; +import org.apache.geode.DataSerializer; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.distributed.internal.LocatorStats; +import org.apache.geode.distributed.internal.SharedConfiguration; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.MembershipManager; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember.InternalDistributedMemberWrapper; +import org.apache.geode.distributed.internal.membership.gms.GMSUtil; +import org.apache.geode.distributed.internal.membership.gms.NetLocator; +import org.apache.geode.distributed.internal.membership.gms.Services; +import org.apache.geode.distributed.internal.membership.gms.interfaces.Locator; +import org.apache.geode.distributed.internal.membership.gms.mgr.GMSMembershipManager; +import org.apache.geode.distributed.internal.tcpserver.TcpClient; +import org.apache.geode.distributed.internal.tcpserver.TcpServer; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.VersionedObjectInput; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.net.*; -import static com.gemstone.gemfire.internal.i18n.LocalizedStrings.LOCATOR_UNABLE_TO_RECOVER_VIEW; +import static org.apache.geode.internal.i18n.LocalizedStrings.LOCATOR_UNABLE_TO_RECOVER_VIEW; public class GMSLocator implements Locator, NetLocator { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewRequest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewRequest.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewRequest.java index 9d582af..56cf9c9 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewRequest.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewRequest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.membership.gms.locator; +package org.apache.geode.distributed.internal.membership.gms.locator; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import com.gemstone.gemfire.internal.DataSerializableFixedID; -import com.gemstone.gemfire.internal.Version; +import org.apache.geode.internal.DataSerializableFixedID; +import org.apache.geode.internal.Version; public class GetViewRequest implements DataSerializableFixedID, PeerLocatorRequest { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewResponse.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewResponse.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewResponse.java index 048e7c9..88da07f 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewResponse.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GetViewResponse.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.membership.gms.locator; +package org.apache.geode.distributed.internal.membership.gms.locator; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.internal.DataSerializableFixedID; -import com.gemstone.gemfire.internal.Version; +import org.apache.geode.DataSerializer; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.internal.DataSerializableFixedID; +import org.apache.geode.internal.Version; public class GetViewResponse implements DataSerializableFixedID { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/PeerLocatorRequest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/PeerLocatorRequest.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/PeerLocatorRequest.java index 7597c94..236dd23 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/PeerLocatorRequest.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/PeerLocatorRequest.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.membership.gms.locator; +package org.apache.geode.distributed.internal.membership.gms.locator; /** * PeerLocatorRequest is a marker for messages that are intended to be handled http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java index 118c62c..d15e8bf 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java @@ -14,32 +14,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.membership.gms.membership; - -import com.gemstone.gemfire.GemFireConfigException; -import com.gemstone.gemfire.SystemConnectException; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; -import com.gemstone.gemfire.distributed.Locator; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.NetMember; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.distributed.internal.membership.gms.GMSMember; -import com.gemstone.gemfire.distributed.internal.membership.gms.GMSUtil; -import com.gemstone.gemfire.distributed.internal.membership.gms.Services; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.JoinLeave; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.MessageHandler; -import com.gemstone.gemfire.distributed.internal.membership.gms.locator.FindCoordinatorRequest; -import com.gemstone.gemfire.distributed.internal.membership.gms.locator.FindCoordinatorResponse; -import com.gemstone.gemfire.distributed.internal.membership.gms.messages.*; -import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.net.*; -import com.gemstone.gemfire.security.AuthenticationFailedException; +package org.apache.geode.distributed.internal.membership.gms.membership; + +import org.apache.geode.GemFireConfigException; +import org.apache.geode.SystemConnectException; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.DistributedSystemDisconnectedException; +import org.apache.geode.distributed.Locator; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.DistributionMessage; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.NetMember; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.distributed.internal.membership.gms.GMSMember; +import org.apache.geode.distributed.internal.membership.gms.GMSUtil; +import org.apache.geode.distributed.internal.membership.gms.Services; +import org.apache.geode.distributed.internal.membership.gms.interfaces.JoinLeave; +import org.apache.geode.distributed.internal.membership.gms.interfaces.MessageHandler; +import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorRequest; +import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorResponse; +import org.apache.geode.distributed.internal.membership.gms.messages.*; +import org.apache.geode.distributed.internal.tcpserver.TcpClient; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.net.*; +import org.apache.geode.security.AuthenticationFailedException; import org.apache.logging.log4j.Logger; @@ -49,10 +49,10 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.START_LOCATOR; -import static com.gemstone.gemfire.distributed.internal.membership.gms.ServiceConfig.MEMBER_REQUEST_COLLECTION_INTERVAL; -import static com.gemstone.gemfire.internal.DataSerializableFixedID.*; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR; +import static org.apache.geode.distributed.internal.membership.gms.ServiceConfig.MEMBER_REQUEST_COLLECTION_INTERVAL; +import static org.apache.geode.internal.DataSerializableFixedID.*; /** * GMSJoinLeave handles membership communication with other processes in the http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HasMemberID.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HasMemberID.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HasMemberID.java index 1962edf..7080f91 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HasMemberID.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HasMemberID.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.membership.gms.messages; +package org.apache.geode.distributed.internal.membership.gms.messages; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; public interface HasMemberID { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatMessage.java index 6662d2c..ca38173 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatMessage.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.membership.gms.messages; +package org.apache.geode.distributed.internal.membership.gms.messages; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage; -import com.gemstone.gemfire.internal.Version; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.HighPriorityDistributionMessage; +import org.apache.geode.internal.Version; public class HeartbeatMessage extends HighPriorityDistributionMessage { /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatRequestMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatRequestMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatRequestMessage.java index e0f4515..9bbe758 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatRequestMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatRequestMessage.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.membership.gms.messages; +package org.apache.geode.distributed.internal.membership.gms.messages; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.Version; +import org.apache.geode.DataSerializer; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.HighPriorityDistributionMessage; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.Version; public class HeartbeatRequestMessage extends HighPriorityDistributionMessage{ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage.java index 224fef1..2f0fced 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage.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.membership.gms.messages; +package org.apache.geode.distributed.internal.membership.gms.messages; import java.io.DataInput; import java.io.DataOutput; @@ -23,11 +23,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.internal.InternalDataSerializer; +import org.apache.geode.DataSerializer; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.HighPriorityDistributionMessage; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.internal.InternalDataSerializer; public class InstallViewMessage extends HighPriorityDistributionMessage { enum messageType { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinRequestMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinRequestMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinRequestMessage.java index b282daa..e501269 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinRequestMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinRequestMessage.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.membership.gms.messages; +package org.apache.geode.distributed.internal.membership.gms.messages; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.Version; +import org.apache.geode.DataSerializer; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.HighPriorityDistributionMessage; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.Version; public class JoinRequestMessage extends HighPriorityDistributionMessage { private InternalDistributedMember memberID; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinResponseMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinResponseMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinResponseMessage.java index ff20a4e..bdf4c12 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinResponseMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/JoinResponseMessage.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.membership.gms.messages; +package org.apache.geode.distributed.internal.membership.gms.messages; import java.io.DataInput; import java.io.DataOutput; @@ -24,13 +24,13 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.Version; +import org.apache.geode.DataSerializer; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.HighPriorityDistributionMessage; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.internal.InternalDataSerializer; +import org.apache.geode.internal.Version; public class JoinResponseMessage extends HighPriorityDistributionMessage { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/LeaveRequestMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/LeaveRequestMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/LeaveRequestMessage.java index dd8475d..1fd0679 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/LeaveRequestMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/LeaveRequestMessage.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.membership.gms.messages; +package org.apache.geode.distributed.internal.membership.gms.messages; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.util.Collection; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.Version; +import org.apache.geode.DataSerializer; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.HighPriorityDistributionMessage; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.Version; public class LeaveRequestMessage extends HighPriorityDistributionMessage implements HasMemberID { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/NetworkPartitionMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/NetworkPartitionMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/NetworkPartitionMessage.java index a4a811f..2dea756 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/NetworkPartitionMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/NetworkPartitionMessage.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.membership.gms.messages; +package org.apache.geode.distributed.internal.membership.gms.messages; import java.util.Collection; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.HighPriorityDistributionMessage; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.HighPriorityDistributionMessage; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; public class NetworkPartitionMessage extends HighPriorityDistributionMessage {