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/RemoveMemberMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/RemoveMemberMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/RemoveMemberMessage.java index e7d82b5..3993f31 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/RemoveMemberMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/RemoveMemberMessage.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; @@ -22,11 +22,11 @@ import java.io.IOException; import java.util.ArrayList; 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.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 RemoveMemberMessage 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/SuspectMembersMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/SuspectMembersMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/SuspectMembersMessage.java index 0b2f6ba..05ebc0c 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/SuspectMembersMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/SuspectMembersMessage.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; @@ -22,11 +22,11 @@ import java.io.IOException; import java.util.ArrayList; 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.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 SuspectMembersMessage extends HighPriorityDistributionMessage { final List<SuspectRequest> suspectRequests; 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/SuspectRequest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/SuspectRequest.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/SuspectRequest.java index 5c26fa8..e50e40c 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/SuspectRequest.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/SuspectRequest.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 class SuspectRequest { final InternalDistributedMember 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/messages/ViewAckMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/ViewAckMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/ViewAckMessage.java index 7ff64ba..464127b 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/ViewAckMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/ViewAckMessage.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.distributed.internal.membership.NetView; +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; public class ViewAckMessage 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/messenger/AddressManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/AddressManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/AddressManager.java index 06cd370..4010c00 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/AddressManager.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/AddressManager.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.messenger; +package org.apache.geode.distributed.internal.membership.gms.messenger; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -29,7 +29,7 @@ import org.jgroups.stack.IpAddress; import org.jgroups.stack.Protocol; import org.jgroups.util.Responses; -import com.gemstone.gemfire.distributed.internal.membership.gms.Services; +import org.apache.geode.distributed.internal.membership.gms.Services; /** * JGroups will not send messages that have IpAddress destination addresses. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.java index 6c41465..e442898 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSEncrypt.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.messenger; +package org.apache.geode.distributed.internal.membership.gms.messenger; import java.math.BigInteger; import java.security.*; @@ -32,11 +32,11 @@ import javax.crypto.spec.DHParameterSpec; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember.InternalDistributedMemberWrapper; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.distributed.internal.membership.gms.Services; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember.InternalDistributedMemberWrapper; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.distributed.internal.membership.gms.Services; +import org.apache.geode.distributed.internal.DistributionConfig; public class GMSEncrypt implements Cloneable { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSPingPonger.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSPingPonger.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSPingPonger.java index e2951ee..31379ad 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSPingPonger.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSPingPonger.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.messenger; +package org.apache.geode.distributed.internal.membership.gms.messenger; import org.jgroups.Address; import org.jgroups.JChannel; import org.jgroups.Message; -import com.gemstone.gemfire.internal.Version; +import org.apache.geode.internal.Version; public class GMSPingPonger { private byte[] pingInBytes = new byte[] { 'p', 'i', 'n', 'g' }; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumChecker.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumChecker.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumChecker.java index 72e2097..785bd67 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumChecker.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/GMSQuorumChecker.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.messenger; +package org.apache.geode.distributed.internal.membership.gms.messenger; import java.io.InputStream; import java.io.OutputStream; @@ -34,11 +34,11 @@ import org.jgroups.Message; import org.jgroups.Receiver; import org.jgroups.View; -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 com.gemstone.gemfire.internal.concurrent.ConcurrentHashSet; -import com.gemstone.gemfire.internal.logging.LogService; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.distributed.internal.membership.QuorumChecker; +import org.apache.geode.internal.concurrent.ConcurrentHashSet; +import org.apache.geode.internal.logging.LogService; public class GMSQuorumChecker implements QuorumChecker { private static final Logger logger = LogService.getLogger(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java index 3948c51..045dfee 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress.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.messenger; +package org.apache.geode.distributed.internal.membership.gms.messenger; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.gms.GMSMember; -import com.gemstone.gemfire.internal.net.SocketCreator; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.gms.GMSMember; +import org.apache.geode.internal.net.SocketCreator; import org.jgroups.Global; import org.jgroups.stack.IpAddress; 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/messenger/JGroupsMessenger.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java index 898d712..f15c301 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.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.messenger; +package org.apache.geode.distributed.internal.membership.gms.messenger; -import static com.gemstone.gemfire.distributed.internal.membership.gms.GMSUtil.replaceStrings; -import static com.gemstone.gemfire.internal.DataSerializableFixedID.JOIN_REQUEST; -import static com.gemstone.gemfire.internal.DataSerializableFixedID.JOIN_RESPONSE; -import static com.gemstone.gemfire.internal.DataSerializableFixedID.FIND_COORDINATOR_REQ; -import static com.gemstone.gemfire.internal.DataSerializableFixedID.FIND_COORDINATOR_RESP; +import static org.apache.geode.distributed.internal.membership.gms.GMSUtil.replaceStrings; +import static org.apache.geode.internal.DataSerializableFixedID.JOIN_REQUEST; +import static org.apache.geode.internal.DataSerializableFixedID.JOIN_RESPONSE; +import static org.apache.geode.internal.DataSerializableFixedID.FIND_COORDINATOR_REQ; +import static org.apache.geode.internal.DataSerializableFixedID.FIND_COORDINATOR_RESP; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -64,40 +64,40 @@ import org.jgroups.stack.IpAddress; import org.jgroups.util.Digest; import org.jgroups.util.UUID; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.ForcedDisconnectException; -import com.gemstone.gemfire.GemFireConfigException; -import com.gemstone.gemfire.GemFireIOException; -import com.gemstone.gemfire.SystemConnectException; -import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; -import com.gemstone.gemfire.distributed.DurableClientAttributes; -import com.gemstone.gemfire.distributed.internal.*; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.MemberAttributes; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.distributed.internal.membership.QuorumChecker; -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.MessageHandler; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Messenger; -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.JoinRequestMessage; -import com.gemstone.gemfire.distributed.internal.membership.gms.messages.JoinResponseMessage; -import com.gemstone.gemfire.internal.ClassPathLoader; -import com.gemstone.gemfire.internal.HeapDataOutputStream; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.OSProcess; -import com.gemstone.gemfire.internal.net.SocketCreator; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.VersionedDataInputStream; -import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; -import com.gemstone.gemfire.internal.cache.DirectReplyMessage; -import com.gemstone.gemfire.internal.cache.DistributedCacheOperation; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.log4j.AlertAppender; -import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; -import com.gemstone.gemfire.internal.tcp.MemberShunnedException; +import org.apache.geode.DataSerializer; +import org.apache.geode.ForcedDisconnectException; +import org.apache.geode.GemFireConfigException; +import org.apache.geode.GemFireIOException; +import org.apache.geode.SystemConnectException; +import org.apache.geode.distributed.DistributedSystemDisconnectedException; +import org.apache.geode.distributed.DurableClientAttributes; +import org.apache.geode.distributed.internal.*; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.MemberAttributes; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.distributed.internal.membership.QuorumChecker; +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.MessageHandler; +import org.apache.geode.distributed.internal.membership.gms.interfaces.Messenger; +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.JoinRequestMessage; +import org.apache.geode.distributed.internal.membership.gms.messages.JoinResponseMessage; +import org.apache.geode.internal.ClassPathLoader; +import org.apache.geode.internal.HeapDataOutputStream; +import org.apache.geode.internal.InternalDataSerializer; +import org.apache.geode.internal.OSProcess; +import org.apache.geode.internal.net.SocketCreator; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.VersionedDataInputStream; +import org.apache.geode.internal.admin.remote.RemoteTransportConfig; +import org.apache.geode.internal.cache.DirectReplyMessage; +import org.apache.geode.internal.cache.DistributedCacheOperation; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.log4j.AlertAppender; +import org.apache.geode.internal.logging.log4j.LocalizedMessage; +import org.apache.geode.internal.tcp.MemberShunnedException; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; @@ -110,12 +110,12 @@ public class JGroupsMessenger implements Messenger { /** * The location (in the product) of the locator Jgroups config file. */ - private static final String DEFAULT_JGROUPS_TCP_CONFIG = "com/gemstone/gemfire/distributed/internal/membership/gms/messenger/jgroups-config.xml"; + private static final String DEFAULT_JGROUPS_TCP_CONFIG = "org/apache/geode/distributed/internal/membership/gms/messenger/jgroups-config.xml"; /** * The location (in the product) of the mcast Jgroups config file. */ - private static final String JGROUPS_MCAST_CONFIG_FILE_NAME = "com/gemstone/gemfire/distributed/internal/membership/gms/messenger/jgroups-mcast.xml"; + private static final String JGROUPS_MCAST_CONFIG_FILE_NAME = "org/apache/geode/distributed/internal/membership/gms/messenger/jgroups-mcast.xml"; /** JG magic numbers for types added to the JG ClassConfigurator */ private static final short JGROUPS_TYPE_JGADDRESS = 2000; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/StatRecorder.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/StatRecorder.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/StatRecorder.java index e013de6..95cd163 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/StatRecorder.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/StatRecorder.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.messenger; +package org.apache.geode.distributed.internal.membership.gms.messenger; import org.apache.logging.log4j.Logger; import org.jgroups.Event; @@ -28,9 +28,9 @@ import org.jgroups.protocols.pbcast.NAKACK2; import org.jgroups.protocols.pbcast.NakAckHeader2; import org.jgroups.stack.Protocol; -import com.gemstone.gemfire.distributed.internal.DMStats; -import com.gemstone.gemfire.distributed.internal.membership.gms.GMSUtil; -import com.gemstone.gemfire.distributed.internal.membership.gms.Services; +import org.apache.geode.distributed.internal.DMStats; +import org.apache.geode.distributed.internal.membership.gms.GMSUtil; +import org.apache.geode.distributed.internal.membership.gms.Services; import java.util.concurrent.RejectedExecutionException; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/Transport.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/Transport.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/Transport.java index e1d9af6..8951378 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/Transport.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/Transport.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.messenger; +package org.apache.geode.distributed.internal.membership.gms.messenger; import java.io.IOException; import java.io.InterruptedIOException; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java index 00d074a..46f7ec2 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.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.mgr; +package org.apache.geode.distributed.internal.membership.gms.mgr; import java.io.IOException; import java.io.NotSerializableException; @@ -41,62 +41,62 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.ForcedDisconnectException; -import com.gemstone.gemfire.GemFireConfigException; -import com.gemstone.gemfire.InternalGemFireError; -import com.gemstone.gemfire.SystemConnectException; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.ToDataException; -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException; -import com.gemstone.gemfire.distributed.Locator; -import com.gemstone.gemfire.distributed.internal.AdminMessageType; -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.DistributionManager; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.InternalLocator; -import com.gemstone.gemfire.distributed.internal.OverflowQueueWithDMStats; -import com.gemstone.gemfire.distributed.internal.SizeableRunnable; -import com.gemstone.gemfire.distributed.internal.StartupMessage; -import com.gemstone.gemfire.distributed.internal.direct.DirectChannel; -import com.gemstone.gemfire.distributed.internal.direct.DirectChannelListener; -import com.gemstone.gemfire.distributed.internal.direct.ShunnedMemberException; -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.MembershipTestHook; -import com.gemstone.gemfire.distributed.internal.membership.NetView; -import com.gemstone.gemfire.distributed.internal.membership.QuorumChecker; -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.SuspectMember; -import com.gemstone.gemfire.distributed.internal.membership.gms.fd.GMSHealthMonitor; -import com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.Manager; -import com.gemstone.gemfire.distributed.internal.membership.gms.membership.GMSJoinLeave; -import com.gemstone.gemfire.distributed.internal.membership.gms.messenger.GMSQuorumChecker; -import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.SystemTimer; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig; -import com.gemstone.gemfire.internal.cache.CacheServerImpl; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.cache.partitioned.PartitionMessageWithDirectReply; -import com.gemstone.gemfire.internal.cache.xmlcache.CacheServerCreation; -import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.log4j.AlertAppender; -import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage; -import com.gemstone.gemfire.internal.logging.log4j.LogMarker; -import com.gemstone.gemfire.internal.shared.StringPrintWriter; -import com.gemstone.gemfire.internal.tcp.ConnectExceptions; -import com.gemstone.gemfire.internal.tcp.MemberShunnedException; -import com.gemstone.gemfire.internal.util.Breadcrumbs; +import org.apache.geode.CancelException; +import org.apache.geode.ForcedDisconnectException; +import org.apache.geode.GemFireConfigException; +import org.apache.geode.InternalGemFireError; +import org.apache.geode.SystemConnectException; +import org.apache.geode.SystemFailure; +import org.apache.geode.ToDataException; +import org.apache.geode.cache.Cache; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.distributed.DistributedSystemDisconnectedException; +import org.apache.geode.distributed.Locator; +import org.apache.geode.distributed.internal.AdminMessageType; +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.DistributionManager; +import org.apache.geode.distributed.internal.DistributionMessage; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.distributed.internal.InternalLocator; +import org.apache.geode.distributed.internal.OverflowQueueWithDMStats; +import org.apache.geode.distributed.internal.SizeableRunnable; +import org.apache.geode.distributed.internal.StartupMessage; +import org.apache.geode.distributed.internal.direct.DirectChannel; +import org.apache.geode.distributed.internal.direct.DirectChannelListener; +import org.apache.geode.distributed.internal.direct.ShunnedMemberException; +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.MembershipTestHook; +import org.apache.geode.distributed.internal.membership.NetView; +import org.apache.geode.distributed.internal.membership.QuorumChecker; +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.SuspectMember; +import org.apache.geode.distributed.internal.membership.gms.fd.GMSHealthMonitor; +import org.apache.geode.distributed.internal.membership.gms.interfaces.Manager; +import org.apache.geode.distributed.internal.membership.gms.membership.GMSJoinLeave; +import org.apache.geode.distributed.internal.membership.gms.messenger.GMSQuorumChecker; +import org.apache.geode.internal.Assert; +import org.apache.geode.internal.SystemTimer; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.admin.remote.RemoteTransportConfig; +import org.apache.geode.internal.cache.CacheServerImpl; +import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.internal.cache.partitioned.PartitionMessageWithDirectReply; +import org.apache.geode.internal.cache.xmlcache.CacheServerCreation; +import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.log4j.AlertAppender; +import org.apache.geode.internal.logging.log4j.LocalizedMessage; +import org.apache.geode.internal.logging.log4j.LogMarker; +import org.apache.geode.internal.shared.StringPrintWriter; +import org.apache.geode.internal.tcp.ConnectExceptions; +import org.apache.geode.internal.tcp.MemberShunnedException; +import org.apache.geode.internal.util.Breadcrumbs; public class GMSMembershipManager implements MembershipManager, Manager { @@ -264,7 +264,7 @@ public class GMSMembershipManager implements MembershipManager, Manager /** * This is the listener that accepts our membership events */ - private final com.gemstone.gemfire.distributed.internal.membership.DistributedMembershipListener listener; + private final org.apache.geode.distributed.internal.membership.DistributedMembershipListener listener; /** * Membership failure listeners - for testing @@ -1752,7 +1752,7 @@ public class GMSMembershipManager implements MembershipManager, Manager /* * (non-Javadoc) - * @see com.gemstone.gemfire.distributed.internal.membership.MembershipManager#isConnected() + * @see org.apache.geode.distributed.internal.membership.MembershipManager#isConnected() */ public boolean isConnected() { return (this.hasJoined && !this.shutdownInProgress); @@ -2199,7 +2199,7 @@ public class GMSMembershipManager implements MembershipManager, Manager * (non-Javadoc) * MembershipManager method: wait for the given member to be gone. Throws TimeoutException if * the wait goes too long - * @see com.gemstone.gemfire.distributed.internal.membership.MembershipManager#waitForDeparture(com.gemstone.gemfire.distributed.DistributedMember) + * @see org.apache.geode.distributed.internal.membership.MembershipManager#waitForDeparture(org.apache.geode.distributed.DistributedMember) */ public boolean waitForDeparture(DistributedMember mbr) throws TimeoutException, InterruptedException { if (Thread.interrupted()) throw new InterruptedException(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java index 2bf6daf..330d8fb 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage.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.mgr; +package org.apache.geode.distributed.internal.membership.gms.mgr; 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.SerialDistributionMessage; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.distributed.internal.membership.NetView; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.SerialDistributionMessage; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.distributed.internal.membership.NetView; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/package.html ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/package.html b/geode-core/src/main/java/org/apache/geode/distributed/internal/package.html index cdb755f..7d6eb36 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/package.html +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/package.html @@ -21,15 +21,15 @@ Classes in this package implement distribution in GemFire. Every virtual machine working with distributed data (client VMs, the GemFire console) has an instance of {@link -com.gemstone.gemfire.distributed.internal.DistributionManager} +org.apache.geode.distributed.internal.DistributionManager} that is responsible for sending and receiving {@link -com.gemstone.gemfire.distributed.internal.DistributionMessage}s. +org.apache.geode.distributed.internal.DistributionMessage}s. A <code>DistributionManager</code> has a unique {@link -com.gemstone.gemfire.distributed.internal.DistributionManager#getId +org.apache.geode.distributed.internal.DistributionManager#getId id} and uses a JavaGroups com.gemstone.org.javagroups.Channel channel to discover the other members of the distributed system. It also uses JavaGroups to detect when a member has left the group. Note -that GemStone has com.gemstone.gemfire.distributed.internal.direct.DirectChannel#patchUpAddress +that GemStone has org.apache.geode.distributed.internal.direct.DirectChannel#patchUpAddress modified the implementation of the JavaGroups com.gemstone.org.jgroups.stack.IpAddress to hold the port on which the distribution manager's direct channel runs. This optimization allows us to start a distribution manager without having to send out a @@ -38,10 +38,10 @@ less XML parsing. This greatly improves the performace of creating a JavaGroups channel.) While some messages may be broadcast to all members of the group, the vast majority of messages are only intended for a subset of the group are sent point-to-point over a {@link -com.gemstone.gemfire.distributed.internal.direct.DirectChannel}. +org.apache.geode.distributed.internal.direct.DirectChannel}. The JGroups channel and <code>DirectChannel</code> are combined into a {@link -com.gemstone.gemfire.distributed.internal.DistributionChannel} +org.apache.geode.distributed.internal.DistributionChannel} that is used by the <code>DistributionManager</code>. <P> http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java index 69e8a94..21fd5f9 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/streaming/StreamingOperation.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.streaming; +package org.apache.geode.distributed.internal.streaming; import java.io.DataInput; import java.io.DataOutput; @@ -29,37 +29,37 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.GemFireRethrowable; -import com.gemstone.gemfire.InternalGemFireError; -import com.gemstone.gemfire.InternalGemFireException; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.cache.query.Struct; -import com.gemstone.gemfire.cache.query.internal.DefaultQuery; -import com.gemstone.gemfire.cache.query.internal.PRQueryTraceInfo; -import com.gemstone.gemfire.cache.query.internal.QueryMonitor; -import com.gemstone.gemfire.cache.query.internal.StructImpl; -import com.gemstone.gemfire.cache.query.internal.types.StructTypeImpl; -import com.gemstone.gemfire.cache.query.types.ObjectType; -import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DistributionManager; -import com.gemstone.gemfire.distributed.internal.DistributionMessage; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.MessageWithReply; -import com.gemstone.gemfire.distributed.internal.PooledDistributionMessage; -import com.gemstone.gemfire.distributed.internal.ReplyException; -import com.gemstone.gemfire.distributed.internal.ReplyMessage; -import com.gemstone.gemfire.distributed.internal.ReplyProcessor21; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; -import com.gemstone.gemfire.internal.HeapDataOutputStream; -import com.gemstone.gemfire.internal.InternalDataSerializer; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.cache.PartitionedRegionQueryEvaluator; -import com.gemstone.gemfire.internal.cache.Token; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.util.BlobHelper; +import org.apache.geode.CancelException; +import org.apache.geode.DataSerializer; +import org.apache.geode.GemFireRethrowable; +import org.apache.geode.InternalGemFireError; +import org.apache.geode.InternalGemFireException; +import org.apache.geode.SystemFailure; +import org.apache.geode.cache.query.Struct; +import org.apache.geode.cache.query.internal.DefaultQuery; +import org.apache.geode.cache.query.internal.PRQueryTraceInfo; +import org.apache.geode.cache.query.internal.QueryMonitor; +import org.apache.geode.cache.query.internal.StructImpl; +import org.apache.geode.cache.query.internal.types.StructTypeImpl; +import org.apache.geode.cache.query.types.ObjectType; +import org.apache.geode.distributed.internal.DM; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.DistributionMessage; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.distributed.internal.MessageWithReply; +import org.apache.geode.distributed.internal.PooledDistributionMessage; +import org.apache.geode.distributed.internal.ReplyException; +import org.apache.geode.distributed.internal.ReplyMessage; +import org.apache.geode.distributed.internal.ReplyProcessor21; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.HeapDataOutputStream; +import org.apache.geode.internal.InternalDataSerializer; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.cache.PartitionedRegionQueryEvaluator; +import org.apache.geode.internal.cache.Token; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.util.BlobHelper; /** * StreamingOperation is an abstraction for sending messages to multiple (or single) * recipient requesting a potentially large amount of data and receiving the reply @@ -89,7 +89,7 @@ public abstract class StreamingOperation { * @throws InterruptedException TODO-javadocs */ public void getDataFromAll(Set recipients) - throws com.gemstone.gemfire.cache.TimeoutException, InterruptedException + throws org.apache.geode.cache.TimeoutException, InterruptedException { if (Thread.interrupted()) throw new InterruptedException(); if (recipients.isEmpty()) @@ -105,8 +105,8 @@ public abstract class StreamingOperation { } catch (InternalGemFireException ex) { Throwable cause = ex.getCause(); - if (cause instanceof com.gemstone.gemfire.cache.TimeoutException) { - throw (com.gemstone.gemfire.cache.TimeoutException)cause; + if (cause instanceof org.apache.geode.cache.TimeoutException) { + throw (org.apache.geode.cache.TimeoutException)cause; } throw ex; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoRequest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoRequest.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoRequest.java index eb90155..2b2271d 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoRequest.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoRequest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.tcpserver; +package org.apache.geode.distributed.internal.tcpserver; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import com.gemstone.gemfire.DataSerializable; +import org.apache.geode.DataSerializable; /** * A request to the TCP server to provide information http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoResponse.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoResponse.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoResponse.java index 953fe8d..b8ceb15 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoResponse.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/InfoResponse.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.tcpserver; +package org.apache.geode.distributed.internal.tcpserver; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.DataSerializer; +import org.apache.geode.DataSerializable; +import org.apache.geode.DataSerializer; /** * A response from the TCP server with information http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/LocatorCancelException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/LocatorCancelException.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/LocatorCancelException.java index c6fef71..baa5e66 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/LocatorCancelException.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/LocatorCancelException.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.tcpserver; +package org.apache.geode.distributed.internal.tcpserver; -import com.gemstone.gemfire.CancelException; +import org.apache.geode.CancelException; public class LocatorCancelException extends CancelException { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownRequest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownRequest.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownRequest.java index 7d002ac..3240334 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownRequest.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownRequest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.tcpserver; +package org.apache.geode.distributed.internal.tcpserver; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import com.gemstone.gemfire.DataSerializable; +import org.apache.geode.DataSerializable; /** * A request to the TCP server to shutdown http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownResponse.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownResponse.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownResponse.java index 1dc37bf..b9fd9c1 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownResponse.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/ShutdownResponse.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.tcpserver; +package org.apache.geode.distributed.internal.tcpserver; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import com.gemstone.gemfire.DataSerializable; +import org.apache.geode.DataSerializable; /** * A response from the TCP server that it received http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java index 2bb1b7f..495a85b 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpClient.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.tcpserver; +package org.apache.geode.distributed.internal.tcpserver; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -31,17 +31,17 @@ import javax.net.ssl.SSLHandshakeException; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.cache.UnsupportedVersionException; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.VersionedDataInputStream; -import com.gemstone.gemfire.internal.VersionedDataOutputStream; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.net.SocketCreator; -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.DataSerializer; +import org.apache.geode.cache.UnsupportedVersionException; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.VersionedDataInputStream; +import org.apache.geode.internal.VersionedDataOutputStream; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.net.SocketCreator; +import org.apache.geode.internal.net.SocketCreatorFactory; +import org.apache.geode.internal.security.SecurableCommunicationChannel; +import org.apache.geode.internal.security.SecurableComponent; /** * <p>Client for the TcpServer component of the Locator. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpHandler.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpHandler.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpHandler.java index aaed5fd..3e92967 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpHandler.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpHandler.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.tcpserver; +package org.apache.geode.distributed.internal.tcpserver; import java.io.IOException; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.internal.SharedConfiguration; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.distributed.DistributedSystem; +import org.apache.geode.distributed.internal.SharedConfiguration; /** * A handler which responds to messages for the {@link TcpServer} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java index 05c209c..bd6a8f8 100755 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/TcpServer.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.tcpserver; +package org.apache.geode.distributed.internal.tcpserver; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -41,27 +41,27 @@ import javax.net.ssl.SSLException; import org.apache.logging.log4j.Logger; -import com.gemstone.gemfire.CancelException; -import com.gemstone.gemfire.DataSerializer; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; -import com.gemstone.gemfire.distributed.internal.DistributionStats; -import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; -import com.gemstone.gemfire.distributed.internal.PoolStatHelper; -import com.gemstone.gemfire.distributed.internal.PooledExecutorWithDMStats; -import com.gemstone.gemfire.distributed.internal.SharedConfiguration; -import com.gemstone.gemfire.internal.DSFIDFactory; -import com.gemstone.gemfire.internal.GemFireVersion; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.VersionedDataInputStream; -import com.gemstone.gemfire.internal.VersionedDataOutputStream; -import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.net.SocketCreator; -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.DataSerializer; +import org.apache.geode.SystemFailure; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.DistributionConfigImpl; +import org.apache.geode.distributed.internal.DistributionStats; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.distributed.internal.PoolStatHelper; +import org.apache.geode.distributed.internal.PooledExecutorWithDMStats; +import org.apache.geode.distributed.internal.SharedConfiguration; +import org.apache.geode.internal.DSFIDFactory; +import org.apache.geode.internal.GemFireVersion; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.VersionedDataInputStream; +import org.apache.geode.internal.VersionedDataOutputStream; +import org.apache.geode.internal.cache.GemFireCacheImpl; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.net.SocketCreator; +import org.apache.geode.internal.net.SocketCreatorFactory; +import org.apache.geode.internal.security.SecurableCommunicationChannel; +import org.apache.geode.internal.security.SecurableComponent; /** * TCP server which listens on a port and delegates requests to a request http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionRequest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionRequest.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionRequest.java index 2cbfd97..99edb09 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionRequest.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionRequest.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.tcpserver; +package org.apache.geode.distributed.internal.tcpserver; -import com.gemstone.gemfire.DataSerializable; +import org.apache.geode.DataSerializable; import java.io.DataInput; import java.io.DataOutput; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionResponse.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionResponse.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionResponse.java index 7d5e08c..bd50f03 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionResponse.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/tcpserver/VersionResponse.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.tcpserver; +package org.apache.geode.distributed.internal.tcpserver; -import com.gemstone.gemfire.DataSerializable; -import com.gemstone.gemfire.internal.Version; +import org.apache.geode.DataSerializable; +import org.apache.geode.internal.Version; import java.io.DataInput; import java.io.DataOutput; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/internal/unsafe/RegisterSignalHandlerSupport.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/unsafe/RegisterSignalHandlerSupport.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/unsafe/RegisterSignalHandlerSupport.java index 94ae4da..15c4aee 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/unsafe/RegisterSignalHandlerSupport.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/unsafe/RegisterSignalHandlerSupport.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.distributed.internal.unsafe; +package org.apache.geode.distributed.internal.unsafe; /** * The RegisterSignalHandlerSupport class is an ugly hack! http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/distributed/package.html ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/package.html b/geode-core/src/main/java/org/apache/geode/distributed/package.html index d325f38..f51e25d 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/package.html +++ b/geode-core/src/main/java/org/apache/geode/distributed/package.html @@ -20,14 +20,14 @@ limitations under the License. <P>Provides information about, access to, and common tools for GemFire distributed systems. When a program wishes to access distributed dtaa data stored in GemFire, it first creates a {@link -com.gemstone.gemfire.distributed.DistributedSystem} that will connect +org.apache.geode.distributed.DistributedSystem} that will connect to the distributed system. GemFire provides two means of discovering the other members in a distributed group. The first uses IP multicast to broadcast a message to all members that listen on a given <A href="DistributedSystem.html#mcast-port"/>port</A> and <A href="DistributedSystem.html#mcast-address">address</A>. The second method of discovery uses special VMs called {@linkplain -com.gemstone.gemfire.distributed.Locator "locators"} to keep track of +org.apache.geode.distributed.Locator "locators"} to keep track of the members of the distributed system. Each locator is identified by a host/port pair that is <A href="DistributedSystem.html#locators">specified</A> when connecting http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/i18n/LogWriterI18n.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/i18n/LogWriterI18n.java b/geode-core/src/main/java/org/apache/geode/i18n/LogWriterI18n.java index 09198cf..f499262 100644 --- a/geode-core/src/main/java/org/apache/geode/i18n/LogWriterI18n.java +++ b/geode-core/src/main/java/org/apache/geode/i18n/LogWriterI18n.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.gemstone.gemfire.i18n; +package org.apache.geode.i18n; import java.util.logging.Handler; -import com.gemstone.gemfire.LogWriter; -import com.gemstone.gemfire.distributed.DistributedSystem; +import org.apache.geode.LogWriter; +import org.apache.geode.distributed.DistributedSystem; /** * Defines methods available to clients that want to write a log message * to their GemFire distributed system log file. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/i18n/StringId.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/i18n/StringId.java b/geode-core/src/main/java/org/apache/geode/i18n/StringId.java index 221d66b..38b9414 100755 --- a/geode-core/src/main/java/org/apache/geode/i18n/StringId.java +++ b/geode-core/src/main/java/org/apache/geode/i18n/StringId.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.gemstone.gemfire.i18n; +package org.apache.geode.i18n; -import com.gemstone.gemfire.internal.i18n.AbstractStringIdResourceBundle; +import org.apache.geode.internal.i18n.AbstractStringIdResourceBundle; import java.text.MessageFormat; import java.util.Locale; @@ -29,11 +29,11 @@ import java.util.Locale; */ public class StringId { /** The root name of the ResourceBundle */ - private static final String RESOURCE_CLASS = "com/gemstone/gemfire/internal/i18n/StringIdResourceBundle"; + private static final String RESOURCE_CLASS = "org/apache/geode/internal/i18n/StringIdResourceBundle"; /** A unique identifier that is written when this StringId is logged to * allow for reverse translation. - * @see com.gemstone.gemfire.internal.logging.LogWriterImpl + * @see org.apache.geode.internal.logging.LogWriterImpl */ public final int id; /** the English translation of text */ @@ -47,7 +47,7 @@ public class StringId { private static boolean includeMsgIDs; - /** A StringId to allow users to log a literal String using the {@link com.gemstone.gemfire.i18n.LogWriterI18n} */ + /** A StringId to allow users to log a literal String using the {@link org.apache.geode.i18n.LogWriterI18n} */ public static final StringId LITERAL = new StringId(1, "{0}"); static { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java b/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java index 497c12d..5d7325d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java +++ b/geode-core/src/main/java/org/apache/geode/internal/AbstractConfig.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; -import static com.gemstone.gemfire.distributed.ConfigurationProperties.*; +import static org.apache.geode.distributed.ConfigurationProperties.*; import java.io.File; import java.io.FileOutputStream; @@ -38,13 +38,13 @@ import java.util.Properties; import java.util.StringTokenizer; import java.util.TreeSet; -import com.gemstone.gemfire.InternalGemFireException; -import com.gemstone.gemfire.UnmodifiableException; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.FlowControlParams; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.net.SocketCreator; -import com.gemstone.gemfire.internal.security.SecurableCommunicationChannel; +import org.apache.geode.InternalGemFireException; +import org.apache.geode.UnmodifiableException; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.FlowControlParams; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.net.SocketCreator; +import org.apache.geode.internal.security.SecurableCommunicationChannel; /** * Provides an implementation of the {@link Config} interface http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/Assert.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/Assert.java b/geode-core/src/main/java/org/apache/geode/internal/Assert.java index b337bbd..0a38aaa 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/Assert.java +++ b/geode-core/src/main/java/org/apache/geode/internal/Assert.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; -import com.gemstone.gemfire.InternalGemFireError; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; +import org.apache.geode.InternalGemFireError; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.internal.i18n.LocalizedStrings; /** * Support for correctness assertions. @@ -93,8 +93,8 @@ public class Assert { } else { ex = new InternalGemFireError(); } -// com.gemstone.gemfire.internal.cache.GemFireCache gfc -// = com.gemstone.gemfire.internal.cache.GemFireCache.getInstance(); +// org.apache.geode.internal.cache.GemFireCache gfc +// = org.apache.geode.internal.cache.GemFireCache.getInstance(); // if (gfc != null) { // gfc.getLogger().info("DEBUG", ex); // } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java b/geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java index f8ccbd6..e0e0d72 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java +++ b/geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; -import com.gemstone.gemfire.internal.net.SocketCreator; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.internal.i18n.LocalizedStrings; +import org.apache.geode.internal.net.SocketCreator; import java.io.IOException; import java.io.PrintStream; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/Banner.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/Banner.java b/geode-core/src/main/java/org/apache/geode/internal/Banner.java index bee70a4..01cd9aa 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/Banner.java +++ b/geode-core/src/main/java/org/apache/geode/internal/Banner.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; -import com.gemstone.gemfire.SystemFailure; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; -import com.gemstone.gemfire.internal.logging.LogService; +import org.apache.geode.SystemFailure; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.DistributionConfigImpl; +import org.apache.geode.internal.logging.LogService; import java.io.PrintWriter; import java.io.StringWriter; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java b/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java index 614bcb8..57d0b72 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java +++ b/geode-core/src/main/java/org/apache/geode/internal/ByteArrayDataInput.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; import java.io.DataInput; import java.io.EOFException; @@ -23,8 +23,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.UTFDataFormatException; -import com.gemstone.gemfire.internal.Version; -import com.gemstone.gemfire.internal.VersionedDataStream; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.VersionedDataStream; /** * A reusable {@link DataInput} implementation that wraps a given byte array. It http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java index 043eb96..bbaefa9 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java +++ b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferOutputStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; import java.io.*; import java.nio.*; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java index 81fd0d2..006a650 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java +++ b/geode-core/src/main/java/org/apache/geode/internal/ByteBufferWriter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; import java.nio.ByteBuffer; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/ClassLoadUtil.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/ClassLoadUtil.java b/geode-core/src/main/java/org/apache/geode/internal/ClassLoadUtil.java index 9ec015a..275227a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/ClassLoadUtil.java +++ b/geode-core/src/main/java/org/apache/geode/internal/ClassLoadUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; import java.lang.reflect.Method; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/ClassPathLoader.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/ClassPathLoader.java b/geode-core/src/main/java/org/apache/geode/internal/ClassPathLoader.java index 697f8c7..9050953 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/ClassPathLoader.java +++ b/geode-core/src/main/java/org/apache/geode/internal/ClassPathLoader.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.internal.logging.LogService; -import com.gemstone.gemfire.internal.util.CollectionUtils; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.util.CollectionUtils; import org.apache.logging.log4j.Logger; import java.io.File; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/Config.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/Config.java b/geode-core/src/main/java/org/apache/geode/internal/Config.java index c70b1fa..d8e07e7 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/Config.java +++ b/geode-core/src/main/java/org/apache/geode/internal/Config.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; import java.io.File; import java.io.IOException; @@ -43,15 +43,15 @@ public interface Config { * specify the attribute name and value and get them safely into * a Config instance. * @throws IllegalArgumentException if the specified name or value are illegal - * @throws com.gemstone.gemfire.UnmodifiableException if the attribute can not be modified. + * @throws org.apache.geode.UnmodifiableException if the attribute can not be modified. */ void setAttribute(String attName, String attValue, ConfigSource source); /** * Given the attribute's name set its value to the specified Object. * @throws IllegalArgumentException if the specified name is unknown - * @throws com.gemstone.gemfire.InvalidValueException if the specified value is not compatible + * @throws org.apache.geode.InvalidValueException if the specified value is not compatible * with the attributes type - * @throws com.gemstone.gemfire.UnmodifiableException if the attribute can not be modified. + * @throws org.apache.geode.UnmodifiableException if the attribute can not be modified. */ void setAttributeObject(String attName, Object attValue, ConfigSource source); /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/ConfigSource.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/ConfigSource.java b/geode-core/src/main/java/org/apache/geode/internal/ConfigSource.java index 51c2caf..fbe467b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/ConfigSource.java +++ b/geode-core/src/main/java/org/apache/geode/internal/ConfigSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/ConnectionWatcher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/ConnectionWatcher.java b/geode-core/src/main/java/org/apache/geode/internal/ConnectionWatcher.java index 75d1aeb..4755526 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/ConnectionWatcher.java +++ b/geode-core/src/main/java/org/apache/geode/internal/ConnectionWatcher.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; import java.net.Socket; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/CopyOnWriteHashSet.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/CopyOnWriteHashSet.java b/geode-core/src/main/java/org/apache/geode/internal/CopyOnWriteHashSet.java index 38697fc..6c5c340 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/CopyOnWriteHashSet.java +++ b/geode-core/src/main/java/org/apache/geode/internal/CopyOnWriteHashSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; import java.io.IOException; import java.io.ObjectInputStream; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7171cec4/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java b/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java index 583b2ab..e9f524c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java +++ b/geode-core/src/main/java/org/apache/geode/internal/DSCODE.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.gemstone.gemfire.internal; +package org.apache.geode.internal; -import com.gemstone.gemfire.DataSerializer; +import org.apache.geode.DataSerializer; /** * An interface that contains a bunch of static final values used for the
