You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2015/10/12 20:43:58 UTC

[30/30] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-189-new

Merge remote-tracking branch 'origin/develop' into feature/GEODE-189-new


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

Branch: refs/heads/feature/GEODE-189-new
Commit: 534e200de875c223a3e1fac52ca3366782a3b685
Parents: 326a82a 17fdf57
Author: Kirk Lund <kl...@pivotal.io>
Authored: Mon Oct 12 11:42:47 2015 -0700
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Mon Oct 12 11:42:47 2015 -0700

----------------------------------------------------------------------
 README.md                                       |    2 +-
 build.gradle                                    |    9 +
 .../gemfire/admin/GemFireMemberStatus.java      |   13 +-
 .../gemfire/admin/SystemMemberBridgeServer.java |    5 +-
 .../gemfire/admin/SystemMemberCache.java        |   27 -
 .../DistributedSystemHealthMonitor.java         |    2 +-
 .../admin/internal/SystemMemberCacheImpl.java   |   17 +-
 .../jmx/internal/SystemMemberCacheJmxImpl.java  |   13 -
 .../gemfire/cache/AttributesFactory.java        |   31 -
 .../java/com/gemstone/gemfire/cache/Cache.java  |   27 -
 .../gemfire/cache/DynamicRegionFactory.java     |  121 +-
 .../gemfire/cache/client/PoolFactory.java       |   10 +-
 .../cache/client/internal/AbstractOp.java       |    2 +-
 .../cache/client/internal/BridgePoolImpl.java   |  479 -----
 .../internal/BridgeServerLoadMessage.java       |   99 --
 .../client/internal/CacheServerLoadMessage.java |   99 ++
 .../cache/client/internal/DestroyOp.java        |    5 -
 .../client/internal/EndpointManagerImpl.java    |    8 +-
 .../internal/ExplicitConnectionSourceImpl.java  |   85 +-
 .../gemfire/cache/client/internal/GetOp.java    |    5 -
 .../gemfire/cache/client/internal/PoolImpl.java |   14 +-
 .../gemfire/cache/client/internal/PutOp.java    |    5 -
 .../cache/client/internal/QueueManagerImpl.java |   14 +-
 .../cache/client/internal/QueueStateImpl.java   |    6 +-
 .../internal/RegisterDataSerializersOp.java     |    8 +-
 .../internal/RegisterInstantiatorsOp.java       |    8 +-
 .../client/internal/ServerRegionProxy.java      |   44 +-
 .../internal/FunctionServiceManager.java        |    3 +-
 .../cache/query/internal/CompiledSelect.java    |   34 +-
 .../cache/query/internal/DefaultQuery.java      |    9 +-
 .../gemfire/cache/server/ServerLoadProbe.java   |   10 +-
 .../gemfire/cache/server/ServerMetrics.java     |   10 +-
 .../cache/server/internal/LoadMonitor.java      |   12 +-
 .../gemfire/cache/util/BridgeClient.java        |  156 --
 .../gemfire/cache/util/BridgeLoader.java        |  607 -------
 .../gemfire/cache/util/BridgeMembership.java    |   55 -
 .../cache/util/BridgeMembershipEvent.java       |   23 -
 .../cache/util/BridgeMembershipListener.java    |   41 -
 .../util/BridgeMembershipListenerAdapter.java   |   43 -
 .../gemfire/cache/util/BridgeServer.java        |  442 -----
 .../gemfire/cache/util/BridgeWriter.java        |  795 ---------
 .../cache/util/BridgeWriterException.java       |   48 -
 .../util/EndpointDoesNotExistException.java     |   34 -
 .../gemfire/cache/util/EndpointException.java   |   61 -
 .../cache/util/EndpointExistsException.java     |   28 -
 .../cache/util/EndpointInUseException.java      |   27 -
 .../util/IncompatibleVersionException.java      |   47 -
 .../util/ServerRefusedConnectionException.java  |   36 -
 .../UniversalMembershipListenerAdapter.java     |  352 ----
 .../cache/util/UnknownVersionException.java     |   39 -
 .../gemfire/cache/util/VersionException.java    |   45 -
 .../gemstone/gemfire/cache/util/package.html    |    3 -
 .../gemfire/distributed/ServerLauncher.java     |    4 +-
 .../FunctionExecutionPooledExecutor.java        |    7 +-
 .../internal/InternalDistributedSystem.java     |   12 +-
 .../internal/PooledExecutorWithDMStats.java     |    7 +-
 .../distributed/internal/ServerLocator.java     |   10 +-
 .../jgroup/JGroupMembershipManager.java         |    6 +-
 .../gemstone/gemfire/internal/DSFIDFactory.java |   12 +-
 .../internal/DataSerializableFixedID.java       |    6 +-
 .../internal/admin/ClientStatsManager.java      |    7 -
 .../gemfire/internal/admin/GemFireVM.java       |    2 +-
 .../admin/remote/BridgeServerResponse.java      |   18 +-
 .../admin/remote/DurableClientInfoResponse.java |    4 +-
 .../admin/remote/RemoteBridgeServer.java        |   10 +-
 .../internal/admin/remote/RemoteCacheInfo.java  |    6 +-
 .../internal/admin/remote/RemoteGemFireVM.java  |    2 +-
 .../internal/cache/AbstractBridgeServer.java    |  425 -----
 .../internal/cache/AbstractCacheServer.java     |  398 +++++
 .../gemfire/internal/cache/AbstractRegion.java  |   52 -
 .../gemfire/internal/cache/BridgeObserver.java  |   89 -
 .../internal/cache/BridgeObserverAdapter.java   |  107 --
 .../internal/cache/BridgeObserverHolder.java    |   53 -
 .../internal/cache/BridgeRegionEventImpl.java   |  108 --
 .../internal/cache/BridgeServerAdvisor.java     |  165 --
 .../internal/cache/BridgeServerImpl.java        |  816 ---------
 .../gemfire/internal/cache/BucketAdvisor.java   |    2 +-
 .../gemfire/internal/cache/CacheConfig.java     |    8 +-
 .../internal/cache/CacheServerAdvisor.java      |  164 ++
 .../gemfire/internal/cache/CacheServerImpl.java |  812 +++++++++
 .../internal/cache/ClientRegionEventImpl.java   |  108 ++
 .../internal/cache/ClientServerObserver.java    |   90 +
 .../cache/ClientServerObserverAdapter.java      |  107 ++
 .../cache/ClientServerObserverHolder.java       |   53 +
 .../internal/cache/DestroyRegionOperation.java  |    6 +-
 .../cache/DistributedClearOperation.java        |    6 +-
 .../internal/cache/DistributedRegion.java       |    6 -
 .../gemfire/internal/cache/ExpiryTask.java      |   38 +-
 .../cache/FindDurableQueueProcessor.java        |    4 +-
 .../internal/cache/GemFireCacheImpl.java        |   92 +-
 .../gemfire/internal/cache/GridAdvisor.java     |    6 +-
 .../gemfire/internal/cache/LocalRegion.java     |   48 +-
 .../internal/cache/PartitionedRegion.java       |    8 +-
 .../gemfire/internal/cache/PoolFactoryImpl.java |  171 +-
 .../gemfire/internal/cache/PoolManagerImpl.java |   19 -
 .../gemfire/internal/cache/RegionEventImpl.java |    2 +-
 .../internal/cache/doc-files/properties.html    |    4 +-
 .../cache/execute/InternalFunctionService.java  |    4 +-
 .../internal/cache/ha/HARegionQueue.java        |    6 +-
 .../PartitionedRegionObserverHolder.java        |    2 +-
 .../internal/cache/tier/ConnectionProxy.java    |  160 +-
 .../cache/tier/InternalBridgeMembership.java    |  715 --------
 .../cache/tier/InternalClientMembership.java    |  617 +++++++
 .../cache/tier/sockets/AcceptorImpl.java        |   20 +-
 .../cache/tier/sockets/CacheClientNotifier.java |   16 +-
 .../cache/tier/sockets/CacheClientProxy.java    |    6 +-
 .../cache/tier/sockets/CacheClientUpdater.java  |   12 +-
 .../tier/sockets/ClientBlacklistProcessor.java  |    4 +-
 .../RemoveClientFromBlacklistMessage.java       |    4 +-
 .../cache/tier/sockets/ServerConnection.java    |    8 +-
 .../doc-files/communication-architecture.fig    |    4 +-
 .../cache/xmlcache/BridgeServerCreation.java    |  249 ---
 .../internal/cache/xmlcache/CacheCreation.java  |   47 +-
 .../cache/xmlcache/CacheServerCreation.java     |  238 +++
 .../cache/xmlcache/CacheXmlGenerator.java       |   41 +-
 .../internal/cache/xmlcache/CacheXmlParser.java |   18 +-
 .../cache/xmlcache/ClientCacheCreation.java     |    5 -
 .../xmlcache/RegionAttributesCreation.java      |    9 -
 .../gemfire/internal/i18n/LocalizedStrings.java |   20 +-
 .../internal/i18n/ParentLocalizedStrings.java   |   81 +-
 .../internal/beans/CacheServerBridge.java       |   18 +-
 .../beans/GatewayReceiverMBeanBridge.java       |    4 +-
 .../internal/beans/ManagementAdapter.java       |   42 +-
 .../management/internal/beans/ServerBridge.java |    6 +-
 .../cli/functions/ContunuousQueryFunction.java  |    4 +-
 .../functions/GetMemberInformationFunction.java |    4 +-
 .../management/membership/ClientMembership.java |    8 +-
 .../util/concurrent/SynchronousQueueNoSpin.java | 1144 ------------
 .../gemfire/cache/cache-9.0.xsd                 |   26 -
 .../batterytest/greplogs/ExpectedStrings.java   |    3 +-
 .../com/gemstone/gemfire/TXExpiryJUnitTest.java |  505 +++---
 .../cache/AttributesFactoryJUnitTest.java       |   18 -
 .../gemstone/gemfire/cache/ClientHelper.java    |    1 -
 .../cache/ConnectionPoolAndLoaderDUnitTest.java |    4 +-
 .../internal/AutoConnectionSourceDUnitTest.java |   23 +-
 .../AutoConnectionSourceWithUDPDUnitTest.java   |    4 +-
 .../internal/ConnectionPoolImplJUnitTest.java   |   11 +-
 .../internal/LocatorLoadBalancingDUnitTest.java |   10 +-
 .../cache/client/internal/LocatorTestBase.java  |   12 +-
 .../management/MemoryThresholdsDUnitTest.java   |    4 +-
 .../MemoryThresholdsOffHeapDUnitTest.java       |    4 +-
 .../gemfire/cache/query/QueryJUnitTest.java     |   91 +
 .../query/dunit/PdxStringQueryDUnitTest.java    |   16 +-
 .../query/dunit/QueryUsingPoolDUnitTest.java    |   12 +-
 .../cache/query/dunit/RemoteQueryDUnitTest.java |   90 +-
 ...esourceManagerWithQueryMonitorDUnitTest.java |    4 +-
 .../cache/query/functional/GroupByTestImpl.java |    2 +-
 .../query/functional/StructSetOrResultsSet.java |  260 ++-
 ...rrentIndexInitOnOverflowRegionDUnitTest.java |    4 +-
 .../cache30/BridgeMembershipDUnitTest.java      | 1642 ------------------
 .../BridgeMembershipSelectorDUnitTest.java      |   16 -
 .../gemfire/cache30/BridgeTestCase.java         |  376 ----
 .../gemfire/cache30/BridgeWriterDUnitTest.java  |  418 -----
 .../cache30/BridgeWriterSelectorDUnitTest.java  |   16 -
 .../gemfire/cache30/Bug38741DUnitTest.java      |   10 +-
 .../gemfire/cache30/CacheXml30DUnitTest.java    |  127 --
 .../gemfire/cache30/CacheXml40DUnitTest.java    |    8 +-
 .../gemfire/cache30/CacheXml41DUnitTest.java    |   28 +-
 .../gemfire/cache30/CacheXml45DUnitTest.java    |    4 +-
 .../gemfire/cache30/CacheXml51DUnitTest.java    |    8 +-
 .../gemfire/cache30/CacheXml57DUnitTest.java    |    1 -
 .../cache30/ClientMembershipDUnitTest.java      | 1642 ++++++++++++++++++
 .../ClientMembershipSelectorDUnitTest.java      |   16 +
 .../ClientRegisterInterestDUnitTest.java        |  418 +++++
 ...ClientRegisterInterestSelectorDUnitTest.java |   16 +
 .../gemfire/cache30/ClientServerTestCase.java   |  376 ++++
 .../AbstractServerLauncherJUnitTestCase.java    |    4 +-
 .../ServerLauncherLocalJUnitTest.java           |    4 +-
 .../ServerLauncherRemoteJUnitTest.java          |    8 +-
 .../internal/ProductUseLogDUnitTest.java        |    2 +-
 .../disttx/DistributedTransactionDUnitTest.java |    4 +-
 .../gemstone/gemfire/internal/FDDUnitTest.java  |   12 +-
 .../internal/cache/Bug39079DUnitTest.java       |    6 +-
 .../internal/cache/Bug41957DUnitTest.java       |    6 +-
 ...ssagesRegionCreationAndDestroyJUnitTest.java |   10 +-
 .../cache/ClientServerGetAllDUnitTest.java      |   40 +-
 .../cache/ClientServerTransactionDUnitTest.java |    6 +-
 .../cache/ConcurrentMapOpsDUnitTest.java        |    6 +-
 .../cache/DeltaPropagationDUnitTest.java        |    8 +-
 .../cache/DeltaPropagationStatsDUnitTest.java   |    2 +-
 .../internal/cache/DiskRegionJUnitTest.java     |    9 +-
 .../internal/cache/EventTrackerDUnitTest.java   |    8 +-
 .../internal/cache/GridAdvisorDUnitTest.java    |  106 +-
 .../internal/cache/HABug36773DUnitTest.java     |    8 +-
 .../HAOverflowMemObjectSizerDUnitTest.java      |   12 +-
 .../control/RebalanceOperationDUnitTest.java    |    5 +-
 .../cache/execute/Bug51193DUnitTest.java        |    4 +-
 .../internal/cache/functions/TestFunction.java  |   10 +-
 .../cache/ha/Bug36853EventsExpiryDUnitTest.java |    8 +-
 .../internal/cache/ha/Bug48571DUnitTest.java    |    2 +-
 .../cache/ha/EventIdOptimizationDUnitTest.java  |   12 +-
 .../internal/cache/ha/FailoverDUnitTest.java    |   22 +-
 .../internal/cache/ha/HABugInPutDUnitTest.java  |    8 +-
 .../internal/cache/ha/HAClearDUnitTest.java     |   10 +-
 .../cache/ha/HAConflationDUnitTest.java         |    8 +-
 .../internal/cache/ha/HADuplicateDUnitTest.java |   10 +-
 .../cache/ha/HAEventIdPropagationDUnitTest.java |   10 +-
 .../internal/cache/ha/HAGIIDUnitTest.java       |   14 +-
 .../cache/ha/HARQueueNewImplDUnitTest.java      |   66 +-
 .../cache/ha/HASlowReceiverDUnitTest.java       |   10 +-
 .../ha/OperationsPropagationDUnitTest.java      |    8 +-
 .../internal/cache/ha/PutAllDUnitTest.java      |   12 +-
 .../cache/ha/StatsBugDUnitDisabledTest.java     |   14 +-
 .../cache/partitioned/Bug43684DUnitTest.java    |    4 +-
 .../fixed/FixedPartitioningTestBase.java        |    6 +-
 .../tier/sockets/AcceptorImplJUnitTest.java     |   62 +-
 ...rdCompatibilityCommandDUnitDisabledTest.java |  235 ---
 ...CompatibilityHandshakeDUnitDisabledTest.java |  218 ---
 ...mpatibilityHigherVersionClientDUnitTest.java |    4 +-
 ...rdCompatibilityMessageDUnitDisabledTest.java |  299 ----
 .../BridgeServerMaxConnectionsJUnitTest.java    |  221 ---
 ...geServerSelectorMaxConnectionsJUnitTest.java |   19 -
 .../tier/sockets/BridgeWriterMiscDUnitTest.java | 1384 ---------------
 .../BridgeWriterMiscSelectorDUnitTest.java      |   27 -
 .../cache/tier/sockets/Bug36269DUnitTest.java   |    4 +-
 .../cache/tier/sockets/Bug36457DUnitTest.java   |   18 +-
 .../cache/tier/sockets/Bug36805DUnitTest.java   |    6 +-
 .../cache/tier/sockets/Bug36995DUnitTest.java   |   11 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java   |   10 +-
 .../CacheServerMaxConnectionsJUnitTest.java     |  220 +++
 ...heServerSelectorMaxConnectionsJUnitTest.java |   19 +
 .../cache/tier/sockets/CacheServerTestUtil.java |   51 +-
 .../CacheServerTransactionsDUnitTest.java       |    4 +-
 .../tier/sockets/ClearPropagationDUnitTest.java |    4 +-
 .../tier/sockets/ClientConflationDUnitTest.java |   20 +-
 .../sockets/ClientHealthMonitorJUnitTest.java   |    6 +-
 .../sockets/ClientInterestNotifyDUnitTest.java  |   14 +-
 .../tier/sockets/ClientServerMiscDUnitTest.java | 1381 +++++++++++++++
 .../ClientServerMiscSelectorDUnitTest.java      |   27 +
 .../cache/tier/sockets/ConflationDUnitTest.java |   24 +-
 .../tier/sockets/ConnectionProxyJUnitTest.java  |  257 +--
 .../DataSerializerPropogationDUnitTest.java     |   36 +-
 .../DestroyEntryPropagationDUnitTest.java       |   12 +-
 .../DurableClientReconnectDUnitTest.java        |   10 +-
 .../sockets/DurableClientStatsDUnitTest.java    |   10 +-
 .../sockets/DurableRegistrationDUnitTest.java   |    8 +-
 .../sockets/DurableResponseMatrixDUnitTest.java |   10 +-
 .../sockets/EventIDVerificationDUnitTest.java   |   10 +-
 .../ForceInvalidateEvictionDUnitTest.java       |   10 +-
 .../cache/tier/sockets/HAInterestBaseTest.java  |   64 +-
 .../tier/sockets/HAInterestPart2DUnitTest.java  |   12 +-
 .../sockets/HAStartupAndFailoverDUnitTest.java  |   81 +-
 .../tier/sockets/InterestListDUnitTest.java     |    4 +-
 .../sockets/InterestListEndpointDUnitTest.java  |   18 +-
 .../sockets/InterestListFailoverDUnitTest.java  |    6 +-
 .../sockets/InterestListRecoveryDUnitTest.java  |   10 +-
 .../sockets/InterestResultPolicyDUnitTest.java  |    4 +-
 .../tier/sockets/RedundancyLevelJUnitTest.java  |   14 +-
 .../sockets/RedundancyLevelPart1DUnitTest.java  |    4 +-
 .../sockets/RedundancyLevelPart3DUnitTest.java  |    6 +-
 .../tier/sockets/RedundancyLevelTestBase.java   |   51 +-
 .../tier/sockets/RegionCloseDUnitTest.java      |   14 +-
 ...erInterestBeforeRegionCreationDUnitTest.java |    6 +-
 .../sockets/RegisterInterestKeysDUnitTest.java  |    4 +-
 .../sockets/ReliableMessagingDUnitTest.java     |   24 +-
 .../internal/cache/tier/sockets/TestPut.java    |   53 -
 .../sockets/UpdatePropagationDUnitTest.java     |   10 +-
 ...UpdatesFromNonInterestEndPointDUnitTest.java |    4 +-
 ...ersalMembershipListenerAdapterDUnitTest.java |   32 +-
 .../pdx/PdxFormatterPutGetJUnitTest.java        |    4 +-
 .../test/java/dunit/DistributedTestCase.java    |    4 +-
 .../gemfire/codeAnalysis/excludedClasses.txt    |    2 +-
 .../sanctionedDataSerializables.txt             |   10 +-
 .../codeAnalysis/sanctionedSerializables.txt    |    9 -
 .../tier/sockets/RedundancyLevelJUnitTest.xml   |   21 +-
 265 files changed, 8527 insertions(+), 15039 deletions(-)
----------------------------------------------------------------------


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