Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F1BC81831E for ; Mon, 7 Dec 2015 17:07:23 +0000 (UTC) Received: (qmail 65401 invoked by uid 500); 7 Dec 2015 17:07:23 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 65369 invoked by uid 500); 7 Dec 2015 17:07:23 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 65360 invoked by uid 99); 7 Dec 2015 17:07:23 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Dec 2015 17:07:23 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 6B8D71A3519 for ; Mon, 7 Dec 2015 17:07:23 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.247 X-Spam-Level: * X-Spam-Status: No, score=1.247 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id kvQ_kWKJmgyl for ; Mon, 7 Dec 2015 17:07:08 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id B55554452A for ; Mon, 7 Dec 2015 17:07:00 +0000 (UTC) Received: (qmail 60964 invoked by uid 99); 7 Dec 2015 17:05:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Dec 2015 17:05:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 90F9AE098F; Mon, 7 Dec 2015 17:05:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jensdeppe@apache.org To: commits@geode.incubator.apache.org Date: Mon, 07 Dec 2015 17:06:01 -0000 Message-Id: <3088ebecfe53415bb88aed5042350690@git.apache.org> In-Reply-To: <6eab8170c971407ea4704217184c5d00@git.apache.org> References: <6eab8170c971407ea4704217184c5d00@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/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-17 Commit: e38a9425a5ef193759139a4933079bdb728c6489 Parents: 1e33973 52f0a1d Author: Anthony Baker Authored: Tue Nov 24 12:26:05 2015 -0800 Committer: Anthony Baker 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') ||