You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ma...@apache.org on 2015/11/23 21:49:11 UTC

[41/50] [abbrv] incubator-geode git commit: Merge branch 'feature/GEODE-77' into develop

Merge branch 'feature/GEODE-77' into develop

Conflicts:
	gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d63113c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d63113c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d63113c6

Branch: refs/heads/feature/GEODE-53
Commit: d63113c6ac02efbbd7e20a7d3c93bb2e1084e012
Parents: 59ab8cf 766dfd0
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Thu Nov 19 15:20:19 2015 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Thu Nov 19 15:20:19 2015 -0800

----------------------------------------------------------------------
 build.gradle                                    |    3 +
 gemfire-assembly/build.gradle                   |    8 +-
 gemfire-core/build.gradle                       |    3 +-
 .../com/gemstone/gemfire/DataSerializer.java    |    2 +-
 .../gemfire/admin/AdminDistributedSystem.java   |    5 -
 .../internal/AdminDistributedSystemImpl.java    |   24 +-
 .../internal/DistributedSystemConfigImpl.java   |    1 -
 .../gemfire/admin/internal/InetAddressUtil.java |    2 +-
 .../ManagedEntityConfigXmlGenerator.java        |   21 +-
 .../gemfire/admin/jmx/internal/AgentImpl.java   |    2 +-
 .../client/internal/AuthenticateUserOp.java     |    2 +
 .../gemfire/cache/client/internal/PingOp.java   |   16 -
 .../cache/client/internal/QueueManagerImpl.java |    2 +-
 .../internal/pooling/ConnectionManagerImpl.java |    4 +-
 .../cache/hdfs/internal/HDFSEventListener.java  |    4 +-
 .../cache/util/BoundedLinkedHashMap.java        |    3 -
 .../gemfire/distributed/DistributedSystem.java  |   39 +-
 .../gemstone/gemfire/distributed/Locator.java   |    5 +-
 .../gemfire/distributed/internal/DM.java        |    9 +-
 .../gemfire/distributed/internal/DMStats.java   |  123 +-
 .../internal/DistributionChannel.java           |    2 +
 .../internal/DistributionConfig.java            |    8 +-
 .../internal/DistributionConfigImpl.java        |   16 +-
 .../internal/DistributionManager.java           |  162 +-
 .../internal/DistributionManagerConfig.java     |  102 -
 .../internal/DistributionMessage.java           |   15 +-
 .../distributed/internal/DistributionStats.java |  333 +-
 .../internal/HighPriorityAckedMessage.java      |    4 +-
 .../internal/InternalDistributedSystem.java     |  152 +-
 .../distributed/internal/InternalLocator.java   |  151 +-
 .../internal/LonerDistributionManager.java      |  238 +-
 .../internal/PooledExecutorWithDMStats.java     |   12 +-
 .../distributed/internal/ReplyMessage.java      |    2 +-
 .../distributed/internal/ReplyProcessor21.java  |    5 +-
 .../distributed/internal/ShutdownMessage.java   |    2 +-
 .../distributed/internal/StartupMessage.java    |   15 +-
 .../distributed/internal/StartupOperation.java  |    5 -
 .../internal/StartupResponseMessage.java        |    2 +-
 .../internal/WaitForViewInstallation.java       |    4 +-
 .../internal/deadlock/DeadlockDetector.java     |  185 +-
 .../internal/deadlock/DependencyGraph.java      |  172 +-
 .../internal/deadlock/LocalThread.java          |    2 +-
 .../deadlock/MessageDependencyMonitor.java      |    4 +-
 .../internal/direct/DirectChannel.java          |   34 +-
 .../membership/InternalDistributedMember.java   |  316 +-
 .../internal/membership/MemberAttributes.java   |   20 +-
 .../internal/membership/MemberFactory.java      |   25 +-
 .../internal/membership/MemberServices.java     |   22 +-
 .../internal/membership/MembershipManager.java  |   27 +-
 .../internal/membership/NetMember.java          |   59 +-
 .../internal/membership/NetView.java            |  543 ++-
 .../internal/membership/QuorumChecker.java      |   12 +
 .../internal/membership/gms/GMSMember.java      |  460 ++
 .../membership/gms/GMSMemberFactory.java        |  143 +
 .../internal/membership/gms/GMSUtil.java        |  124 +
 .../internal/membership/gms/NetLocator.java     |   16 +
 .../internal/membership/gms/ServiceConfig.java  |  158 +
 .../internal/membership/gms/Services.java       |  371 ++
 .../internal/membership/gms/SuspectMember.java  |   53 +
 .../membership/gms/auth/GMSAuthenticator.java   |  219 +
 .../membership/gms/fd/GMSHealthMonitor.java     | 1375 ++++++
 .../gms/interfaces/Authenticator.java           |   11 +
 .../gms/interfaces/HealthMonitor.java           |   49 +
 .../membership/gms/interfaces/JoinLeave.java    |   51 +
 .../membership/gms/interfaces/Locator.java      |   16 +
 .../membership/gms/interfaces/Manager.java      |  105 +
 .../gms/interfaces/MessageHandler.java          |   14 +
 .../membership/gms/interfaces/Messenger.java    |   43 +
 .../membership/gms/interfaces/Service.java      |   66 +
 .../gms/locator/FindCoordinatorRequest.java     |   99 +
 .../gms/locator/FindCoordinatorResponse.java    |  146 +
 .../membership/gms/locator/GMSLocator.java      |  357 ++
 .../membership/gms/locator/GetViewRequest.java  |   33 +
 .../membership/gms/locator/GetViewResponse.java |   48 +
 .../gms/locator/PeerLocatorRequest.java         |    9 +
 .../membership/gms/membership/GMSJoinLeave.java | 2141 +++++++++
 .../membership/gms/messages/HasMemberID.java    |    9 +
 .../gms/messages/HeartbeatMessage.java          |   58 +
 .../gms/messages/HeartbeatRequestMessage.java   |   64 +
 .../gms/messages/InstallViewMessage.java        |   90 +
 .../gms/messages/JoinRequestMessage.java        |   81 +
 .../gms/messages/JoinResponseMessage.java       |  113 +
 .../gms/messages/LeaveRequestMessage.java       |   78 +
 .../gms/messages/NetworkPartitionMessage.java   |   28 +
 .../gms/messages/RemoveMemberMessage.java       |   80 +
 .../gms/messages/SuspectMembersMessage.java     |   75 +
 .../membership/gms/messages/SuspectRequest.java |   56 +
 .../membership/gms/messages/ViewAckMessage.java |   87 +
 .../gms/messenger/AddressManager.java           |  114 +
 .../membership/gms/messenger/GMSPingPonger.java |   41 +
 .../gms/messenger/GMSQuorumChecker.java         |  258 +
 .../membership/gms/messenger/JGAddress.java     |  214 +
 .../gms/messenger/JGroupsMessenger.java         | 1075 +++++
 .../membership/gms/messenger/StatRecorder.java  |  146 +
 .../membership/gms/messenger/Transport.java     |  126 +
 .../gms/mgr/GMSMembershipManager.java           | 3018 ++++++++++++
 .../membership/gms/mgr/LocalViewMessage.java    |   85 +
 .../internal/membership/gms/package.html        |   41 +
 .../membership/jgroup/GFJGBasicAdapter.java     |  618 ---
 .../membership/jgroup/GFJGPeerAdapter.java      |  500 --
 .../membership/jgroup/JGroupMember.java         |  260 -
 .../membership/jgroup/JGroupMemberFactory.java  |  128 -
 .../jgroup/JGroupMembershipManager.java         | 4241 ----------------
 .../internal/membership/jgroup/LocatorImpl.java |  490 --
 .../membership/jgroup/QuorumCheckerImpl.java    |  300 --
 .../internal/membership/jgroup/ViewMessage.java |   82 -
 .../internal/membership/jgroup/package.html     |   43 -
 .../internal/tcpserver/TcpClient.java           |   60 +-
 .../internal/tcpserver/TcpServer.java           |  105 +-
 .../gemstone/gemfire/i18n/LogWriterI18n.java    |    8 +-
 .../com/gemstone/gemfire/i18n/StringId.java     |  161 +
 .../com/gemstone/gemfire/i18n/StringIdImpl.java |  162 -
 .../gemfire/internal/AvailablePort.java         |   73 +-
 .../gemfire/internal/ConnectionWatcher.java     |   41 +
 .../gemstone/gemfire/internal/DSFIDFactory.java |   38 +-
 .../internal/DataSerializableFixedID.java       |   34 +-
 .../internal/InternalDataSerializer.java        |  140 +-
 .../gemfire/internal/InternalInstantiator.java  |    2 +-
 .../gemfire/internal/SocketCreator.java         |    3 +-
 .../gemstone/gemfire/internal/SystemAdmin.java  |   15 +-
 .../com/gemstone/gemfire/internal/Version.java  |   19 +-
 .../internal/admin/remote/AdminResponse.java    |    2 +-
 .../admin/remote/AlertListenerMessage.java      |    2 +-
 .../admin/remote/FetchStatsResponse.java        |    2 +-
 .../admin/remote/FetchSysCfgRequest.java        |    2 +-
 .../admin/remote/HealthListenerMessage.java     |    2 +-
 .../admin/remote/RemoteGfManagerAgent.java      |   37 +-
 .../admin/remote/RemoteTransportConfig.java     |  127 +-
 .../admin/remote/ShutdownAllRequest.java        |    6 +-
 .../admin/remote/ShutdownAllResponse.java       |    2 +-
 .../admin/remote/SnapshotResultMessage.java     |    2 +-
 .../admin/remote/StatListenerMessage.java       |    2 +-
 .../internal/cache/CloseCacheMessage.java       |    2 +-
 .../internal/cache/CreateRegionProcessor.java   |    6 +-
 .../gemfire/internal/cache/DiskStoreImpl.java   |    6 +-
 .../cache/DistributedCacheOperation.java        |    6 +-
 .../internal/cache/DistributedRegion.java       |    2 +-
 .../internal/cache/FindRemoteTXMessage.java     |    2 +-
 .../internal/cache/InitialImageFlowControl.java |    2 +-
 .../internal/cache/LoaderHelperImpl.java        |    2 +-
 .../gemfire/internal/cache/LocalRegion.java     |    9 +-
 .../internal/cache/PRHARedundancyProvider.java  |    2 +-
 .../internal/cache/PartitionedRegion.java       |    2 +-
 .../cache/PartitionedRegionDataStore.java       |    2 +-
 .../internal/cache/StateFlushOperation.java     |    5 +-
 .../gemfire/internal/cache/TXState.java         |    2 +-
 .../cache/UpdateAttributesProcessor.java        |    2 +-
 .../internal/cache/doc-files/properties.html    |   22 -
 .../internal/cache/ha/HARegionQueue.java        |    2 +-
 .../partitioned/BucketProfileUpdateMessage.java |    2 +-
 .../cache/partitioned/FetchEntriesMessage.java  |   11 +-
 .../cache/partitioned/PRTombstoneMessage.java   |    3 +-
 .../cache/tier/sockets/BaseCommand.java         |    1 +
 .../cache/tier/sockets/CacheClientNotifier.java |    8 +-
 .../cache/tier/sockets/CacheClientProxy.java    |    2 +-
 .../tier/sockets/ClientProxyMembershipID.java   |    6 +-
 .../internal/cache/tier/sockets/HandShake.java  |   18 +-
 .../internal/cache/tier/sockets/Message.java    |   23 +-
 .../cache/tier/sockets/ServerConnection.java    |    2 +-
 .../sockets/command/GatewayReceiverCommand.java |    2 +-
 .../cache/tier/sockets/command/Get70.java       |    2 +-
 .../cache/tier/sockets/command/Ping.java        |   15 +-
 .../cache/tier/sockets/command/Put.java         |    2 +-
 .../tier/sockets/command/RegisterInterest.java  |    2 +-
 .../sockets/command/RegisterInterest61.java     |    2 +-
 .../sockets/command/RegisterInterestList.java   |    2 +-
 .../sockets/command/RegisterInterestList61.java |    2 +-
 .../sockets/command/RegisterInterestList66.java |    2 +-
 .../cache/tier/sockets/command/Request.java     |    2 +-
 .../sockets/command/UnregisterInterest.java     |    2 +-
 .../sockets/command/UnregisterInterestList.java |    2 +-
 .../GatewaySenderEventCallbackDispatcher.java   |    2 +-
 .../parallel/ParallelGatewaySenderQueue.java    |   51 +-
 .../datasource/GemFireBasicDataSource.java      |    2 +-
 .../datasource/GemFireConnPooledDataSource.java |    2 +-
 .../i18n/AbstractStringIdResourceBundle.java    |    5 +-
 .../gemfire/internal/i18n/LocalizedStrings.java | 3985 +++++++--------
 .../internal/i18n/ParentLocalizedStrings.java   | 4517 +++++++++---------
 .../gemfire/internal/i18n/StringId.java         |   58 +
 .../internal/logging/DebugLogWriter.java        |    4 +-
 .../internal/logging/InternalLogWriter.java     |    5 +-
 .../gemfire/internal/logging/LogFileParser.java |    8 +
 .../gemfire/internal/logging/LogWriterImpl.java |    2 +-
 .../internal/logging/LoggingThreadGroup.java    |    2 +-
 .../gemfire/internal/logging/PureLogWriter.java |    2 +-
 .../logging/SecurityLocalLogWriter.java         |    2 +-
 .../internal/logging/SecurityLogWriter.java     |    2 +-
 .../logging/SecurityManagerLogWriter.java       |    2 +-
 .../logging/log4j/LocalizedMessage.java         |    3 +-
 .../internal/logging/log4j/LogWriterLogger.java |    2 +-
 .../gemfire/internal/process/StartupStatus.java |    2 +-
 .../gemfire/internal/redis/RegionProvider.java  |    2 +-
 .../gemfire/internal/tcp/Connection.java        |   53 +-
 .../gemfire/internal/tcp/ConnectionTable.java   |   10 +-
 .../gemfire/internal/tcp/TCPConduit.java        |    4 +-
 .../gemfire/internal/util/Breadcrumbs.java      |    2 +-
 .../gemfire/internal/util/PluckStacks.java      |   74 +-
 .../management/internal/JmxManagerAdvisor.java  |    2 +-
 .../internal/JmxManagerLocatorRequest.java      |   11 -
 .../management/internal/MBeanJMXAdapter.java    |    2 +-
 .../management/internal/ManagementStrings.java  |  113 +-
 .../internal/beans/MemberMBeanBridge.java       |    4 +-
 .../internal/cli/commands/ClientCommands.java   |   44 +-
 .../CreateAlterDestroyRegionCommands.java       |   13 +-
 .../cli/commands/DiskStoreCommands.java         |    7 +-
 .../cli/commands/MiscellaneousCommands.java     |   38 +-
 .../cli/functions/RegionCreateFunction.java     |    5 +
 .../cli/functions/RegionFunctionArgs.java       |   27 +-
 .../internal/cli/i18n/CliStrings.java           |   59 +-
 .../internal/cli/result/ResultBuilder.java      |    0
 .../distributed/internal/javagroups-config.txt  |  101 -
 .../distributed/internal/javagroups-mcast.txt   |   97 -
 .../membership/gms/messenger/jgroups-config.xml |   56 +
 .../membership/gms/messenger/jgroups-mcast.xml  |   82 +
 gemfire-core/src/main/resources/log4j2.xml      |    1 +
 .../BindDistributedSystemJUnitTest.java         |  156 +-
 .../gemfire/cache/Bug42039JUnitTest.java        |   23 +-
 .../cache/ClientServerTimeSyncDUnitTest.java    |    2 +-
 .../ClientServerRegisterInterestsDUnitTest.java |    5 +-
 .../internal/AutoConnectionSourceDUnitTest.java |    6 +-
 .../AutoConnectionSourceWithUDPDUnitTest.java   |  149 -
 .../management/MemoryThresholdsDUnitTest.java   |  105 +-
 .../MemoryThresholdsOffHeapDUnitTest.java       |   77 +-
 .../gemfire/cache/query/data/PortfolioPdx.java  |    3 +
 .../query/dunit/QueryUsingPoolDUnitTest.java    |   30 +-
 .../cache/query/dunit/RemoteQueryDUnitTest.java |   27 +-
 ...esourceManagerWithQueryMonitorDUnitTest.java |   37 +-
 .../functional/IndexCreationJUnitTest.java      |    2 -
 .../index/CopyOnReadIndexDUnitTest.java         |    9 +-
 .../index/MultiIndexCreationDUnitTest.java      |    7 +-
 .../index/PdxCopyOnReadQueryJUnitTest.java      |    1 +
 .../PutAllWithIndexPerfDUnitDisabledTest.java   |    3 +-
 .../gemstone/gemfire/cache30/CacheTestCase.java |   54 -
 .../cache30/ClientMembershipDUnitTest.java      |    2 +
 .../gemfire/cache30/ClientServerTestCase.java   |    4 +-
 ...ckOverflowRegionCCECompressionDUnitTest.java |   70 -
 ...PersistentRegionCCECompressionDUnitTest.java |   71 -
 .../DistributedAckRegionCCEDUnitTest.java       |    8 +-
 .../DistributedNoAckRegionCCEDUnitTest.java     |    5 -
 ...tributedNoAckRegionCompressionDUnitTest.java |   71 -
 .../cache30/GlobalRegionCCEDUnitTest.java       |    3 -
 .../GlobalRegionCompressionDUnitTest.java       |   70 -
 .../gemfire/cache30/MultiVMRegionTestCase.java  |  216 -
 .../PRBucketSynchronizationDUnitTest.java       |    5 +-
 .../gemfire/cache30/ReconnectDUnitTest.java     |  146 +-
 .../ReconnectedCacheServerDUnitTest.java        |   10 +-
 .../RegionMembershipListenerDUnitTest.java      |   21 +-
 .../gemfire/cache30/TXDistributedDUnitTest.java |   98 +-
 .../AnalyzeSerializablesJUnitTest.java          |   29 -
 .../codeAnalysis/decode/CompiledClass.java      |    4 +-
 .../distributed/DistributedSystemDUnitTest.java |  118 +-
 .../gemfire/distributed/JGroupsJUnitTest.java   |  180 -
 .../gemfire/distributed/LocatorDUnitTest.java   |  539 +--
 .../gemfire/distributed/LocatorJUnitTest.java   |   96 +-
 .../ConsoleDistributionManagerDUnitTest.java    |    2 +-
 .../internal/DistributionManagerDUnitTest.java  |   95 +-
 ...istributionManagerTimeDUnitDisabledTest.java |  220 -
 .../GemFireTimeSyncServiceDUnitTest.java        |  269 --
 .../InternalDistributedSystemJUnitTest.java     |    7 +-
 .../internal/LocalDistributionManagerTest.java  |  484 --
 .../internal/ProductUseLogDUnitTest.java        |    2 +-
 .../membership/MembershipJUnitTest.java         |  233 +-
 .../membership/gms/MembershipManagerHelper.java |  171 +
 .../gms/auth/GMSAuthenticatorJUnitTest.java     |  300 ++
 .../locator/GMSLocatorRecoveryJUnitTest.java    |  170 +
 .../gms/membership/GMSJoinLeaveJUnitTest.java   |  781 +++
 .../gms/membership/StatRecorderJUnitTest.java   |  211 +
 .../fd/GMSHealthMonitorJUnitTest.java           |  444 ++
 .../messenger/GMSQuorumCheckerJUnitTest.java    |  345 ++
 .../membership/gms/messenger/InterceptUDP.java  |   93 +
 .../messenger/JGroupsMessengerJUnitTest.java    |  433 ++
 .../jgroup/MembershipManagerHelper.java         |  189 -
 .../tcpserver/LocatorVersioningJUnitTest.java   |  218 -
 ...cpServerBackwardCompatDUnitDisabledTest.java |   63 +-
 .../tcpserver/TcpServerJUnitDisabledTest.java   |  219 -
 .../internal/tcpserver/TcpServerJUnitTest.java  |  221 +
 .../gemfire/internal/AvailablePortHelper.java   |    2 +-
 ...wardCompatibilitySerializationDUnitTest.java |  307 ++
 ...wardCompatibilitySerializationJUnitTest.java |  315 --
 .../gemstone/gemfire/internal/FDDUnitTest.java  |   18 +-
 .../internal/PdxDeleteFieldDUnitTest.java       |   13 +-
 .../gemfire/internal/PdxRenameDUnitTest.java    |   15 +-
 .../internal/cache/Bug33726JUnitTest.java       |    2 +
 .../internal/cache/Bug41957DUnitTest.java       |    8 +-
 ...ssagesRegionCreationAndDestroyJUnitTest.java |    4 +-
 .../cache/ClientServerGetAllDUnitTest.java      |   38 +-
 .../cache/ClientServerTransactionDUnitTest.java |    2 +-
 .../cache/ConcurrentMapOpsDUnitTest.java        |    2 +-
 .../cache/ConnectDisconnectDUnitTest.java       |   41 +-
 .../cache/execute/Bug51193DUnitTest.java        |    8 +-
 .../PRFunctionExecutionTimeOutDUnitTest.java    |    1 +
 .../internal/cache/ha/Bug48571DUnitTest.java    |    4 +-
 .../internal/cache/ha/Bug48879DUnitTest.java    |    7 +-
 .../cache/partitioned/Bug43684DUnitTest.java    |   32 +-
 .../cache/partitioned/Bug51400DUnitTest.java    |    6 +-
 .../PartitionedRegionLoadModelJUnitTest.java    |    8 +-
 .../cache/partitioned/ShutdownAllDUnitTest.java |   12 +-
 .../cache/tier/sockets/Bug36829DUnitTest.java   |    5 +-
 .../cache/tier/sockets/Bug37805DUnitTest.java   |    3 +-
 .../cache/tier/sockets/CacheServerTestUtil.java |   10 +-
 .../DurableClientQueueSizeDUnitTest.java        |   20 +-
 .../DurableClientReconnectDUnitTest.java        |    2 +-
 .../sockets/DurableClientStatsDUnitTest.java    |   12 +-
 .../sockets/DurableRegistrationDUnitTest.java   |   34 +-
 .../sockets/InterestListFailoverDUnitTest.java  |    5 +-
 .../sockets/UnregisterInterestDUnitTest.java    |    3 +-
 .../versions/RegionVersionVectorJUnitTest.java  |  231 +-
 .../internal/i18n/BasicI18nJUnitTest.java       |   49 +-
 .../log4j/LocalizedMessageJUnitTest.java        |    9 +-
 .../internal/stats50/AtomicStatsJUnitTest.java  |   16 +-
 .../internal/tcp/ConnectionJUnitTest.java       |   71 +
 .../concurrent/ReentrantSemaphoreJUnitTest.java |    1 -
 .../management/ClientHealthStatsDUnitTest.java  |    1 +
 .../management/LocatorManagementDUnitTest.java  |    4 -
 .../gemfire/memcached/IntegrationJUnitTest.java |    3 +
 .../gemfire/redis/RedisDistDUnitTest.java       |   29 +-
 .../protocols/CacheTimeSlowDownDUnitTest.java   |  217 -
 .../GemFireTimeSyncProtocolDUnitTest.java       |  490 --
 .../JGroupsFailureDetectionJUnitTest.java       |  504 --
 .../protocols/JGroupsVersioningJUnitTest.java   |  352 --
 .../test/java/dunit/DistributedTestCase.java    |   58 +-
 .../java/dunit/standalone/DUnitLauncher.java    |   16 +-
 .../java/dunit/standalone/ProcessManager.java   |   12 +-
 .../src/test/java/hydra/log/AnyLogWriter.java   |    2 +-
 .../sanctionedDataSerializables.txt             |  132 +-
 .../codeAnalysis/sanctionedSerializables.txt    |  121 +-
 gemfire-jgroups/build.gradle                    |   39 -
 .../java/com/gemstone/org/jgroups/Address.java  |   46 -
 .../com/gemstone/org/jgroups/BlockEvent.java    |   15 -
 .../java/com/gemstone/org/jgroups/Channel.java  |  508 --
 .../org/jgroups/ChannelClosedException.java     |   27 -
 .../gemstone/org/jgroups/ChannelException.java  |   28 -
 .../gemstone/org/jgroups/ChannelFactory.java    |   38 -
 .../gemstone/org/jgroups/ChannelListener.java   |   20 -
 .../jgroups/ChannelNotConnectedException.java   |   26 -
 .../java/com/gemstone/org/jgroups/Event.java    |  225 -
 .../com/gemstone/org/jgroups/ExitEvent.java     |   14 -
 .../com/gemstone/org/jgroups/GetStateEvent.java |   22 -
 .../java/com/gemstone/org/jgroups/Global.java   |   44 -
 .../java/com/gemstone/org/jgroups/Header.java   |   51 -
 .../java/com/gemstone/org/jgroups/JChannel.java | 1725 -------
 .../gemstone/org/jgroups/JChannelFactory.java   |  129 -
 .../gemstone/org/jgroups/JGroupsVersion.java    |   95 -
 .../com/gemstone/org/jgroups/Membership.java    |  358 --
 .../org/jgroups/MembershipListener.java         |   53 -
 .../com/gemstone/org/jgroups/MergeView.java     |  166 -
 .../java/com/gemstone/org/jgroups/Message.java  |  784 ---
 .../com/gemstone/org/jgroups/Message.java.old   |  711 ---
 .../gemstone/org/jgroups/MessageListener.java   |   34 -
 .../java/com/gemstone/org/jgroups/Receiver.java |   13 -
 .../gemstone/org/jgroups/ReceiverAdapter.java   |   35 -
 .../com/gemstone/org/jgroups/SetStateEvent.java |   37 -
 .../org/jgroups/ShunnedAddressException.java    |   30 -
 .../com/gemstone/org/jgroups/SuspectEvent.java  |   26 -
 .../com/gemstone/org/jgroups/SuspectMember.java |   56 -
 .../org/jgroups/SuspectedException.java         |   21 -
 .../gemstone/org/jgroups/TimeoutException.java  |   43 -
 .../com/gemstone/org/jgroups/Transport.java     |   22 -
 .../com/gemstone/org/jgroups/UpHandler.java     |   18 -
 .../java/com/gemstone/org/jgroups/View.java     |  528 --
 .../java/com/gemstone/org/jgroups/ViewId.java   |  174 -
 .../org/jgroups/blocks/ConnectionTable.java     | 1051 ----
 .../org/jgroups/blocks/ConnectionTableNIO.java  | 1519 ------
 .../jgroups/blocks/DistributedHashtable.java    |  656 ---
 .../jgroups/blocks/DistributedLockManager.java  |  742 ---
 .../org/jgroups/blocks/DistributedQueue.java    |  758 ---
 .../org/jgroups/blocks/DistributedTree.java     |  756 ---
 .../org/jgroups/blocks/GroupRequest.java        |  636 ---
 .../org/jgroups/blocks/GroupRequest.java.old    |  641 ---
 .../com/gemstone/org/jgroups/blocks/Link.java   |  680 ---
 .../com/gemstone/org/jgroups/blocks/Link.txt    |   48 -
 .../org/jgroups/blocks/LockManager.java         |   87 -
 .../blocks/LockMultiLockedException.java        |   26 -
 .../jgroups/blocks/LockNotGrantedException.java |   24 -
 .../blocks/LockNotReleasedException.java        |   24 -
 .../org/jgroups/blocks/LockingException.java    |   38 -
 .../org/jgroups/blocks/LogicalLink.java         |  340 --
 .../blocks/MembershipListenerAdapter.java       |   91 -
 .../org/jgroups/blocks/MessageDispatcher.java   |  845 ----
 .../jgroups/blocks/MessageListenerAdapter.java  |  123 -
 .../gemstone/org/jgroups/blocks/MethodCall.java |  529 --
 .../org/jgroups/blocks/MethodLookup.java        |   15 -
 .../org/jgroups/blocks/NBMessageForm_NIO.java   |   94 -
 .../org/jgroups/blocks/NotificationBus.java     |  458 --
 .../org/jgroups/blocks/PullPushAdapter.java     |  434 --
 .../org/jgroups/blocks/ReplicatedHashtable.java |  530 --
 .../org/jgroups/blocks/ReplicatedTree.java      | 1121 -----
 .../org/jgroups/blocks/ReplicationData.java     |  148 -
 .../org/jgroups/blocks/ReplicationManager.java  |  345 --
 .../org/jgroups/blocks/ReplicationReceiver.java |   69 -
 .../org/jgroups/blocks/RequestCorrelator.java   |  911 ----
 .../org/jgroups/blocks/RequestHandler.java      |   15 -
 .../org/jgroups/blocks/RpcDispatcher.java       |  392 --
 .../org/jgroups/blocks/RspCollector.java        |   18 -
 .../jgroups/blocks/TwoPhaseVotingAdapter.java   |  173 -
 .../jgroups/blocks/TwoPhaseVotingListener.java  |   35 -
 .../org/jgroups/blocks/UpdateException.java     |   19 -
 .../org/jgroups/blocks/VoteException.java       |   19 -
 .../jgroups/blocks/VoteResponseProcessor.java   |   31 -
 .../org/jgroups/blocks/VotingAdapter.java       |  472 --
 .../org/jgroups/blocks/VotingListener.java      |   26 -
 .../com/gemstone/org/jgroups/blocks/Xid.java    |  164 -
 .../gemstone/org/jgroups/blocks/package.html    |   13 -
 .../org/jgroups/conf/ClassConfigurator.java     |  228 -
 .../com/gemstone/org/jgroups/conf/ClassMap.java |   75 -
 .../jgroups/conf/ClassPathEntityResolver.java   |   63 -
 .../org/jgroups/conf/ConfiguratorFactory.java   |  449 --
 .../org/jgroups/conf/MagicNumberReader.java     |  402 --
 .../org/jgroups/conf/PlainConfigurator.java     |   48 -
 .../gemstone/org/jgroups/conf/ProtocolData.java |  130 -
 .../org/jgroups/conf/ProtocolParameter.java     |   64 -
 .../jgroups/conf/ProtocolStackConfigurator.java |   18 -
 .../org/jgroups/conf/XmlConfigurator.java       |  463 --
 .../gemstone/org/jgroups/conf/XmlValidator.java |  146 -
 .../com/gemstone/org/jgroups/conf/package.html  |    5 -
 .../gemstone/org/jgroups/debug/Debugger.java    |  133 -
 .../org/jgroups/debug/JChannelTestHook.java     |   30 -
 .../gemstone/org/jgroups/debug/Profiler.java    |  160 -
 .../org/jgroups/debug/ProtocolSpecificView.java |   24 -
 .../org/jgroups/debug/ProtocolTester.java       |  142 -
 .../org/jgroups/debug/ProtocolView.java         |   90 -
 .../gemstone/org/jgroups/debug/QUEUEView.java   |   28 -
 .../gemstone/org/jgroups/debug/Simulator.java   |  249 -
 .../com/gemstone/org/jgroups/debug/package.html |    5 -
 .../com/gemstone/org/jgroups/gemstonizing.txt   |   28 -
 .../org/jgroups/oswego/concurrent/Barrier.java  |   65 -
 .../oswego/concurrent/BoundedBuffer.java        |  190 -
 .../oswego/concurrent/BoundedChannel.java       |   37 -
 .../oswego/concurrent/BoundedLinkedQueue.java   |  384 --
 .../oswego/concurrent/BoundedPriorityQueue.java |  123 -
 .../concurrent/BrokenBarrierException.java      |   48 -
 .../org/jgroups/oswego/concurrent/Callable.java |   39 -
 .../org/jgroups/oswego/concurrent/Channel.java  |  309 --
 .../jgroups/oswego/concurrent/ClockDaemon.java  |  403 --
 .../org/jgroups/oswego/concurrent/CondVar.java  |  277 --
 .../jgroups/oswego/concurrent/CountDown.java    |  126 -
 .../oswego/concurrent/CyclicBarrier.java        |  299 --
 .../concurrent/DefaultChannelCapacity.java      |   58 -
 .../oswego/concurrent/DirectExecutor.java       |   36 -
 .../org/jgroups/oswego/concurrent/Executor.java |   70 -
 .../oswego/concurrent/FIFOReadWriteLock.java    |  198 -
 .../oswego/concurrent/FIFOSemaphore.java        |   84 -
 .../org/jgroups/oswego/concurrent/FJTask.java   |  535 ---
 .../jgroups/oswego/concurrent/FJTaskRunner.java |  979 ----
 .../oswego/concurrent/FJTaskRunnerGroup.java    |  625 ---
 .../jgroups/oswego/concurrent/FutureResult.java |  209 -
 .../org/jgroups/oswego/concurrent/Heap.java     |  151 -
 .../org/jgroups/oswego/concurrent/Latch.java    |  103 -
 .../jgroups/oswego/concurrent/LayeredSync.java  |   96 -
 .../jgroups/oswego/concurrent/LinkedNode.java   |   29 -
 .../jgroups/oswego/concurrent/LinkedQueue.java  |  192 -
 .../oswego/concurrent/LockedExecutor.java       |   62 -
 .../org/jgroups/oswego/concurrent/Mutex.java    |  173 -
 .../org/jgroups/oswego/concurrent/NullSync.java |   51 -
 .../oswego/concurrent/PooledExecutor.java       |  924 ----
 .../oswego/concurrent/PrioritySemaphore.java    |   96 -
 .../concurrent/PropertyChangeMulticaster.java   |  466 --
 .../org/jgroups/oswego/concurrent/Puttable.java |   68 -
 .../oswego/concurrent/QueuedExecutor.java       |  220 -
 .../oswego/concurrent/QueuedSemaphore.java      |  181 -
 .../oswego/concurrent/ReadWriteLock.java        |   86 -
 .../ReaderPreferenceReadWriteLock.java          |   35 -
 .../oswego/concurrent/ReentrantLock.java        |  151 -
 .../ReentrantWriterPreferenceReadWriteLock.java |  169 -
 .../jgroups/oswego/concurrent/Rendezvous.java   |  422 --
 .../jgroups/oswego/concurrent/Semaphore.java    |  193 -
 .../concurrent/SemaphoreControlledChannel.java  |  164 -
 .../org/jgroups/oswego/concurrent/Slot.java     |   88 -
 .../org/jgroups/oswego/concurrent/Sync.java     |  344 --
 .../oswego/concurrent/SyncCollection.java       |  514 --
 .../org/jgroups/oswego/concurrent/SyncList.java |  327 --
 .../org/jgroups/oswego/concurrent/SyncMap.java  |  314 --
 .../org/jgroups/oswego/concurrent/SyncSet.java  |   82 -
 .../oswego/concurrent/SyncSortedMap.java        |  129 -
 .../oswego/concurrent/SyncSortedSet.java        |  129 -
 .../oswego/concurrent/SynchronizedBoolean.java  |  182 -
 .../oswego/concurrent/SynchronizedByte.java     |  253 -
 .../oswego/concurrent/SynchronizedChar.java     |  176 -
 .../oswego/concurrent/SynchronizedDouble.java   |  181 -
 .../oswego/concurrent/SynchronizedFloat.java    |  181 -
 .../oswego/concurrent/SynchronizedInt.java      |  250 -
 .../oswego/concurrent/SynchronizedLong.java     |  252 -
 .../oswego/concurrent/SynchronizedRef.java      |  107 -
 .../oswego/concurrent/SynchronizedShort.java    |  254 -
 .../oswego/concurrent/SynchronizedVariable.java |  209 -
 .../oswego/concurrent/SynchronousChannel.java   |  379 --
 .../org/jgroups/oswego/concurrent/Takable.java  |   67 -
 .../oswego/concurrent/ThreadFactory.java        |   35 -
 .../oswego/concurrent/ThreadFactoryUser.java    |   62 -
 .../oswego/concurrent/ThreadedExecutor.java     |   40 -
 .../oswego/concurrent/TimedCallable.java        |   68 -
 .../oswego/concurrent/TimeoutException.java     |   53 -
 .../jgroups/oswego/concurrent/TimeoutSync.java  |   75 -
 .../concurrent/VetoableChangeMulticaster.java   |  577 ---
 .../oswego/concurrent/WaitFreeQueue.java        |  208 -
 .../oswego/concurrent/WaitableBoolean.java      |  141 -
 .../jgroups/oswego/concurrent/WaitableByte.java |  238 -
 .../jgroups/oswego/concurrent/WaitableChar.java |  170 -
 .../oswego/concurrent/WaitableDouble.java       |  173 -
 .../oswego/concurrent/WaitableFloat.java        |  173 -
 .../jgroups/oswego/concurrent/WaitableInt.java  |  239 -
 .../jgroups/oswego/concurrent/WaitableLong.java |  239 -
 .../jgroups/oswego/concurrent/WaitableRef.java  |  112 -
 .../oswego/concurrent/WaitableShort.java        |  238 -
 .../concurrent/WaiterPreferenceSemaphore.java   |  155 -
 .../WriterPreferenceReadWriteLock.java          |  337 --
 .../org/jgroups/oswego/concurrent/package.html  |  998 ----
 .../java/com/gemstone/org/jgroups/overview.html |   15 -
 .../java/com/gemstone/org/jgroups/package.html  |    5 -
 .../persistence/CannotConnectException.java     |   55 -
 .../CannotCreateSchemaException.java            |   45 -
 .../persistence/CannotPersistException.java     |   44 -
 .../persistence/CannotRemoveException.java      |   45 -
 .../persistence/CannotRetrieveException.java    |   44 -
 .../persistence/DBPersistenceManager.java       |  877 ----
 .../persistence/FilePersistenceManager.java     |  173 -
 .../jgroups/persistence/PersistenceFactory.java |  207 -
 .../jgroups/persistence/PersistenceManager.java |   69 -
 .../org/jgroups/persistence/package.html        |    5 -
 .../com/gemstone/org/jgroups/primarychanges.txt |   80 -
 .../gemstone/org/jgroups/protocols/AUTH.java    |  454 --
 .../org/jgroups/protocols/AUTOCONF.java         |  249 -
 .../org/jgroups/protocols/AuthHeader.java       |  108 -
 .../gemstone/org/jgroups/protocols/CAUSAL.java  |  296 --
 .../org/jgroups/protocols/COMPRESS.java         |  188 -
 .../org/jgroups/protocols/DEADLOCK.java         |  250 -
 .../gemstone/org/jgroups/protocols/DELAY.java   |  116 -
 .../com/gemstone/org/jgroups/protocols/DESIGN   |  283 --
 .../gemstone/org/jgroups/protocols/DISCARD.java |  150 -
 .../gemstone/org/jgroups/protocols/DUMMY.java   |   85 -
 .../org/jgroups/protocols/DUMMY_TP.java         |   84 -
 .../gemstone/org/jgroups/protocols/Digest.java  |   38 -
 .../org/jgroups/protocols/Discovery.java        |  484 --
 .../gemstone/org/jgroups/protocols/ENCRYPT.java | 1390 ------
 .../org/jgroups/protocols/ENCRYPT1_4.java       |  566 ---
 .../gemstone/org/jgroups/protocols/EXAMPLE.java |  104 -
 .../com/gemstone/org/jgroups/protocols/FC.java  | 1025 ----
 .../com/gemstone/org/jgroups/protocols/FD.java  | 1100 -----
 .../gemstone/org/jgroups/protocols/FD_PID.java  |  640 ---
 .../gemstone/org/jgroups/protocols/FD_PROB.java |  628 ---
 .../org/jgroups/protocols/FD_SIMPLE.java        |  357 --
 .../gemstone/org/jgroups/protocols/FD_SOCK.java | 2654 ----------
 .../org/jgroups/protocols/FD_SOCK.java.new      | 1153 -----
 .../org/jgroups/protocols/FLOWCONTROL.java      |   89 -
 .../org/jgroups/protocols/FLOW_CONTROL.java     |  317 --
 .../gemstone/org/jgroups/protocols/FLUSH.java   |  466 --
 .../gemstone/org/jgroups/protocols/FRAG.java    |  572 ---
 .../gemstone/org/jgroups/protocols/FRAG2.java   |  773 ---
 .../gemstone/org/jgroups/protocols/FRAG3.java   |   48 -
 .../org/jgroups/protocols/FlushRsp.java         |   31 -
 .../org/jgroups/protocols/FragHeader.java       |   80 -
 .../gemstone/org/jgroups/protocols/GMS.java.rmi |  219 -
 .../org/jgroups/protocols/GemFireTimeSync.java  |  720 ---
 .../gemstone/org/jgroups/protocols/HDRS.java    |   53 -
 .../gemstone/org/jgroups/protocols/HTOTAL.java  |  207 -
 .../org/jgroups/protocols/LOOPBACK.java         |  115 -
 .../gemstone/org/jgroups/protocols/LOSS.java    |  118 -
 .../gemstone/org/jgroups/protocols/MERGE.java   |  376 --
 .../gemstone/org/jgroups/protocols/MERGE2.java  |  362 --
 .../gemstone/org/jgroups/protocols/MERGE3.java  |  312 --
 .../org/jgroups/protocols/MERGEFAST.java        |  118 -
 .../protocols/MessageProtocolEXAMPLE.java       |   64 -
 .../protocols/NAKACK.java.MessageProtocol       |  422 --
 .../org/jgroups/protocols/NAKACK.java.separate  |  484 --
 .../org/jgroups/protocols/NakAckHeader.java     |  113 -
 .../org/jgroups/protocols/PARTITIONER.java      |  185 -
 .../gemstone/org/jgroups/protocols/PERF.java    |  284 --
 .../gemstone/org/jgroups/protocols/PERF_TP.java |  172 -
 .../org/jgroups/protocols/PIGGYBACK.java        |  271 --
 .../gemstone/org/jgroups/protocols/PING.java    |  297 --
 .../org/jgroups/protocols/PRINTMETHODS.java     |   64 -
 .../org/jgroups/protocols/PRINTOBJS.java        |  120 -
 .../org/jgroups/protocols/PerfHeader.java       |  451 --
 .../org/jgroups/protocols/PingHeader.java       |   79 -
 .../gemstone/org/jgroups/protocols/PingRsp.java |  107 -
 .../org/jgroups/protocols/PingSender.java       |  109 -
 .../org/jgroups/protocols/PingWaiter.java       |  301 --
 .../gemstone/org/jgroups/protocols/QUEUE.java   |  184 -
 .../jgroups/protocols/RpcProtocolEXAMPLE.java   |   64 -
 .../gemstone/org/jgroups/protocols/SHUFFLE.java |  146 -
 .../gemstone/org/jgroups/protocols/SIZE.java    |  186 -
 .../gemstone/org/jgroups/protocols/SMACK.java   |  392 --
 .../org/jgroups/protocols/STATE_TRANSFER.java   |  448 --
 .../gemstone/org/jgroups/protocols/STATS.java   |  211 -
 .../com/gemstone/org/jgroups/protocols/TCP.java |  308 --
 .../org/jgroups/protocols/TCPGOSSIP.java        |  429 --
 .../gemstone/org/jgroups/protocols/TCPPING.java |  144 -
 .../gemstone/org/jgroups/protocols/TCP_NIO.java |  118 -
 .../gemstone/org/jgroups/protocols/TOTAL.java   | 1055 ----
 .../com/gemstone/org/jgroups/protocols/TP.java  | 2012 --------
 .../gemstone/org/jgroups/protocols/TP.java.mt   | 1522 ------
 .../gemstone/org/jgroups/protocols/TRACE.java   |   47 -
 .../gemstone/org/jgroups/protocols/TUNNEL.java  |  459 --
 .../org/jgroups/protocols/TcpHeader.java        |   55 -
 .../org/jgroups/protocols/TpHeader.java         |   64 -
 .../protocols/TransportedVectorTime.java        |  185 -
 .../org/jgroups/protocols/TunnelHeader.java     |   47 -
 .../com/gemstone/org/jgroups/protocols/UDP.java | 1462 ------
 .../gemstone/org/jgroups/protocols/UDP.java.mt  | 1005 ----
 .../jgroups/protocols/UDP.java.packethandler    |  592 ---
 .../gemstone/org/jgroups/protocols/UDP_NIO.java | 1567 ------
 .../gemstone/org/jgroups/protocols/UNICAST.java |  977 ----
 .../org/jgroups/protocols/UdpHeader.java        |   62 -
 .../org/jgroups/protocols/VERIFY_SUSPECT.java   |  470 --
 .../org/jgroups/protocols/VIEW_ENFORCER.java    |   81 -
 .../org/jgroups/protocols/VIEW_SYNC.java        |  499 --
 .../org/jgroups/protocols/VectorTime.java       |  270 --
 .../gemstone/org/jgroups/protocols/WANPING.java |  106 -
 .../gemstone/org/jgroups/protocols/WANPIPE.java |  441 --
 .../org/jgroups/protocols/WanPipeAddress.java   |  140 -
 .../gemstone/org/jgroups/protocols/dump2.log    |    0
 .../jgroups/protocols/obsolete/ENCRYPT.java.txt |  408 --
 .../org/jgroups/protocols/obsolete/FC.java.txt  |  643 ---
 .../jgroups/protocols/obsolete/FD_RAND.java.txt |  287 --
 .../jgroups/protocols/obsolete/FD_SHUN.java.txt |  323 --
 .../org/jgroups/protocols/obsolete/TCP.java.txt |  493 --
 .../org/jgroups/protocols/obsolete/UDP.java.txt | 1921 --------
 .../jgroups/protocols/obsolete/UNIFORM.java.txt |  349 --
 .../gemstone/org/jgroups/protocols/package.html |    6 -
 .../jgroups/protocols/pbcast/ClientGmsImpl.java |  907 ----
 .../jgroups/protocols/pbcast/CoordGmsImpl.java  | 1103 -----
 .../org/jgroups/protocols/pbcast/DESIGN         |  478 --
 .../org/jgroups/protocols/pbcast/Digest.java    |  534 ---
 .../jgroups/protocols/pbcast/Digest.java.old    |  558 ---
 .../org/jgroups/protocols/pbcast/FD.java        |  273 --
 .../org/jgroups/protocols/pbcast/GMS.java       | 2732 -----------
 .../org/jgroups/protocols/pbcast/GmsImpl.java   |  111 -
 .../org/jgroups/protocols/pbcast/Gossip.java    |  134 -
 .../org/jgroups/protocols/pbcast/JoinRsp.java   |  126 -
 .../org/jgroups/protocols/pbcast/MergeData.java |  118 -
 .../org/jgroups/protocols/pbcast/NAKACK.java    | 1631 -------
 .../jgroups/protocols/pbcast/NakAckHeader.java  |  148 -
 .../org/jgroups/protocols/pbcast/PBCAST.java    | 1043 ----
 .../protocols/pbcast/ParticipantGmsImpl.java    |  371 --
 .../jgroups/protocols/pbcast/PbcastHeader.java  |  110 -
 .../org/jgroups/protocols/pbcast/README         |  140 -
 .../org/jgroups/protocols/pbcast/STABLE.java    |  907 ----
 .../jgroups/protocols/pbcast/STABLE.java.latest |  897 ----
 .../jgroups/protocols/pbcast/STABLE.java.new    |  890 ----
 .../jgroups/protocols/pbcast/STABLE.java.old    |  855 ----
 .../protocols/pbcast/STATE_TRANSFER.java        |  461 --
 .../org/jgroups/protocols/pbcast/package.html   |    5 -
 .../org/jgroups/protocols/ring/RingNode.java    |   26 -
 .../protocols/ring/RingNodeFlowControl.java     |  135 -
 .../org/jgroups/protocols/ring/RingToken.java   |  245 -
 .../org/jgroups/protocols/ring/TcpRingNode.java |  205 -
 .../protocols/ring/TokenLostException.java      |   63 -
 .../org/jgroups/protocols/ring/package.html     |    5 -
 .../org/jgroups/spi/GFBasicAdapter.java         |  112 -
 .../gemstone/org/jgroups/spi/GFPeerAdapter.java |  185 -
 .../jgroups/stack/AckMcastReceiverWindow.java   |  169 -
 .../org/jgroups/stack/AckMcastSenderWindow.java |  601 ---
 .../org/jgroups/stack/AckReceiverWindow.java    |  184 -
 .../org/jgroups/stack/AckSenderWindow.java      |  354 --
 .../org/jgroups/stack/BoundedLinkedHashMap.java |   91 -
 .../org/jgroups/stack/Configurator.java         |  764 ---
 .../org/jgroups/stack/GFBasicAdapterImpl.java   |  596 ---
 .../org/jgroups/stack/GFPeerAdapterImpl.java    |  338 --
 .../org/jgroups/stack/GossipClient.java         |  817 ----
 .../gemstone/org/jgroups/stack/GossipData.java  |  232 -
 .../org/jgroups/stack/GossipServer.java         |  633 ---
 .../gemstone/org/jgroups/stack/Interval.java    |   40 -
 .../gemstone/org/jgroups/stack/IpAddress.java   |  780 ---
 .../org/jgroups/stack/LogicalAddress.java       |  370 --
 .../org/jgroups/stack/MessageProtocol.java      |  243 -
 .../org/jgroups/stack/NakReceiverWindow.java    |  914 ----
 .../gemstone/org/jgroups/stack/Protocol.java    |  837 ----
 .../org/jgroups/stack/ProtocolObserver.java     |   81 -
 .../org/jgroups/stack/ProtocolStack.java        |  506 --
 .../org/jgroups/stack/Retransmitter.java        |  480 --
 .../com/gemstone/org/jgroups/stack/Router.java  |  577 ---
 .../gemstone/org/jgroups/stack/RouterStub.java  |  419 --
 .../gemstone/org/jgroups/stack/RpcProtocol.java |  166 -
 .../org/jgroups/stack/SockCreatorImpl.java      |   59 -
 .../org/jgroups/stack/StateTransferInfo.java    |   64 -
 .../com/gemstone/org/jgroups/stack/package.html |    5 -
 .../gemstone/org/jgroups/util/AckCollector.java |  149 -
 .../gemstone/org/jgroups/util/BoundedList.java  |   53 -
 .../com/gemstone/org/jgroups/util/Buffer.java   |   64 -
 .../com/gemstone/org/jgroups/util/Command.java  |   16 -
 .../com/gemstone/org/jgroups/util/CondVar.java  |  139 -
 .../org/jgroups/util/ConnectionWatcher.java     |   41 -
 .../jgroups/util/ContextObjectInputStream.java  |   91 -
 .../util/ExposedBufferedInputStream.java        |   61 -
 .../util/ExposedBufferedOutputStream.java       |   44 -
 .../util/ExposedByteArrayInputStream.java       |   58 -
 .../util/ExposedByteArrayOutputStream.java      |   31 -
 .../jgroups/util/ExposedDataOutputStream.java   |   31 -
 .../org/jgroups/util/ExternalStrings.java       |  832 ----
 .../gemstone/org/jgroups/util/GFLogWriter.java  |   73 -
 .../org/jgroups/util/GFStringIdImpl.java        |   84 -
 .../org/jgroups/util/GemFireTracer.java         |  473 --
 .../org/jgroups/util/GetNetworkInterfaces.java  |   34 -
 .../org/jgroups/util/LinkedListQueue.java       |  422 --
 .../com/gemstone/org/jgroups/util/List.java     |  462 --
 .../jgroups/util/MagicObjectInputStream.java    |   55 -
 .../jgroups/util/MagicObjectOutputStream.java   |   60 -
 .../gemstone/org/jgroups/util/Marshaller.java   |  152 -
 .../org/jgroups/util/NullReadWriteLock.java     |   25 -
 .../com/gemstone/org/jgroups/util/NullSync.java |   26 -
 .../gemstone/org/jgroups/util/PrintXMLTree.java |  168 -
 .../com/gemstone/org/jgroups/util/Promise.java  |  162 -
 .../com/gemstone/org/jgroups/util/Proxy.java    |  870 ----
 .../com/gemstone/org/jgroups/util/Queue.java    |  653 ---
 .../org/jgroups/util/Queue.java.concurrent      |  113 -
 .../com/gemstone/org/jgroups/util/Queue2.java   |  715 ---
 .../org/jgroups/util/QueueClosedException.java  |   29 -
 .../com/gemstone/org/jgroups/util/Range.java    |   58 -
 .../org/jgroups/util/ReentrantLatch.java        |   65 -
 .../org/jgroups/util/ReusableThread.java        |  295 --
 .../java/com/gemstone/org/jgroups/util/Rsp.java |   82 -
 .../com/gemstone/org/jgroups/util/RspList.java  |  193 -
 .../gemstone/org/jgroups/util/Scheduler.java    |  270 --
 .../org/jgroups/util/SchedulerListener.java     |   29 -
 .../gemstone/org/jgroups/util/SockCreator.java  |   40 -
 .../com/gemstone/org/jgroups/util/Stack.java    |  108 -
 .../gemstone/org/jgroups/util/Streamable.java   |   26 -
 .../org/jgroups/util/StreamableFixedID.java     |   35 -
 .../com/gemstone/org/jgroups/util/StringId.java |   58 -
 .../gemstone/org/jgroups/util/ThreadPool.java   |  105 -
 .../org/jgroups/util/TimeScheduler.java         |  720 ---
 .../gemstone/org/jgroups/util/TimedWriter.java  |  295 --
 .../com/gemstone/org/jgroups/util/Util.java     | 1869 --------
 .../org/jgroups/util/VersionedStreamable.java   |   34 -
 .../com/gemstone/org/jgroups/util/package.html  |    5 -
 .../java/com/gemstone/org/jgroups/util/todo.txt |   80 -
 .../gemstone/org/jgroups/conf/jg-magic-map.dtd  |   55 -
 .../gemstone/org/jgroups/conf/jg-magic-map.xml  |  269 --
 .../com/gemstone/org/jgroups/log4j2-default.xml |   21 -
 .../org/jgroups/stack/jboss-service.xml         |  146 -
 .../gemstone/org/jgroups/JChannelJUnitTest.java |  287 --
 settings.gradle                                 |    1 -
 732 files changed, 23803 insertions(+), 141457 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d63113c6/build.gradle
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d63113c6/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d63113c6/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index 5399d28,fcaf99d..0552641
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@@ -407,7 -404,7 +404,7 @@@ public class MemoryThresholdsOffHeapDUn
    }
    
    public void testGettersAndSetters() {
-     getSystem(getServerProperties(0));
 -    getSystem(getServerProperties());
++    getSystem(getOffHeapProperties());
      ResourceManager rm = getCache().getResourceManager();
      assertEquals(0.0f, rm.getCriticalOffHeapPercentage());
      assertEquals(0.0f, rm.getEvictionOffHeapPercentage());
@@@ -773,7 -768,7 +768,7 @@@
          regionName, true/*createPR*/, false/*notifyBySubscription*/, redundancy);
      accessor.invoke(new SerializableCallable() {
        public Object call() throws Exception {
-         getSystem(getServerProperties(mcastPort));
 -        getSystem(getServerProperties());
++        getSystem(getOffHeapProperties());
          getCache();
          AttributesFactory factory = new AttributesFactory();        
          PartitionAttributesFactory paf = new PartitionAttributesFactory();
@@@ -1116,7 -1110,7 +1110,7 @@@
      @Override
      public void run2() throws CacheException {
        // Assert some level of connectivity
-       getSystem(getServerProperties(mcastPort));      
 -      getSystem(getServerProperties());      
++      getSystem(getOffHeapProperties());      
        InternalResourceManager irm = (InternalResourceManager)getCache().getResourceManager();
        irm.setCriticalOffHeapPercentage(90f);
        AttributesFactory<Integer, String> af = new AttributesFactory<Integer, String>();
@@@ -1614,7 -1606,7 +1606,7 @@@
  
      server.invoke(new SerializableCallable() {
        public Object call() throws Exception {
-         getSystem(getServerProperties(mcastPort));
 -        getSystem(getServerProperties());
++        getSystem(getOffHeapProperties());
          GemFireCacheImpl cache = (GemFireCacheImpl)getCache();
  
          InternalResourceManager irm = cache.getResourceManager();
@@@ -1819,8 -1811,9 +1811,9 @@@
      });
    }
    
 -  private Properties getServerProperties() {
 +  private Properties getOffHeapProperties() {
      Properties p = new Properties();
+     p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+getDUnitLocatorPort()+"]");
      p.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m");
      return p;
    }