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/01 23:21:55 UTC
[31/50] [abbrv] incubator-geode git commit: Merge branch 'develop'
into feature/GEODE-584
Merge branch 'develop' into feature/GEODE-584
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e38a9425
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e38a9425
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e38a9425
Branch: refs/heads/feature/GEODE-291
Commit: e38a9425a5ef193759139a4933079bdb728c6489
Parents: 1e33973 52f0a1d
Author: Anthony Baker <ab...@pivotal.io>
Authored: Tue Nov 24 12:26:05 2015 -0800
Committer: Anthony Baker <ab...@pivotal.io>
Committed: Tue Nov 24 12:26:05 2015 -0800
----------------------------------------------------------------------
gemfire-assembly/build.gradle | 35 +-
.../internal/GetOperationContextImpl.java | 2 +-
.../query/internal/index/AbstractIndex.java | 2 +-
.../query/internal/index/DummyQRegion.java | 2 +-
.../cache/query/internal/index/HashIndex.java | 178 +-
.../query/internal/index/HashIndexSet.java | 1086 ++----
.../query/internal/index/HashIndexStrategy.java | 90 -
.../internal/DistributionManager.java | 2 +-
.../internal/InternalDistributedSystem.java | 8 +-
.../gms/messenger/JGroupsMessenger.java | 9 +-
.../internal/cache/AbstractRegionEntry.java | 29 +-
.../internal/cache/AbstractRegionMap.java | 16 +-
.../cache/BytesAndBitsForCompactor.java | 2 +-
.../gemfire/internal/cache/DiskEntry.java | 8 +-
.../internal/cache/DistributedRegion.java | 2 +-
.../gemfire/internal/cache/EntryEventImpl.java | 45 +-
.../internal/cache/GemFireCacheImpl.java | 4 -
.../gemfire/internal/cache/LocalRegion.java | 10 +-
.../gemstone/gemfire/internal/cache/Oplog.java | 6 +-
.../internal/cache/PartitionedRegion.java | 2 +-
.../internal/cache/VMThinRegionEntry.java | 5 -
.../internal/cache/tier/sockets/Part.java | 4 +-
.../cache/wan/GatewaySenderEventImpl.java | 10 +-
.../gemfire/internal/offheap/Chunk.java | 793 +++++
.../gemfire/internal/offheap/ChunkFactory.java | 51 +
.../gemfire/internal/offheap/ChunkType.java | 26 +
.../internal/offheap/ChunkWithHeapForm.java | 40 +
.../gemfire/internal/offheap/DataAsAddress.java | 205 ++
.../gemfire/internal/offheap/Fragment.java | 125 +
.../internal/offheap/FreeListManager.java | 807 +++++
.../gemfire/internal/offheap/GemFireChunk.java | 55 +
.../internal/offheap/GemFireChunkFactory.java | 52 +
.../internal/offheap/GemFireChunkSlice.java | 44 +
.../internal/offheap/LifecycleListener.java | 98 +
.../internal/offheap/MemoryAllocator.java | 1 -
.../gemfire/internal/offheap/MemoryBlock.java | 1 -
.../internal/offheap/MemoryBlockNode.java | 158 +
.../offheap/OffHeapCachedDeserializable.java | 1 -
.../gemfire/internal/offheap/OffHeapHelper.java | 8 +-
.../offheap/OffHeapRegionEntryHelper.java | 8 +-
.../internal/offheap/RefCountChangeInfo.java | 112 +
.../internal/offheap/ReferenceCountHelper.java | 235 ++
.../offheap/SimpleMemoryAllocatorImpl.java | 3242 +-----------------
.../internal/offheap/SyncChunkStack.java | 130 +
.../internal/tcp/ByteBufferInputStream.java | 2 +-
.../tcp/ImmutableByteBufferInputStream.java | 2 +-
.../gemfire/internal/util/BlobHelper.java | 2 +-
.../gemfire/internal/util/ObjectProcedure.java | 30 -
.../gemfire/internal/util/PrimeFinder.java | 159 -
.../gemfire/pdx/internal/PdxInputStream.java | 2 +-
.../internal/index/HashIndexJUnitTest.java | 23 +-
.../internal/index/HashIndexSetJUnitTest.java | 504 +++
.../cache30/ClientMembershipDUnitTest.java | 5 +-
.../gemfire/cache30/ReconnectDUnitTest.java | 4 +-
.../locator/GMSLocatorRecoveryJUnitTest.java | 4 +-
.../fd/GMSHealthMonitorJUnitTest.java | 3 +-
...wardCompatibilitySerializationDUnitTest.java | 13 +-
.../cache/ChunkValueWrapperJUnitTest.java | 2 +-
.../gemfire/internal/cache/OffHeapTestUtil.java | 5 +-
.../cache/OldValueImporterTestBase.java | 4 +-
.../offheap/ConcurrentBagJUnitTest.java | 130 -
.../offheap/FreeListOffHeapRegionJUnitTest.java | 2 +-
.../internal/offheap/OffHeapRegionBase.java | 1 -
.../offheap/OffHeapValidationJUnitTest.java | 1 -
.../OffHeapWriteObjectAsByteArrayJUnitTest.java | 2 -
.../OldFreeListOffHeapRegionJUnitTest.java | 2 +-
...mpleMemoryAllocatorFillPatternJUnitTest.java | 2 -
.../offheap/SimpleMemoryAllocatorJUnitTest.java | 9 +-
...moryAllocatorLifecycleListenerJUnitTest.java | 9 +-
.../OffHeapByteBufferByteSourceJUnitTest.java | 2 +-
.../gemfire/pdx/OffHeapByteSourceJUnitTest.java | 2 +-
.../gemfire/codeAnalysis/excludedClasses.txt | 1 +
.../codeAnalysis/sanctionedSerializables.txt | 1 -
gemfire-lucene/build.gradle | 4 +-
.../PartitionedRepositoryManagerJUnitTest.java | 4 +-
75 files changed, 4073 insertions(+), 4612 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e38a9425/gemfire-assembly/build.gradle
----------------------------------------------------------------------
diff --cc gemfire-assembly/build.gradle
index de8b584,1324cb9..1f1b798
--- a/gemfire-assembly/build.gradle
+++ b/gemfire-assembly/build.gradle
@@@ -73,14 -74,19 +74,19 @@@ task defaultCacheConfig(type: JavaExec
// This closure sets the gemfire classpath. If we add another jar to the classpath it must
// be included in the filter logic below.
def cp = {
- configurations.archives.dependencies.collect { it.dependencyProject }
+ // first add all the dependent project jars
+ def jars = configurations.archives.dependencies.collect { it.dependencyProject }
.findAll { !it.name.contains('web') }
.collect { it.jar.archiveName }
- .join(' ') + ' ' +
- project(':gemfire-core').configurations.runtime.collect { it.getName() }.findAll {
+ .join(' ')
+
+ // then add all the dependencies of the dependent jars
+ jars += ' ' + configurations.archives.dependencies.collect {
+ it.dependencyProject.configurations.runtime.collect { it.getName() }.findAll {
+ // depedencies from gemfire-core
it.contains('antlr') ||
it.contains('commons-io') ||
- it.contains('commons-logging') ||
+ it.contains('commons-lang') ||
it.contains('fastutil') ||
it.contains('jackson-annotations') ||
it.contains('jackson-core') ||