You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2015/11/20 22:02:41 UTC
[47/50] [abbrv] incubator-geode git commit: merge of develop to
feature/GEODE-77
merge of develop to feature/GEODE-77
Merge remote-tracking branch 'origin/develop' into feature/GEODE-77
Conflicts:
gemfire-core/build.gradle
gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
gemfire-jgroups/build.gradle
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/766dfd05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/766dfd05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/766dfd05
Branch: refs/heads/develop
Commit: 766dfd05b378abc981b83a5372551c6df01bcda4
Parents: fd98f62 3fc2992
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Tue Nov 17 12:44:50 2015 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Tue Nov 17 12:44:50 2015 -0800
----------------------------------------------------------------------
build.gradle | 63 +-
gemfire-assembly/build.gradle | 2 +-
gemfire-core/build.gradle | 186 ++---
.../gemstone/gemfire/cache/GemFireCache.java | 7 -
.../internal/AsyncEventQueueFactoryImpl.java | 9 +-
.../internal/AsyncEventQueueImpl.java | 3 +
.../client/internal/EndpointManagerImpl.java | 2 -
.../internal/pooling/ConnectionManagerImpl.java | 5 +
.../gemfire/cache/lucene/LuceneIndex.java | 59 --
.../gemfire/cache/lucene/LuceneQuery.java | 53 --
.../cache/lucene/LuceneQueryFactory.java | 137 ----
.../cache/lucene/LuceneQueryResults.java | 45 --
.../cache/lucene/LuceneResultStruct.java | 75 --
.../gemfire/cache/lucene/LuceneService.java | 119 ---
.../cache/lucene/LuceneServiceFactory.java | 30 -
.../cache/lucene/LuceneServiceProvider.java | 52 --
.../cache/lucene/internal/LuceneIndexImpl.java | 70 --
.../lucene/internal/LuceneQueryFactoryImpl.java | 104 ---
.../cache/lucene/internal/LuceneQueryImpl.java | 78 --
.../lucene/internal/LuceneQueryResultsImpl.java | 82 --
.../lucene/internal/LuceneResultStructImpl.java | 61 --
.../internal/LuceneServiceFactoryImpl.java | 32 -
.../lucene/internal/LuceneServiceImpl.java | 106 ---
.../cache/partition/PartitionManager.java | 2 +-
.../internal/DistributionManager.java | 322 ++------
.../internal/DataSerializableFixedID.java | 9 +
.../com/gemstone/gemfire/internal/Version.java | 5 +
.../gemfire/internal/cache/BucketRegion.java | 2 +-
.../gemfire/internal/cache/CacheService.java | 26 +
.../gemfire/internal/cache/EntryEventImpl.java | 1 -
.../internal/cache/GemFireCacheImpl.java | 79 +-
.../gemfire/internal/cache/InternalCache.java | 5 +-
.../gemfire/internal/cache/LocalRegion.java | 8 +-
.../cache/MemberFunctionStreamingMessage.java | 9 +-
.../gemstone/gemfire/internal/cache/Oplog.java | 1 -
.../cache/PartitionedRegionDataStore.java | 2 +-
.../gemfire/internal/cache/RegionListener.java | 30 +
.../cache/control/OffHeapMemoryMonitor.java | 34 +-
.../cache/execute/ServerFunctionExecutor.java | 18 -
.../execute/TransactionFunctionService.java | 193 -----
.../cache/execute/util/CommitFunction.java | 1 -
.../cache/execute/util/RollbackFunction.java | 1 -
.../cache/extension/SimpleExtensionPoint.java | 2 +-
.../persistence/soplog/AbstractCompactor.java | 533 -------------
.../soplog/AbstractKeyValueIterator.java | 76 --
.../soplog/AbstractSortedReader.java | 135 ----
.../soplog/ArraySerializedComparator.java | 144 ----
.../cache/persistence/soplog/Compactor.java | 174 -----
.../soplog/CompositeSerializedComparator.java | 57 --
.../soplog/IndexSerializedComparator.java | 127 ---
.../cache/persistence/soplog/LevelTracker.java | 120 ---
.../soplog/LexicographicalComparator.java | 460 -----------
.../cache/persistence/soplog/NonCompactor.java | 110 ---
.../soplog/ReversingSerializedComparator.java | 67 --
.../persistence/soplog/SizeTieredCompactor.java | 198 -----
.../cache/persistence/soplog/SoplogToken.java | 116 ---
.../cache/persistence/soplog/SortedBuffer.java | 367 ---------
.../cache/persistence/soplog/SortedOplog.java | 158 ----
.../persistence/soplog/SortedOplogFactory.java | 278 -------
.../persistence/soplog/SortedOplogSet.java | 118 ---
.../persistence/soplog/SortedOplogSetImpl.java | 780 -------------------
.../soplog/hfile/BlockCacheHolder.java | 39 -
.../soplog/hfile/HFileSortedOplog.java | 694 -----------------
.../soplog/hfile/HFileSortedOplogFactory.java | 80 --
.../soplog/nofile/NoFileSortedOplog.java | 244 ------
.../soplog/nofile/NoFileSortedOplogFactory.java | 41 -
.../cache/tier/sockets/CommandInitializer.java | 4 +
.../tier/sockets/command/CommitCommand.java | 4 +-
.../tier/sockets/command/ExecuteFunction66.java | 2 +-
.../command/ExecuteRegionFunction66.java | 2 +-
.../command/ExecuteRegionFunctionSingleHop.java | 2 +-
.../cache/wan/AbstractGatewaySender.java | 10 +
.../cache/wan/GatewaySenderAttributes.java | 5 +
.../internal/cache/xmlcache/CacheCreation.java | 14 +-
.../cache/xmlcache/DefaultEntityResolver2.java | 2 +-
.../cache/xmlcache/GeodeEntityResolver.java | 49 ++
.../cache/xmlcache/PivotalEntityResolver.java | 2 +-
.../gemfire/internal/offheap/OffHeapHelper.java | 4 +-
.../internal/offheap/OffHeapReference.java | 72 --
.../offheap/SimpleMemoryAllocatorImpl.java | 28 +-
.../gemfire/internal/offheap/StoredObject.java | 42 +-
.../util/concurrent/CopyOnWriteHashMap.java | 46 +-
.../util/concurrent/CopyOnWriteWeakHashMap.java | 12 +
.../services/org.xml.sax.ext.EntityResolver2 | 1 +
.../SerialAsyncEventQueueImplJUnitTest.java | 46 ++
.../management/MemoryThresholdsDUnitTest.java | 46 +-
.../partition/PartitionManagerDUnitTest.java | 75 --
.../gemfire/cache30/RegionTestCase.java | 54 +-
.../internal/ProductUseLogDUnitTest.java | 3 +-
.../GemFireDeadlockDetectorDUnitTest.java | 2 +-
.../gemfire/internal/JSSESocketJUnitTest.java | 2 +-
.../internal/cache/CacheServiceJUnitTest.java | 43 +
.../cache/ClientServerTransactionDUnitTest.java | 31 +-
.../internal/cache/MockCacheService.java | 8 +
.../internal/cache/MockCacheServiceImpl.java | 23 +
.../gemfire/internal/cache/OplogJUnitTest.java | 46 +-
.../internal/cache/RegionListenerJUnitTest.java | 47 ++
.../control/TestMemoryThresholdListener.java | 13 +
.../MemberFunctionExecutionDUnitTest.java | 49 ++
.../mock/DestroyMockCacheExtensionFunction.java | 2 +-
.../cache/persistence/soplog/AppendLog.java | 65 --
.../ArraySerializedComparatorJUnitTest.java | 95 ---
.../CompactionSortedOplogSetTestCase.java | 134 ----
.../persistence/soplog/CompactionTestCase.java | 206 -----
.../persistence/soplog/ComparisonTestCase.java | 77 --
.../soplog/IndexComparatorJUnitTest.java | 79 --
.../LexicographicalComparatorJUnitTest.java | 204 -----
.../soplog/RecoverableSortedOplogSet.java | 221 ------
.../soplog/SizeTieredCompactorJUnitTest.java | 110 ---
.../SizeTieredSortedOplogSetJUnitTest.java | 43 -
.../soplog/SortedBufferJUnitTest.java | 39 -
.../soplog/SortedOplogSetJUnitTest.java | 273 -------
.../soplog/SortedReaderTestCase.java | 295 -------
.../nofile/NoFileSortedOplogJUnitTest.java | 48 --
.../tier/sockets/command/CommitCommandTest.java | 39 +
.../internal/i18n/BasicI18nJUnitTest.java | 12 -
.../concurrent/CopyOnWriteHashMapJUnitTest.java | 496 ++++++++++++
.../management/DistributedSystemDUnitTest.java | 12 +-
...gemstone.gemfire.internal.cache.CacheService | 1 +
.../codeAnalysis/sanctionedSerializables.txt | 2 +-
.../src/main/java/org/json/JSONObject.java | 2 +
gemfire-lucene/build.gradle | 29 +
.../gemfire/cache/lucene/LuceneIndex.java | 60 ++
.../gemfire/cache/lucene/LuceneQuery.java | 48 ++
.../cache/lucene/LuceneQueryFactory.java | 101 +++
.../cache/lucene/LuceneQueryProvider.java | 45 ++
.../cache/lucene/LuceneQueryResults.java | 58 ++
.../cache/lucene/LuceneResultStruct.java | 62 ++
.../gemfire/cache/lucene/LuceneService.java | 125 +++
.../cache/lucene/LuceneServiceProvider.java | 46 ++
.../lucene/internal/InternalLuceneIndex.java | 29 +
.../lucene/internal/InternalLuceneService.java | 29 +
.../lucene/internal/LuceneEventListener.java | 99 +++
.../LuceneIndexForPartitionedRegion.java | 136 ++++
.../LuceneIndexForReplicatedRegion.java | 48 ++
.../cache/lucene/internal/LuceneIndexImpl.java | 107 +++
.../lucene/internal/LuceneQueryFactoryImpl.java | 67 ++
.../cache/lucene/internal/LuceneQueryImpl.java | 87 +++
.../lucene/internal/LuceneQueryResultsImpl.java | 120 +++
.../lucene/internal/LuceneResultStructImpl.java | 94 +++
.../lucene/internal/LuceneServiceImpl.java | 273 +++++++
.../internal/PartitionedRepositoryManager.java | 163 ++++
.../lucene/internal/StringQueryProvider.java | 106 +++
.../internal/directory/FileIndexInput.java | 131 ++++
.../internal/directory/RegionDirectory.java | 119 +++
.../internal/distributed/CollectorManager.java | 55 ++
.../lucene/internal/distributed/EntryScore.java | 82 ++
.../internal/distributed/LuceneFunction.java | 137 ++++
.../distributed/LuceneFunctionContext.java | 115 +++
.../lucene/internal/distributed/TopEntries.java | 133 ++++
.../distributed/TopEntriesCollector.java | 102 +++
.../distributed/TopEntriesCollectorManager.java | 178 +++++
.../TopEntriesFunctionCollector.java | 163 ++++
.../lucene/internal/filesystem/ChunkKey.java | 123 +++
.../cache/lucene/internal/filesystem/File.java | 155 ++++
.../internal/filesystem/FileInputStream.java | 166 ++++
.../internal/filesystem/FileOutputStream.java | 103 +++
.../lucene/internal/filesystem/FileSystem.java | 156 ++++
.../filesystem/SeekableInputStream.java | 43 +
.../internal/repository/IndexRepository.java | 74 ++
.../repository/IndexRepositoryImpl.java | 113 +++
.../repository/IndexResultCollector.java | 47 ++
.../internal/repository/RepositoryManager.java | 45 ++
.../HeterogenousLuceneSerializer.java | 83 ++
.../repository/serializer/LuceneSerializer.java | 35 +
.../serializer/PdxLuceneSerializer.java | 47 ++
.../serializer/ReflectionLuceneSerializer.java | 74 ++
.../repository/serializer/SerializerUtil.java | 168 ++++
.../internal/xml/LuceneIndexCreation.java | 111 +++
.../internal/xml/LuceneIndexXmlGenerator.java | 65 ++
.../internal/xml/LuceneServiceXmlGenerator.java | 39 +
.../lucene/internal/xml/LuceneXmlConstants.java | 31 +
.../lucene/internal/xml/LuceneXmlParser.java | 97 +++
.../lucene/lucene-1.0.xsd | 42 +
...gemstone.gemfire.internal.cache.CacheService | 1 +
...ne.gemfire.internal.cache.xmlcache.XmlParser | 1 +
.../internal/LuceneEventListenerJUnitTest.java | 109 +++
.../LuceneIndexRecoveryHAJUnitTest.java | 201 +++++
.../LuceneQueryFactoryImplJUnitTest.java | 50 ++
.../internal/LuceneQueryImplJUnitTest.java | 123 +++
.../LuceneQueryResultsImplJUnitTest.java | 126 +++
.../LuceneResultStructImpJUnitTest.java | 51 ++
.../internal/LuceneServiceImplJUnitTest.java | 226 ++++++
.../PartitionedRepositoryManagerJUnitTest.java | 230 ++++++
.../internal/StringQueryProviderJUnitTest.java | 90 +++
.../directory/RegionDirectoryJUnitTest.java | 56 ++
.../DistributedScoringJUnitTest.java | 155 ++++
.../distributed/EntryScoreJUnitTest.java | 40 +
.../LuceneFunctionContextJUnitTest.java | 64 ++
.../distributed/LuceneFunctionJUnitTest.java | 423 ++++++++++
.../LuceneFunctionReadPathDUnitTest.java | 241 ++++++
.../TopEntriesCollectorJUnitTest.java | 139 ++++
.../TopEntriesFunctionCollectorJUnitTest.java | 323 ++++++++
.../distributed/TopEntriesJUnitTest.java | 146 ++++
.../internal/filesystem/ChunkKeyJUnitTest.java | 48 ++
.../internal/filesystem/FileJUnitTest.java | 53 ++
.../filesystem/FileSystemJUnitTest.java | 578 ++++++++++++++
...IndexRepositoryImplJUnitPerformanceTest.java | 437 +++++++++++
.../IndexRepositoryImplJUnitTest.java | 208 +++++
.../HeterogenousLuceneSerializerJUnitTest.java | 90 +++
.../serializer/PdxFieldMapperJUnitTest.java | 85 ++
.../ReflectionFieldMapperJUnitTest.java | 85 ++
.../internal/repository/serializer/Type1.java | 48 ++
.../internal/repository/serializer/Type2.java | 34 +
...neIndexXmlGeneratorIntegrationJUnitTest.java | 78 ++
.../xml/LuceneIndexXmlGeneratorJUnitTest.java | 80 ++
...uceneIndexXmlParserIntegrationJUnitTest.java | 107 +++
.../xml/LuceneIndexXmlParserJUnitTest.java | 72 ++
...erIntegrationJUnitTest.createIndex.cache.xml | 24 +
...serIntegrationJUnitTest.parseIndex.cache.xml | 24 +
gemfire-rebalancer/build.gradle | 10 +-
gemfire-web-api/build.gradle | 46 +-
gemfire-web/build.gradle | 12 +-
gradle/dependency-versions.properties | 64 ++
settings.gradle | 1 +
215 files changed, 11345 insertions(+), 9088 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/gemfire-assembly/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/gemfire-core/build.gradle
----------------------------------------------------------------------
diff --cc gemfire-core/build.gradle
index d44a649,f03066f..aa143b1
--- a/gemfire-core/build.gradle
+++ b/gemfire-core/build.gradle
@@@ -11,79 -11,77 +11,78 @@@ configurations
}
dependencies {
+ // Source Dependencies
+ // External
provided files("${System.getProperty('java.home')}/../lib/tools.jar")
+ compile 'org.jgroups:jgroups:3.6.6.Final'
- compile 'antlr:antlr:2.7.7'
- compile 'com.fasterxml.jackson.core:jackson-annotations:2.2.0'
- compile 'com.fasterxml.jackson.core:jackson-core:2.2.0'
- compile 'com.fasterxml.jackson.core:jackson-databind:2.2.0'
- compile 'com.google.code.findbugs:annotations:3.0.0'
- compile 'commons-io:commons-io:2.3'
- compile 'commons-logging:commons-logging:1.1.1'
- compile 'commons-modeler:commons-modeler:2.0'
- compile 'org.apache.lucene:lucene-analyzers-common:5.0.0'
- compile 'org.apache.lucene:lucene-core:5.0.0'
- compile 'org.apache.lucene:lucene-queries:5.0.0'
- compile 'org.apache.lucene:lucene-queryparser:5.0.0'
- compile 'it.unimi.dsi:fastutil:7.0.2'
- compile 'javax.activation:activation:1.1.1'
- compile 'javax.mail:javax.mail-api:1.4.5'
- compile 'javax.resource:javax.resource-api:1.7'
- compile 'javax.servlet:javax.servlet-api:3.1.0'
- compile 'javax.transaction:javax.transaction-api:1.2'
- compile 'mx4j:mx4j:3.0.1'
- compile 'mx4j:mx4j-remote:3.0.1'
- compile 'mx4j:mx4j-tools:3.0.1'
- compile 'net.java.dev.jna:jna:4.0.0'
- compile 'net.sourceforge.jline:jline:1.0.S2-B'
- compile 'org.eclipse.jetty:jetty-http:9.2.3.v20140905'
- compile 'org.eclipse.jetty:jetty-io:9.2.3.v20140905'
- compile 'org.eclipse.jetty:jetty-security:9.2.3.v20140905'
- compile 'org.eclipse.jetty:jetty-server:9.2.3.v20140905'
- compile 'org.eclipse.jetty:jetty-servlet:9.2.3.v20140905'
- compile 'org.eclipse.jetty:jetty-util:9.2.3.v20140905'
- compile 'org.eclipse.jetty:jetty-webapp:9.2.3.v20140905'
- compile 'org.eclipse.jetty:jetty-xml:9.2.3.v20140905'
- compile 'org.fusesource.jansi:jansi:1.8'
- compile 'org.apache.logging.log4j:log4j-api:2.1'
- compile 'org.apache.logging.log4j:log4j-core:2.1'
- runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.1'
- runtime 'org.apache.logging.log4j:log4j-jcl:2.1'
- runtime 'org.apache.logging.log4j:log4j-jul:2.1'
- compile 'org.slf4j:slf4j-api:1.7.7'
- compile 'org.springframework.data:spring-data-commons:1.9.1.RELEASE'
- provided 'org.springframework.data:spring-data-gemfire:1.5.1.RELEASE'
- compile 'org.springframework:spring-tx:3.2.12.RELEASE'
- compile 'org.springframework.shell:spring-shell:1.0.0.RELEASE'
- compile 'org.xerial.snappy:snappy-java:1.1.1.6'
- provided 'org.apache.hadoop:hadoop-common:2.4.1'
- provided 'org.apache.hadoop:hadoop-annotations:2.4.1'
- provided 'org.apache.hadoop:hadoop-hdfs:2.4.1'
- provided 'org.apache.hadoop:hadoop-mapreduce-client-core:2.4.1'
- compile 'org.apache.hbase:hbase:0.94.27'
- provided 'commons-lang:commons-lang:2.5'
- provided 'com.google.guava:guava:11.0.2'
- compile 'io.netty:netty-all:4.0.4.Final'
-
- testRuntime 'org.apache.hadoop:hadoop-auth:2.4.1'
- testRuntime 'commons-collections:commons-collections:3.2.1'
- testRuntime 'commons-configuration:commons-configuration:1.6'
- testRuntime 'commons-io:commons-io:2.1'
- testRuntime 'log4j:log4j:1.2.17'
-
+ compile 'antlr:antlr:' + project.'antlr.version'
+ compile 'com.fasterxml.jackson.core:jackson-annotations:' + project.'jackson.version'
+ compile 'com.fasterxml.jackson.core:jackson-core:' + project.'jackson.version'
+ compile 'com.fasterxml.jackson.core:jackson-databind:' + project.'jackson.version'
+ compile 'com.google.code.findbugs:annotations:' + project.'annotations.version'
+ provided 'com.google.guava:guava:' + project.'guava.version'
+ compile 'commons-io:commons-io:' + project.'commons-io.version'
+ provided 'commons-lang:commons-lang:' + project.'commons-lang.version'
+ compile 'commons-logging:commons-logging:' + project.'commons-logging.version'
+ compile 'commons-modeler:commons-modeler:' + project.'commons-modeler.version'
+ compile 'io.netty:netty-all:' + project.'netty-all.version'
+ compile 'it.unimi.dsi:fastutil:' + project.'fastutil.version'
+ compile 'javax.activation:activation:' + project.'activation.version'
+ compile 'javax.mail:javax.mail-api:' + project.'javax.mail-api.version'
+ compile 'javax.resource:javax.resource-api:' + project.'javax.resource-api.version'
+ compile 'javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version'
+ compile 'javax.transaction:javax.transaction-api:' + project.'javax.transaction-api.version'
+ compile 'mx4j:mx4j:' + project.'mx4j.version'
+ compile 'mx4j:mx4j-remote:' + project.'mx4j.version'
+ compile 'mx4j:mx4j-tools:' + project.'mx4j.version'
+ compile 'net.java.dev.jna:jna:' + project.'jna.version'
+ compile 'net.sourceforge.jline:jline:' + project.'jline.version'
+ provided 'org.apache.hadoop:hadoop-common:' + project.'hadoop.version'
+ provided 'org.apache.hadoop:hadoop-annotations:' + project.'hadoop.version'
+ provided 'org.apache.hadoop:hadoop-hdfs:' + project.'hadoop.version'
+ provided 'org.apache.hadoop:hadoop-mapreduce-client-core:' + project.'hadoop.version'
+ compile 'org.apache.hbase:hbase:' + project.'hbase.version'
+ compile 'org.apache.logging.log4j:log4j-api:' + project.'log4j.version'
+ compile 'org.apache.logging.log4j:log4j-core:' + project.'log4j.version'
+ runtime 'org.apache.logging.log4j:log4j-slf4j-impl:' + project.'log4j.version'
+ runtime 'org.apache.logging.log4j:log4j-jcl:' + project.'log4j.version'
+ runtime 'org.apache.logging.log4j:log4j-jul:' + project.'log4j.version'
+ compile 'org.eclipse.jetty:jetty-http:' + project.'jetty.version'
+ compile 'org.eclipse.jetty:jetty-io:' + project.'jetty.version'
+ compile 'org.eclipse.jetty:jetty-security:' + project.'jetty.version'
+ compile 'org.eclipse.jetty:jetty-server:' + project.'jetty.version'
+ compile 'org.eclipse.jetty:jetty-servlet:' + project.'jetty.version'
+ compile 'org.eclipse.jetty:jetty-util:' + project.'jetty.version'
+ compile 'org.eclipse.jetty:jetty-webapp:' + project.'jetty.version'
+ compile 'org.eclipse.jetty:jetty-xml:' + project.'jetty.version'
+ compile 'org.fusesource.jansi:jansi:' + project.'jansi.version'
+ compile 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
+ compile 'org.springframework.data:spring-data-commons:' + project.'spring-data-commons.version'
+ provided 'org.springframework.data:spring-data-gemfire:' + project.'spring-data-gemfire.version'
+ compile 'org.springframework:spring-tx:' + project.'springframework.version'
+ compile 'org.springframework.shell:spring-shell:' + project.'spring-shell.version'
+ compile 'org.xerial.snappy:snappy-java:' + project.'snappy-java.version'
+ compile 'org.apache.hbase:hbase:' + project.'hbase.version'
+
compile project(':gemfire-common')
- compile project(':gemfire-jgroups')
compile project(':gemfire-joptsimple')
compile project(':gemfire-json')
jcaCompile sourceSets.main.output
provided project(path: ':gemfire-junit', configuration: 'testOutput')
+
+ // Test Dependencies
+ // External
+ testCompile 'org.apache.bcel:bcel:' + project.'bcel.version'
+ testRuntime 'org.apache.derby:derby:' + project.'derby.version'
+ testRuntime 'org.apache.hadoop:hadoop-auth:' + project.'hadoop.version'
++ testCompile 'org.mockito:mockito-core:' + project.'mockito-core.version'
+ testRuntime 'commons-collections:commons-collections:' + project.'commons-collections.version'
+ testRuntime 'commons-configuration:commons-configuration:' + project.'commons-configuration.version'
+ testRuntime 'commons-io:commons-io:' + project.'commons-io.version'
+ testCompile 'net.spy:spymemcached:' + project.'spymemcached.version'
+ testCompile 'redis.clients:jedis:' + project.'jedis.version'
}
def generatedResources = "$buildDir/generated-resources/main"
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
index cb09643,83e4878..d31ff3c
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
@@@ -41,8 -41,9 +41,9 @@@ import com.gemstone.gemfire.internal.lo
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
import com.gemstone.gemfire.security.GemFireSecurityException;
-import com.gemstone.org.jgroups.util.StringId;
+import com.gemstone.gemfire.i18n.StringId;
+ import java.net.SocketException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
index 882358e,9c06fa1..247775d
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
@@@ -4800,13 -4688,9 +4606,9 @@@ public class DistributionManage
this.view = view;
}
public long getViewId() {
- return view.getViewNumber();
+ return view.getViewId();
}
@Override
- public int eventType() {
- return VIEW_INSTALLED;
- }
- @Override
public String toString() {
return "view installed: " + this.view;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/gemfire-core/src/main/java/com/gemstone/gemfire/internal/Version.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
index 5232dc9,1900297..c17caa2
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
@@@ -214,8 -213,7 +213,7 @@@ import com.gemstone.gemfire.internal.se
import com.gemstone.gemfire.internal.util.concurrent.FutureResult;
import com.gemstone.gemfire.internal.util.concurrent.StoppableCountDownLatch;
import com.gemstone.gemfire.internal.util.concurrent.StoppableReadWriteLock;
- import com.gemstone.gemfire.internal.util.concurrent.StoppableReentrantReadWriteLock.StoppableWriteLock;
-import com.gemstone.org.jgroups.util.StringId;
+import com.gemstone.gemfire.i18n.StringId;
/**
* Implementation of a local scoped-region. Note that this class has a different
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
index b2adc64,4edab28..2f8f7c0
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
@@@ -402,10 -402,10 +402,10 @@@ public class MemoryThresholdsDUnitTest
final String regionName = "testEventDelivery";
ServerPorts ports1 = startCacheServer(server1, 0f, 0f, regionName, false/*createPR*/, false/*notifyBySubscription*/, 0);
- ServerPorts ports2 = startCacheServer(server2, ports1.getMcastPort(), 80f, 90f,
+ ServerPorts ports2 = startCacheServer(server2, 80f, 90f,
regionName, false/*createPR*/, false/*notifyBySubscription*/, 0);
- registerTestMemoryThresholdListener(server1);
+ registerLoggingTestMemoryThresholdListener(server1);
registerTestMemoryThresholdListener(server2);
//NORMAL -> CRITICAL
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/gemfire-core/src/test/java/com/gemstone/gemfire/internal/i18n/BasicI18nJUnitTest.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/test/java/com/gemstone/gemfire/internal/i18n/BasicI18nJUnitTest.java
index fcae123,28934b3..3e1efd8
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/i18n/BasicI18nJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/i18n/BasicI18nJUnitTest.java
@@@ -205,21 -206,9 +205,9 @@@ public class BasicI18nJUnitTest extend
@Override
public void tearDown() {
//reset to the original
- StringIdImpl.setLocale(DEFAULT_LOCALE);
+ StringId.setLocale(DEFAULT_LOCALE);
}
- public void testDefaults() {
- Locale l = getCurrentLocale();
- AbstractStringIdResourceBundle r = getActiveResourceBundle();
- assertNotNull(l);
- assertNotNull(r);
- final String currentLang = l.getLanguage();
- final String expectedLang = new Locale("en", "", "").getLanguage();
- final String frenchLang = new Locale("fr", "", "").getLanguage();
- // TODO this will fail if run under a locale with a language other than french or english
- assertTrue(currentLang.equals(expectedLang) || currentLang.equals(frenchLang));
- }
-
public void testSetLocale() {
//Verify we are starting in a known state
assertTrue(DEFAULT_LOCALE.equals(getCurrentLocale()));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/766dfd05/settings.gradle
----------------------------------------------------------------------