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/12/22 20:26:36 UTC

[34/35] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-217

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


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

Branch: refs/heads/feature/GEODE-217
Commit: 76bca9ee4d0509fe6d407e7bfcb83d09321412e5
Parents: 9283f26 625ea36
Author: Kirk Lund <kl...@pivotal.io>
Authored: Tue Dec 22 09:19:19 2015 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Tue Dec 22 09:19:19 2015 -0800

----------------------------------------------------------------------
 gemfire-core/build.gradle                       |   10 +-
 .../cache/query/internal/QueryMonitor.java      |    8 +-
 .../distributed/internal/InternalLocator.java   |    2 +-
 .../internal/SharedConfiguration.java           |    1 +
 .../internal/direct/DirectChannel.java          |    2 +-
 .../internal/locks/DLockGrantor.java            |    5 +-
 .../membership/InternalDistributedMember.java   |   13 +-
 .../internal/membership/NetMember.java          |    4 +
 .../internal/membership/gms/GMSMember.java      |    7 +-
 .../membership/gms/fd/GMSHealthMonitor.java     |  126 +-
 .../membership/gms/messenger/Transport.java     |   26 +
 .../internal/tcpserver/TcpClient.java           |    2 +-
 .../internal/tcpserver/TcpServer.java           |    2 +-
 .../gemfire/internal/AvailablePort.java         |  103 +-
 .../tier/sockets/ClientProxyMembershipID.java   |   15 +-
 .../internal/cache/tier/sockets/HandShake.java  |   16 +-
 .../gemfire/internal/offheap/Chunk.java         |   26 +-
 .../management/internal/cli/CliUtil.java        |    2 +-
 .../management/internal/cli/Launcher.java       |    4 +-
 .../internal/cli/commands/ShellCommands.java    |    4 +-
 .../internal/cli/result/TableBuilder.java       |    9 +-
 .../internal/cli/result/TableBuilderHelper.java |   18 +-
 .../management/internal/cli/shell/Gfsh.java     |   15 +-
 .../internal/cli/shell/jline/ANSIBuffer.java    |  433 ++++
 .../internal/cli/shell/jline/ANSIHandler.java   |    5 +-
 .../cli/shell/jline/CygwinMinttyTerminal.java   |  137 +-
 .../internal/cli/shell/jline/GfshHistory.java   |   13 +-
 .../shell/jline/GfshUnsupportedTerminal.java    |    2 +-
 .../internal/cli/util/CLIConsoleBufferUtil.java |    8 +-
 .../client/ClientCacheFactoryJUnitTest.java     |   50 +
 .../distributed/DistributedSystemDUnitTest.java |    6 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |    5 +-
 .../locks/DLockReentrantLockJUnitTest.java      |   84 +
 .../gms/fd/GMSHealthMonitorJUnitTest.java       |   42 +-
 .../messenger/JGroupsMessengerJUnitTest.java    |    4 +-
 .../gemfire/internal/AvailablePortHelper.java   |    2 +-
 .../internal/AvailablePortJUnitTest.java        |    2 +
 .../gemstone/gemfire/internal/FDDUnitTest.java  |  282 ---
 .../PersistentPartitionedRegionDUnitTest.java   |    6 +
 .../PersistentPartitionedRegionTestBase.java    |    2 +-
 .../offheap/AbstractStoredObjectTestBase.java   |    2 +-
 .../offheap/ChunkWithHeapFormJUnitTest.java     |   64 +
 .../offheap/GemFireChunkFactoryJUnitTest.java   |  129 ++
 .../internal/offheap/GemFireChunkJUnitTest.java |  921 +++++++++
 .../offheap/GemFireChunkSliceJUnitTest.java     |   72 +
 .../offheap/SimpleMemoryAllocatorJUnitTest.java |    6 +
 .../internal/offheap/StoredObjectTestSuite.java |   33 +
 .../management/CacheManagementDUnitTest.java    |   11 +-
 .../management/internal/cli/HeadlessGfsh.java   |    8 +-
 .../internal/cli/TableBuilderJUnitTest.java     |  307 ++-
 .../cli/commands/QueueCommandsDUnitTest.java    |    5 +
 .../cli/commands/ShellCommandsDUnitTest.java    |    2 +-
 .../security/ClientAuthenticationDUnitTest.java |  967 +++++++++
 .../ClientAuthenticationPart2DUnitTest.java     |   88 +
 .../security/ClientAuthorizationDUnitTest.java  |  798 ++++++++
 .../security/ClientAuthorizationTestBase.java   | 1384 +++++++++++++
 .../security/ClientMultiUserAuthzDUnitTest.java |  537 +++++
 .../DeltaClientAuthorizationDUnitTest.java      |  336 ++++
 .../DeltaClientPostAuthorizationDUnitTest.java  |  541 +++++
 .../security/P2PAuthenticationDUnitTest.java    |  622 ++++++
 .../gemfire/security/SecurityTestUtil.java      | 1871 ++++++++++++++++++
 .../java/security/AuthzCredentialGenerator.java |  465 +++++
 .../test/java/security/CredentialGenerator.java |  343 ++++
 .../security/DummyAuthzCredentialGenerator.java |  145 ++
 .../java/security/DummyCredentialGenerator.java |   94 +
 .../security/LdapUserCredentialGenerator.java   |  160 ++
 .../java/security/PKCSCredentialGenerator.java  |  112 ++
 .../java/security/SSLCredentialGenerator.java   |  117 ++
 .../UserPasswordWithExtraPropsAuthInit.java     |   77 +
 .../security/XmlAuthzCredentialGenerator.java   |  264 +++
 .../sanctionedDataSerializables.txt             |   12 +-
 .../codeAnalysis/sanctionedSerializables.txt    |    4 +-
 .../src/test/resources/lib/authz-dummy.xml      |  126 ++
 .../src/test/resources/lib/authz-ldap.xml       |   85 +
 .../resources/lib/authz-multiUser-dummy.xml     |  106 +
 .../test/resources/lib/authz-multiUser-ldap.xml |   83 +
 .../test/resources/lib/keys/gemfire1.keystore   |  Bin 0 -> 1536 bytes
 .../test/resources/lib/keys/gemfire10.keystore  |  Bin 0 -> 1546 bytes
 .../test/resources/lib/keys/gemfire11.keystore  |  Bin 0 -> 1546 bytes
 .../test/resources/lib/keys/gemfire2.keystore   |  Bin 0 -> 1536 bytes
 .../test/resources/lib/keys/gemfire3.keystore   |  Bin 0 -> 1536 bytes
 .../test/resources/lib/keys/gemfire4.keystore   |  Bin 0 -> 1536 bytes
 .../test/resources/lib/keys/gemfire5.keystore   |  Bin 0 -> 1536 bytes
 .../test/resources/lib/keys/gemfire6.keystore   |  Bin 0 -> 1536 bytes
 .../test/resources/lib/keys/gemfire7.keystore   |  Bin 0 -> 1536 bytes
 .../test/resources/lib/keys/gemfire8.keystore   |  Bin 0 -> 1536 bytes
 .../test/resources/lib/keys/gemfire9.keystore   |  Bin 0 -> 1536 bytes
 .../resources/lib/keys/ibm/gemfire1.keystore    |  Bin 0 -> 1426 bytes
 .../resources/lib/keys/ibm/gemfire10.keystore   |  Bin 0 -> 1434 bytes
 .../resources/lib/keys/ibm/gemfire11.keystore   |  Bin 0 -> 1434 bytes
 .../resources/lib/keys/ibm/gemfire2.keystore    |  Bin 0 -> 1434 bytes
 .../resources/lib/keys/ibm/gemfire3.keystore    |  Bin 0 -> 1426 bytes
 .../resources/lib/keys/ibm/gemfire4.keystore    |  Bin 0 -> 1434 bytes
 .../resources/lib/keys/ibm/gemfire5.keystore    |  Bin 0 -> 1434 bytes
 .../resources/lib/keys/ibm/gemfire6.keystore    |  Bin 0 -> 1434 bytes
 .../resources/lib/keys/ibm/gemfire7.keystore    |  Bin 0 -> 1426 bytes
 .../resources/lib/keys/ibm/gemfire8.keystore    |  Bin 0 -> 1434 bytes
 .../resources/lib/keys/ibm/gemfire9.keystore    |  Bin 0 -> 1426 bytes
 .../test/resources/lib/keys/ibm/publickeyfile   |  Bin 0 -> 4535 bytes
 .../src/test/resources/lib/keys/publickeyfile   |  Bin 0 -> 4535 bytes
 .../src/test/resources/ssl/untrusted.keystore   |  Bin 0 -> 1181 bytes
 gradle/dependency-versions.properties           |    6 +-
 gradle/rat.gradle                               |   12 +-
 103 files changed, 11619 insertions(+), 799 deletions(-)
----------------------------------------------------------------------