Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5823A1843A for ; Mon, 1 Feb 2016 20:55:33 +0000 (UTC) Received: (qmail 97309 invoked by uid 500); 1 Feb 2016 20:55:33 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 97273 invoked by uid 500); 1 Feb 2016 20:55:33 -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 97170 invoked by uid 99); 1 Feb 2016 20:55:33 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Feb 2016 20:55:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id DA91DC0DE3 for ; Mon, 1 Feb 2016 20:55:32 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.236 X-Spam-Level: * X-Spam-Status: No, score=1.236 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.545, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 0dthWIhK6xpE for ; Mon, 1 Feb 2016 20:55:22 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id C54C323402 for ; Mon, 1 Feb 2016 20:55:18 +0000 (UTC) Received: (qmail 94464 invoked by uid 99); 1 Feb 2016 20:55:18 -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; Mon, 01 Feb 2016 20:55:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 86BFDE031B; Mon, 1 Feb 2016 20:55:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Mon, 01 Feb 2016 20:55:37 -0000 Message-Id: In-Reply-To: <7afb608c78004321a7e3805fbaf2c62d@git.apache.org> References: <7afb608c78004321a7e3805fbaf2c62d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [20/50] [abbrv] incubator-geode git commit: removing two unused classes removing two unused classes Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4a6b0dd5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4a6b0dd5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4a6b0dd5 Branch: refs/heads/feature/GEODE-773-2 Commit: 4a6b0dd58fe0819474f7778aec7d7e9c9235312d Parents: 46eaaa9 Author: Bruce Schuchardt Authored: Thu Jan 28 14:01:45 2016 -0800 Committer: Bruce Schuchardt Committed: Thu Jan 28 14:06:35 2016 -0800 ---------------------------------------------------------------------- .../distributed/internal/DistributedState.java | 143 ------------------- .../internal/ForceDisconnectOperation.java | 42 ------ 2 files changed, 185 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4a6b0dd5/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributedState.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributedState.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributedState.java deleted file mode 100644 index 484511c..0000000 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributedState.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.distributed.internal; - -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.internal.HeapDataOutputStream; -import com.gemstone.gemfire.internal.Version; -//import com.gemstone.gemfire.InternalGemFireException; -import java.io.*; - -/** - * Contains state that is distributed among distribution managers - * using the JGroups {@link - * com.gemstone.org.jgroups.Channel#getState "state"} mechanism. - * It contains information that distribution managers need when - * starting up. - * - * @author David Whitlock - * - * - * @since 2.1 - */ -class DistributedState implements DataSerializable { - private static final long serialVersionUID = -4776743091985815549L; - - /** The version of GemFire being used */ - private String version; - - /** The current "cache time" */ - private long cacheTime; - - ///////////////////// Static Methods ///////////////////// - - /** - * Returns a DistributedState created from the given - * byte array. - * - * @throws IOException - * Something went wrong while deserializing - * bytes - */ - public static DistributedState fromBytes(byte[] bytes) - throws IOException { - - DistributedState state = new DistributedState(); - - ByteArrayInputStream bais = new ByteArrayInputStream(bytes); - DataInputStream dis = new DataInputStream(bais); - - state.fromData(dis); - return state; - } - - /** - * Returns a byte representation of the given - * DistributedState. - * - * @throws IOException - * Something went wrong while serializing state - */ - public static byte[] toBytes(DistributedState state) - throws IOException { - - HeapDataOutputStream hdos = new HeapDataOutputStream(256, Version.CURRENT); - state.toData(hdos); - return hdos.toByteArray(); - } - - ////////////////////// Constructors ////////////////////// - - /** - * Creates a new DistributedState. This method is - * invoked when a member (usually the "coordinator") of the - * JGroups group receives a {@link - * com.gemstone.org.jgroups.GetStateEvent}. - */ - public DistributedState() { - - } - - ///////////////////// Instance Methods ///////////////////// - - /** - * Sets the version of GemFire being used - */ - public void setGemFireVersion(String version) { - this.version = version; - } - - /** - * Returns the version of GemFire being used (by the sender of this - * state). - */ - public String getGemFireVersion() { - return this.version; - } - - /** - * Sets the current "cache time" - */ - public void setCacheTime(long cacheTime) { - this.cacheTime = cacheTime; - } - - /** - * Returns the "cache time" of the sender of this state - */ - public long getCacheTime() { - return this.cacheTime; - } - - /** - * Serializes this DistributedState as data - */ - public void toData(DataOutput out) throws IOException { - DataSerializer.writeString(this.version, out); - out.writeLong(this.cacheTime); - } - - /** - * Popuplates the DistributedState from the given - * data. - */ - public void fromData(DataInput in) throws IOException { - this.version = DataSerializer.readString(in); - this.cacheTime = in.readLong(); - } -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4a6b0dd5/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ForceDisconnectOperation.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ForceDisconnectOperation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ForceDisconnectOperation.java deleted file mode 100644 index e7b3704..0000000 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ForceDisconnectOperation.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.gemstone.gemfire.distributed.internal; - -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; - -/** - * Used to force a current member of the distributed system to disconnect. - * @deprecated starting with Ganges, use MembeshipManager.requestMemberRemoval instead - * @author Darrel - * @since 4.2.1 - */ -@Deprecated -public class ForceDisconnectOperation { -// protected DM dm; -// protected ReplyProcessor21 processor; -// protected ForceDisconnectMessage msg; - - public ForceDisconnectOperation(DM dm, InternalDistributedMember destination) { - throw new UnsupportedOperationException("ForceDisconnectOperation is no longer supported - use MembershipManager.requestMemberRemoval instead"); -// this.dm = dm; -// this.processor = new ReplyProcessor21(dm, destination); -// this.msg = new ForceDisconnectMessage(); -// msg.setRecipient(destination); -// msg.setProcessorId(this.processor.getProcessorId()); - } - -}