You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2014/12/01 18:25:47 UTC
svn commit: r1642718 [1/12] - in /lucene/dev/branches/lucene2878: ./
dev-tools/ dev-tools/eclipse/dot.settings/ dev-tools/idea/.idea/
dev-tools/idea/lucene/benchmark/src/ dev-tools/idea/lucene/highlighter/
dev-tools/maven/ dev-tools/maven/solr/webapp/ ...
Author: romseygeek
Date: Mon Dec 1 17:25:39 2014
New Revision: 1642718
URL: http://svn.apache.org/r1642718
Log:
Merge trunk
Added:
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/FilterCache.java
- copied unchanged from r1642714, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilterCache.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/FilterCachingPolicy.java
- copied unchanged from r1642714, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilterCachingPolicy.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java
- copied unchanged from r1642714, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUFilterCache.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/UsageTrackingFilterCachingPolicy.java
- copied unchanged from r1642714, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/UsageTrackingFilterCachingPolicy.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/FrequencyTrackingRingBuffer.java
- copied unchanged from r1642714, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/FrequencyTrackingRingBuffer.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterAbort.java
- copied unchanged from r1642714, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterAbort.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java
- copied unchanged from r1642714, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/util/TestFrequencyTrackingRingBuffer.java
- copied unchanged from r1642714, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestFrequencyTrackingRingBuffer.java
lucene/dev/branches/lucene2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermVector.java
- copied unchanged from r1642714, lucene/dev/trunk/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermVector.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/cloud/overseer/
- copied from r1642714, lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/overseer/
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/core/PluginsRegistry.java
- copied, changed from r1642144, lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/PluginsRegistry.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
- copied unchanged from r1642714, lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/cloud/overseer/
- copied from r1642714, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/overseer/
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/core/MockInfoMBean.java
- copied unchanged from r1642144, lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/MockInfoMBean.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/core/TestSolrDynamicMBean.java
- copied unchanged from r1642144, lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrDynamicMBean.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
- copied unchanged from r1642144, lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
- copied unchanged from r1642144, lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
lucene/dev/branches/lucene2878/solr/licenses/Saxon-HE-9.6.0-2.jar.sha1
- copied unchanged from r1642144, lucene/dev/trunk/solr/licenses/Saxon-HE-9.6.0-2.jar.sha1
Removed:
lucene/dev/branches/lucene2878/dev-tools/maven/solr/webapp/
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/SingleTokenTokenStream.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestSingleTokenTokenFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordTokenFilter.java
lucene/dev/branches/lucene2878/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/GroupQueryNodeProcessor.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/rest/SolrConfigRestApi.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/rest/schema/DefaultSearchFieldResource.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/rest/schema/SchemaNameResource.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/rest/schema/SchemaResource.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/rest/schema/SchemaSimilarityResource.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/rest/schema/SchemaVersionResource.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/rest/schema/SchemaZkVersionResource.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/rest/schema/SolrQueryParserDefaultOperatorResource.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/rest/schema/SolrQueryParserResource.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/rest/schema/UniqueKeyFieldResource.java
lucene/dev/branches/lucene2878/solr/licenses/Saxon-HE-9.5.1-4.jar.sha1
Modified:
lucene/dev/branches/lucene2878/ (props changed)
lucene/dev/branches/lucene2878/build.xml
lucene/dev/branches/lucene2878/dev-tools/ (props changed)
lucene/dev/branches/lucene2878/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs
lucene/dev/branches/lucene2878/dev-tools/idea/.idea/misc.xml
lucene/dev/branches/lucene2878/dev-tools/idea/lucene/benchmark/src/benchmark.iml
lucene/dev/branches/lucene2878/dev-tools/idea/lucene/highlighter/highlighter.iml
lucene/dev/branches/lucene2878/dev-tools/maven/README.maven
lucene/dev/branches/lucene2878/dev-tools/maven/pom.xml.template
lucene/dev/branches/lucene2878/dev-tools/scripts/createPatch.py
lucene/dev/branches/lucene2878/dev-tools/scripts/smokeTestRelease.py
lucene/dev/branches/lucene2878/lucene/ (props changed)
lucene/dev/branches/lucene2878/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene2878/lucene/analysis/ (props changed)
lucene/dev/branches/lucene2878/lucene/analysis/build.xml
lucene/dev/branches/lucene2878/lucene/analysis/common/ (props changed)
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemmer.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SolrSynonymParser.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/Test64kAffixes.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemmer.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java
lucene/dev/branches/lucene2878/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java
lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java
lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/Token.java
lucene/dev/branches/lucene2878/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikAnalyzer.java
lucene/dev/branches/lucene2878/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilterFactory.java
lucene/dev/branches/lucene2878/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/Utility.java
lucene/dev/branches/lucene2878/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java
lucene/dev/branches/lucene2878/lucene/benchmark/ (props changed)
lucene/dev/branches/lucene2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java
lucene/dev/branches/lucene2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java
lucene/dev/branches/lucene2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java
lucene/dev/branches/lucene2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
lucene/dev/branches/lucene2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
lucene/dev/branches/lucene2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
lucene/dev/branches/lucene2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java
lucene/dev/branches/lucene2878/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java
lucene/dev/branches/lucene2878/lucene/build.xml (contents, props changed)
lucene/dev/branches/lucene2878/lucene/codecs/ (props changed)
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java
lucene/dev/branches/lucene2878/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/lucene2878/lucene/core/ (props changed)
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/analysis/Token.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/analysis/TokenStreamToAutomaton.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttribute.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/CodecUtil.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/PushPostingsWriterBase.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/SegmentInfoFormat.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsWriter.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/compressing/MatchingReaders.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/ForUtil.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesConsumer.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesFormat.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoFormat.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/DocValuesType.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/IndexCommit.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/MultiFields.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/Terms.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/similarities/SimilarityBase.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/DataOutput.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/store/VerifyingLockFactory.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/ArrayUtil.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/BitUtil.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/BytesRefHash.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/IOUtils.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/SentinelIntSet.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/automaton/Automata.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/automaton/RegExp.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/BytesRefFSTEnum.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/FSTEnum.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/IntsRefFSTEnum.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/Outputs.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/fst/Util.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/packed/DirectReader.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/packed/DirectWriter.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoDecoder.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/analysis/TestLookaheadTokenFilter.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/util/TestArrayUtil.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/util/fst/TestBytesStore.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectPacked.java
lucene/dev/branches/lucene2878/lucene/facet/ (props changed)
lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/DrillSideways.java
lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java
lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java
lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeFacetCounts.java
lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/DocValuesOrdinalsReader.java
lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalMappingLeafReader.java
lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java
lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LabelToOrdinal.java
lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/TaxonomyWriterCache.java
lucene/dev/branches/lucene2878/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java
lucene/dev/branches/lucene2878/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java
lucene/dev/branches/lucene2878/lucene/grouping/ (props changed)
lucene/dev/branches/lucene2878/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractFirstPassGroupingCollector.java
lucene/dev/branches/lucene2878/lucene/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java
lucene/dev/branches/lucene2878/lucene/highlighter/ (props changed)
lucene/dev/branches/lucene2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
lucene/dev/branches/lucene2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
lucene/dev/branches/lucene2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
lucene/dev/branches/lucene2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
lucene/dev/branches/lucene2878/lucene/join/ (props changed)
lucene/dev/branches/lucene2878/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java
lucene/dev/branches/lucene2878/lucene/memory/ (props changed)
lucene/dev/branches/lucene2878/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/lucene2878/lucene/misc/ (props changed)
lucene/dev/branches/lucene2878/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java
lucene/dev/branches/lucene2878/lucene/misc/src/test/org/apache/lucene/index/sorter/TestBlockJoinSorter.java
lucene/dev/branches/lucene2878/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java
lucene/dev/branches/lucene2878/lucene/queries/ (props changed)
lucene/dev/branches/lucene2878/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
lucene/dev/branches/lucene2878/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java
lucene/dev/branches/lucene2878/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java
lucene/dev/branches/lucene2878/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
lucene/dev/branches/lucene2878/lucene/queryparser/ (props changed)
lucene/dev/branches/lucene2878/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java
lucene/dev/branches/lucene2878/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/AbstractQueryConfig.java
lucene/dev/branches/lucene2878/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/PrecedenceQueryNodeProcessorPipeline.java
lucene/dev/branches/lucene2878/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/StandardQueryParser.java
lucene/dev/branches/lucene2878/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldBoostMapFCListener.java
lucene/dev/branches/lucene2878/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldDateResolutionFCListener.java
lucene/dev/branches/lucene2878/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/BooleanModifierNode.java
lucene/dev/branches/lucene2878/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/SimpleQueryParser.java
lucene/dev/branches/lucene2878/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java
lucene/dev/branches/lucene2878/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeQueryBuilder.java
lucene/dev/branches/lucene2878/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java
lucene/dev/branches/lucene2878/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java
lucene/dev/branches/lucene2878/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
lucene/dev/branches/lucene2878/lucene/sandbox/ (props changed)
lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsFormat.java
lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsWriter.java
lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyQuery.java
lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyTermsEnum.java
lucene/dev/branches/lucene2878/lucene/spatial/ (props changed)
lucene/dev/branches/lucene2878/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java
lucene/dev/branches/lucene2878/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java
lucene/dev/branches/lucene2878/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java
lucene/dev/branches/lucene2878/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractVisitingPrefixTreeFilter.java
lucene/dev/branches/lucene2878/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java
lucene/dev/branches/lucene2878/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/CellIterator.java
lucene/dev/branches/lucene2878/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/GeohashPrefixTree.java
lucene/dev/branches/lucene2878/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyCell.java
lucene/dev/branches/lucene2878/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyPrefixTree.java
lucene/dev/branches/lucene2878/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java
lucene/dev/branches/lucene2878/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgs.java
lucene/dev/branches/lucene2878/lucene/spatial/src/java/org/apache/lucene/spatial/vector/PointVectorStrategy.java
lucene/dev/branches/lucene2878/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/JtsPolygonTest.java
lucene/dev/branches/lucene2878/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java
lucene/dev/branches/lucene2878/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java
lucene/dev/branches/lucene2878/lucene/suggest/ (props changed)
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FuzzySuggester.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
lucene/dev/branches/lucene2878/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java
lucene/dev/branches/lucene2878/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/analysis/MockGraphTokenFilter.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyStoredFieldsFormat.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyTermVectorsFormat.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/Rethrow.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java
lucene/dev/branches/lucene2878/solr/ (props changed)
lucene/dev/branches/lucene2878/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene2878/solr/README.txt (contents, props changed)
lucene/dev/branches/lucene2878/solr/SYSTEM_REQUIREMENTS.txt (contents, props changed)
lucene/dev/branches/lucene2878/solr/bin/ (props changed)
lucene/dev/branches/lucene2878/solr/bin/solr
lucene/dev/branches/lucene2878/solr/bin/solr.cmd (contents, props changed)
lucene/dev/branches/lucene2878/solr/bin/solr.in.cmd (contents, props changed)
lucene/dev/branches/lucene2878/solr/build.xml (contents, props changed)
lucene/dev/branches/lucene2878/solr/common-build.xml (contents, props changed)
lucene/dev/branches/lucene2878/solr/contrib/ (props changed)
lucene/dev/branches/lucene2878/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
lucene/dev/branches/lucene2878/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
lucene/dev/branches/lucene2878/solr/contrib/contrib-build.xml
lucene/dev/branches/lucene2878/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
lucene/dev/branches/lucene2878/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
lucene/dev/branches/lucene2878/solr/contrib/morphlines-core/build.xml
lucene/dev/branches/lucene2878/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
lucene/dev/branches/lucene2878/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
lucene/dev/branches/lucene2878/solr/core/ (props changed)
lucene/dev/branches/lucene2878/solr/core/build.xml
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/cloud/Overseer.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/core/Config.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/core/InitParams.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/core/PluginInfo.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/rest/RestManager.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/schema/BBoxField.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/schema/SchemaManager.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/spelling/suggest/fst/AnalyzingInfixLookupFactory.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/spelling/suggest/fst/BlendedInfixLookupFactory.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/store/blockcache/BufferStore.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/store/blockcache/Metrics.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/util/CommandOperation.java
lucene/dev/branches/lucene2878/solr/core/src/java/org/apache/solr/util/SolrCLI.java
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/schema11.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene2878/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/core/TestConfig.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/core/TestConfigSets.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/core/TestInitParams.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/rest/TestRestManager.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/search/TestRTGBase.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java
lucene/dev/branches/lucene2878/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java
lucene/dev/branches/lucene2878/solr/example/ (props changed)
lucene/dev/branches/lucene2878/solr/example/example-DIH/solr/db/conf/schema.xml
lucene/dev/branches/lucene2878/solr/example/example-DIH/solr/mail/conf/schema.xml
lucene/dev/branches/lucene2878/solr/example/example-DIH/solr/rss/conf/schema.xml
lucene/dev/branches/lucene2878/solr/example/example-DIH/solr/solr/conf/schema.xml
lucene/dev/branches/lucene2878/solr/example/multicore/core0/conf/solrconfig.xml
lucene/dev/branches/lucene2878/solr/example/multicore/core1/conf/solrconfig.xml
lucene/dev/branches/lucene2878/solr/licenses/ (props changed)
lucene/dev/branches/lucene2878/solr/server/build.xml
lucene/dev/branches/lucene2878/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
lucene/dev/branches/lucene2878/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
lucene/dev/branches/lucene2878/solr/server/solr/configsets/sample_techproducts_configs/conf/schema.xml
lucene/dev/branches/lucene2878/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
lucene/dev/branches/lucene2878/solr/site/ (props changed)
lucene/dev/branches/lucene2878/solr/site/html/tutorial.html
lucene/dev/branches/lucene2878/solr/solrj/ (props changed)
lucene/dev/branches/lucene2878/solr/solrj/build.xml
lucene/dev/branches/lucene2878/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
lucene/dev/branches/lucene2878/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
lucene/dev/branches/lucene2878/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
lucene/dev/branches/lucene2878/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
lucene/dev/branches/lucene2878/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
lucene/dev/branches/lucene2878/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
lucene/dev/branches/lucene2878/solr/test-framework/ (props changed)
lucene/dev/branches/lucene2878/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/lucene2878/solr/webapp/ (props changed)
lucene/dev/branches/lucene2878/solr/webapp/web/WEB-INF/web.xml
lucene/dev/branches/lucene2878/solr/webapp/web/css/styles/files.css
lucene/dev/branches/lucene2878/solr/webapp/web/js/scripts/files.js
lucene/dev/branches/lucene2878/solr/webapp/web/js/scripts/index.js
lucene/dev/branches/lucene2878/solr/webapp/web/js/scripts/plugins.js
Modified: lucene/dev/branches/lucene2878/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/build.xml?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/build.xml (original)
+++ lucene/dev/branches/lucene2878/build.xml Mon Dec 1 17:25:39 2014
@@ -68,6 +68,10 @@
</subant>
</target>
+ <target name="beast">
+ <fail message="The Beast only works inside of individual modules"/>
+ </target>
+
<target name="documentation" description="Generate Lucene and Solr Documentation">
<subant target="documentation" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
@@ -279,7 +283,7 @@
<echo>
SUCCESS: You must right-click your project and choose Refresh.
- Your project must use a Java 7 JRE.
+ Your project must use a Java 8 JRE.
</echo>
</target>
@@ -326,7 +330,7 @@ following two XML attributes/values (adj
JDKs you have defined locally - see
File | Project Structure | Platform Settings | SDKs):
- idea.jdk = project-jdk-name="1.7" project-jdk-type="JavaSDK"
+ idea.jdk = project-jdk-name="1.8" project-jdk-type="JavaSDK"
</echo>
</target>
@@ -373,22 +377,13 @@ File | Project Structure | Platform Sett
</subant>
</target>
- <target name="-nightly-smoke-java8params" if="smokeTestRelease.java8">
- <!-- convert path to UNIX style, so windows backslashes don't hurt escaping: -->
- <pathconvert targetos="unix" property="-smokeTestRelease.java8params">
- <regexpmapper from="^(.*)$" to="--test-java8 '\1'"/>
- <path location="${smokeTestRelease.java8}"/>
- </pathconvert>
- </target>
-
- <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it (pass '-DsmokeTestRelease.java8=/path/to/jdk1.8.0' to additionally test with Java 8)"
- depends="clean,-nightly-smoke-java8params">
- <fail message="To run nightly smoke, the JDK must be exactly Java 1.7, was: ${java.specification.version}">
+ <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it"
+ depends="clean">
+ <fail message="To run nightly smoke, the JDK must be exactly Java 1.8, was: ${java.specification.version}">
<condition>
- <not><equals arg1="${java.specification.version}" arg2="1.7"/></not>
+ <not><equals arg1="${java.specification.version}" arg2="1.8"/></not>
</condition>
</fail>
- <property name="-smokeTestRelease.java8params" value=""/><!-- (if not yet defined) -->
<exec executable="${python32.exe}" failonerror="true" taskname="python32">
<arg value="-V"/>
</exec>
@@ -412,7 +407,6 @@ File | Project Structure | Platform Sett
<!-- Tell Python not to write any bytecode cache into the filesystem: -->
<arg value="-B"/>
<arg file="dev-tools/scripts/smokeTestRelease.py"/>
- <arg line="${-smokeTestRelease.java8params}"/>
<arg value="--revision"/>
<arg value="skip"/>
<!-- pass ${version.base} here to emulate a real release, without appendix like "-SNAPSHOT": -->
Modified: lucene/dev/branches/lucene2878/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs (original)
+++ lucene/dev/branches/lucene2878/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs Mon Dec 1 17:25:39 2014
@@ -1,7 +1,7 @@
#Sun Sep 23 13:02:27 EDT 2012
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
@@ -18,7 +18,11 @@ org.eclipse.jdt.core.compiler.problem.mi
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=HIGH
+org.eclipse.jdt.core.compiler.taskTags=nocommit
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
Modified: lucene/dev/branches/lucene2878/dev-tools/idea/.idea/misc.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/dev-tools/idea/.idea/misc.xml?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/dev-tools/idea/.idea/misc.xml (original)
+++ lucene/dev/branches/lucene2878/dev-tools/idea/.idea/misc.xml Mon Dec 1 17:25:39 2014
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" subst.="idea.jdk" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" subst.="idea.jdk" />
</project>
Modified: lucene/dev/branches/lucene2878/dev-tools/idea/lucene/benchmark/src/benchmark.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/dev-tools/idea/lucene/benchmark/src/benchmark.iml?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/dev-tools/idea/lucene/benchmark/src/benchmark.iml (original)
+++ lucene/dev/branches/lucene2878/dev-tools/idea/lucene/benchmark/src/benchmark.iml Mon Dec 1 17:25:39 2014
@@ -34,5 +34,6 @@
<orderEntry type="module" module-name="lucene-core" />
<orderEntry type="module" module-name="queryparser" />
<orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="join" />
</component>
</module>
Modified: lucene/dev/branches/lucene2878/dev-tools/idea/lucene/highlighter/highlighter.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/dev-tools/idea/lucene/highlighter/highlighter.iml?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/dev-tools/idea/lucene/highlighter/highlighter.iml (original)
+++ lucene/dev/branches/lucene2878/dev-tools/idea/lucene/highlighter/highlighter.iml Mon Dec 1 17:25:39 2014
@@ -17,5 +17,6 @@
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="queries" />
<orderEntry type="module" module-name="lucene-core" />
+ <orderEntry type="module" module-name="join" />
</component>
</module>
Modified: lucene/dev/branches/lucene2878/dev-tools/maven/README.maven
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/dev-tools/maven/README.maven?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/dev-tools/maven/README.maven (original)
+++ lucene/dev/branches/lucene2878/dev-tools/maven/README.maven Mon Dec 1 17:25:39 2014
@@ -36,7 +36,7 @@ A. How to use nightly Jenkins-built Luce
B. How to generate Lucene/Solr Maven artifacts
- Prerequisites: JDK 1.7+ and Ant 1.8.2+
+ Prerequisites: JDK 1.8+ and Ant 1.8.2+
Run 'ant generate-maven-artifacts' to create an internal Maven
repository, including POMs, binary .jars, source .jars, and javadoc
@@ -50,7 +50,7 @@ B. How to generate Lucene/Solr Maven art
C. How to deploy Maven artifacts to a repository
- Prerequisites: JDK 1.7+ and Ant 1.8.2+
+ Prerequisites: JDK 1.8+ and Ant 1.8.2+
You can deploy targets for all of Lucene/Solr, only Lucene, or only Solr,
as in B. above. To deploy to a Maven repository, the command is the same
@@ -77,7 +77,7 @@ D. How to use Maven to build Lucene/Solr
The details, followed by some example Maven commands:
- 1. Prerequisites: JDK 1.7+ and Maven 2.2.1 or 3.X
+ 1. Prerequisites: JDK 1.8+ and Maven 2.2.1 or 3.X
2. Make sure your sources are up to date. If you checked your sources out
from the Apache Subversion repository, run "svn update" from the top
Modified: lucene/dev/branches/lucene2878/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/dev-tools/maven/pom.xml.template?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene2878/dev-tools/maven/pom.xml.template Mon Dec 1 17:25:39 2014
@@ -43,7 +43,7 @@
<vc-browse-base-url>http://svn.apache.org/viewvc/lucene/dev/trunk</vc-browse-base-url>
<specification.version>@spec.version@</specification.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
- <java.compat.version>1.7</java.compat.version>
+ <java.compat.version>1.8</java.compat.version>
<jetty.version>8.1.10.v20130312</jetty.version>
<!-- RandomizedTesting library system properties -->
Modified: lucene/dev/branches/lucene2878/dev-tools/scripts/createPatch.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/dev-tools/scripts/createPatch.py?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/dev-tools/scripts/createPatch.py (original)
+++ lucene/dev/branches/lucene2878/dev-tools/scripts/createPatch.py Mon Dec 1 17:25:39 2014
@@ -30,10 +30,11 @@ import os
import subprocess
import sys
-def make_filter_func(src_dir):
- if os.path.exists(os.path.join(src_dir, '.git')):
+def make_filter_func(src_root, src_dir):
+ git_root = os.path.join(src_root, '.git')
+ if os.path.exists(git_root):
def git_filter(filename):
- rc = subprocess.call('git --git-dir=%s check-ignore %s' % (src_dir, filename), shell=True)
+ rc = subprocess.call('git --git-dir=%s check-ignore %s' % (git_root, filename), shell=True, stdout=subprocess.DEVNULL)
return rc == 0
return git_filter
@@ -89,7 +90,7 @@ def run_diff(from_dir, to_dir, skip_whit
flags += 'bBw'
args = ['diff', flags]
- for ignore in ('.svn', '.git', 'build', '.caches'):
+ for ignore in ('.svn', '.git', 'build', '.caches', '.idea', 'idea-build'):
args.append('-x')
args.append(ignore)
args.append(from_dir)
@@ -97,6 +98,13 @@ def run_diff(from_dir, to_dir, skip_whit
return subprocess.Popen(args, shell=False, stdout=subprocess.PIPE)
+def find_root(path):
+ relative = []
+ while not os.path.exists(os.path.join(path, 'lucene', 'CHANGES.txt')):
+ path, base = os.path.split(path)
+ relative.insert(0, base)
+ return path, '' if not relative else os.path.normpath(os.path.join(*relative))
+
def parse_config():
parser = ArgumentParser(description=__doc__, formatter_class=RawTextHelpFormatter)
parser.add_argument('--skip-whitespace', action='store_true', default=False,
@@ -107,20 +115,24 @@ def parse_config():
if not os.path.isdir(c.from_dir):
parser.error('\'from\' path %s is not a valid directory' % c.from_dir)
- if not os.path.exists(os.path.join(c.from_dir, 'lucene', 'CHANGES.txt')):
- parser.error('\'from\' path %s is not a valid lucene/solr checkout' % c.from_dir)
+ (c.from_root, from_relative) = find_root(c.from_dir)
+ if c.from_root is None:
+ parser.error('\'from\' path %s is not relative to a lucene/solr checkout' % c.from_dir)
if not os.path.isdir(c.to_dir):
parser.error('\'to\' path %s is not a valid directory' % c.to_dir)
- if not os.path.exists(os.path.join(c.to_dir, 'lucene', 'CHANGES.txt')):
- parser.error('\'to\' path %s is not a valid lucene/solr checkout' % c.to_dir)
-
+ (c.to_root, to_relative) = find_root(c.to_dir)
+ if c.to_root is None:
+ parser.error('\'to\' path %s is not relative to a lucene/solr checkout' % c.to_dir)
+ if from_relative != to_relative:
+ parser.error('\'from\' and \'to\' path are not equivalent relative paths within their'
+ ' checkouts: %r != %r' % (from_relative, to_relative))
return c
def main():
c = parse_config()
p = run_diff(c.from_dir, c.to_dir, c.skip_whitespace)
- should_filter = make_filter_func(c.from_dir)
+ should_filter = make_filter_func(c.from_root, c.from_dir)
print_filtered_output(p.stdout, should_filter)
if __name__ == '__main__':
Modified: lucene/dev/branches/lucene2878/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/dev-tools/scripts/smokeTestRelease.py?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/lucene2878/dev-tools/scripts/smokeTestRelease.py Mon Dec 1 17:25:39 2014
@@ -171,15 +171,15 @@ def checkJARMetaData(desc, jarFile, svnR
for verify in (
'Specification-Vendor: The Apache Software Foundation',
'Implementation-Vendor: The Apache Software Foundation',
- # Make sure 1.7 compiler was used to build release bits:
- 'X-Compile-Source-JDK: 1.7',
+ # Make sure 1.8 compiler was used to build release bits:
+ 'X-Compile-Source-JDK: 1.8',
# Make sure 1.8 ant was used to build release bits: (this will match 1.8+)
'Ant-Version: Apache Ant 1.8',
- # Make sure .class files are 1.7 format:
- 'X-Compile-Target-JDK: 1.7',
+ # Make sure .class files are 1.8 format:
+ 'X-Compile-Target-JDK: 1.8',
'Specification-Version: %s' % version,
- # Make sure the release was compiled with 1.7:
- 'Created-By: 1.7'):
+ # Make sure the release was compiled with 1.8:
+ 'Created-By: 1.8'):
if s.find(verify) == -1:
raise RuntimeError('%s is missing "%s" inside its META-INF/MANIFEST.MF' % \
(desc, verify))
@@ -705,54 +705,32 @@ def verifyUnpacked(java, project, artifa
raise RuntimeError('source release has WARs...')
print(' run "ant validate"')
- java.run_java7('ant validate', '%s/validate.log' % unpackPath)
+ java.run_java8('ant validate', '%s/validate.log' % unpackPath)
if project == 'lucene':
- print(" run tests w/ Java 7 and testArgs='%s'..." % testArgs)
- java.run_java7('ant clean test %s' % testArgs, '%s/test.log' % unpackPath)
- java.run_java7('ant jar', '%s/compile.log' % unpackPath)
- testDemo(java.run_java7, isSrc, version, '1.7')
+ print(" run tests w/ Java 8 and testArgs='%s'..." % testArgs)
+ java.run_java8('ant clean test %s' % testArgs, '%s/test.log' % unpackPath)
+ java.run_java8('ant jar', '%s/compile.log' % unpackPath)
+ testDemo(java.run_java8, isSrc, version, '1.8')
- print(' generate javadocs w/ Java 7...')
- java.run_java7('ant javadocs', '%s/javadocs.log' % unpackPath)
+ print(' generate javadocs w/ Java 8...')
+ java.run_java8('ant javadocs', '%s/javadocs.log' % unpackPath)
checkJavadocpathFull('%s/build/docs' % unpackPath)
- if java.run_java8:
- print(" run tests w/ Java 8 and testArgs='%s'..." % testArgs)
- java.run_java8('ant clean test %s' % testArgs, '%s/test.log' % unpackPath)
- java.run_java8('ant jar', '%s/compile.log' % unpackPath)
- testDemo(java.run_java8, isSrc, version, '1.8')
-
- print(' generate javadocs w/ Java 8...')
- java.run_java8('ant javadocs', '%s/javadocs.log' % unpackPath)
- checkJavadocpathFull('%s/build/docs' % unpackPath)
-
else:
os.chdir('solr')
- print(" run tests w/ Java 7 and testArgs='%s'..." % testArgs)
- java.run_java7('ant clean test -Dtests.slow=false %s' % testArgs, '%s/test.log' % unpackPath)
+ print(" run tests w/ Java 8 and testArgs='%s'..." % testArgs)
+ java.run_java8('ant clean test -Dtests.slow=false %s' % testArgs, '%s/test.log' % unpackPath)
# test javadocs
- print(' generate javadocs w/ Java 7...')
- java.run_java7('ant clean javadocs', '%s/javadocs.log' % unpackPath)
+ print(' generate javadocs w/ Java 8...')
+ java.run_java8('ant clean javadocs', '%s/javadocs.log' % unpackPath)
checkJavadocpathFull('%s/solr/build/docs' % unpackPath, False)
- print(' test solr example w/ Java 7...')
- java.run_java7('ant clean example', '%s/antexample.log' % unpackPath)
- testSolrExample(unpackPath, java.java7_home, True)
-
- if java.run_java8:
- print(" run tests w/ Java 8 and testArgs='%s'..." % testArgs)
- java.run_java8('ant clean test -Dtests.slow=false %s' % testArgs, '%s/test.log' % unpackPath)
-
- print(' generate javadocs w/ Java 8...')
- java.run_java8('ant clean javadocs', '%s/javadocs.log' % unpackPath)
- checkJavadocpathFull('%s/solr/build/docs' % unpackPath, False)
-
- print(' test solr example w/ Java 8...')
- java.run_java8('ant clean example', '%s/antexample.log' % unpackPath)
- testSolrExample(unpackPath, java.java8_home, True)
+ print(' test solr example w/ Java 8...')
+ java.run_java8('ant clean example', '%s/antexample.log' % unpackPath)
+ testSolrExample(unpackPath, java.java8_home, True)
os.chdir('..')
print(' check NOTICE')
@@ -763,9 +741,7 @@ def verifyUnpacked(java, project, artifa
checkAllJARs(os.getcwd(), project, svnRevision, version, tmpDir, baseURL)
if project == 'lucene':
- testDemo(java.run_java7, isSrc, version, '1.7')
- if java.run_java8:
- testDemo(java.run_java8, isSrc, version, '1.8')
+ testDemo(java.run_java8, isSrc, version, '1.8')
print(' check Lucene\'s javadoc JAR')
checkJavadocpath('%s/docs' % unpackPath)
@@ -773,24 +749,14 @@ def verifyUnpacked(java, project, artifa
else:
checkSolrWAR('%s/server/webapps/solr.war' % unpackPath, svnRevision, version, tmpDir, baseURL)
- print(' copying unpacked distribution for Java 7 ...')
- java7UnpackPath = '%s-java7' % unpackPath
- if os.path.exists(java7UnpackPath):
- shutil.rmtree(java7UnpackPath)
- shutil.copytree(unpackPath, java7UnpackPath)
- os.chdir(java7UnpackPath)
- print(' test solr example w/ Java 7...')
- testSolrExample(java7UnpackPath, java.java7_home, False)
-
- if java.run_java8:
- print(' copying unpacked distribution for Java 8 ...')
- java8UnpackPath = '%s-java8' % unpackPath
- if os.path.exists(java8UnpackPath):
- shutil.rmtree(java8UnpackPath)
- shutil.copytree(unpackPath, java8UnpackPath)
- os.chdir(java8UnpackPath)
- print(' test solr example w/ Java 8...')
- testSolrExample(java8UnpackPath, java.java8_home, False)
+ print(' copying unpacked distribution for Java 8 ...')
+ java8UnpackPath = '%s-java8' % unpackPath
+ if os.path.exists(java8UnpackPath):
+ shutil.rmtree(java8UnpackPath)
+ shutil.copytree(unpackPath, java8UnpackPath)
+ os.chdir(java8UnpackPath)
+ print(' test solr example w/ Java 8...')
+ testSolrExample(java8UnpackPath, java.java8_home, False)
os.chdir(unpackPath)
@@ -859,8 +825,13 @@ def testSolrExample(unpackPath, javaPath
env.update(os.environ)
env['JAVA_HOME'] = javaPath
env['PATH'] = '%s/bin:%s' % (javaPath, env['PATH'])
+
# Stop Solr running on port 8983 (in case a previous run didn't shutdown cleanly)
- subprocess.call(['bin/solr','stop','-p','8983'])
+ try:
+ subprocess.call(['bin/solr','stop','-p','8983'])
+ except:
+ print(' Stop failed due to: '+sys.exc_info()[0])
+
print(' starting Solr on port 8983 from %s' % unpackPath)
server = subprocess.Popen(['bin/solr', '-f', '-p', '8983'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE, env=env)
@@ -1297,16 +1268,13 @@ def make_java_config(parser, java8_home)
def run_java(cmd, logfile):
run('%s; %s' % (cmd_prefix, cmd), logfile)
return run_java
- java7_home = os.environ.get('JAVA_HOME')
- if java7_home is None:
+ java8_home = os.environ.get('JAVA_HOME')
+ if java8_home is None:
parser.error('JAVA_HOME must be set')
- run_java7 = _make_runner(java7_home, '1.7')
- run_java8 = None
- if java8_home is not None:
- run_java8 = _make_runner(java8_home, '1.8')
+ run_java8 = _make_runner(java8_home, '1.8')
- jc = namedtuple('JavaConfig', 'run_java7 java7_home run_java8 java8_home')
- return jc(run_java7, java7_home, run_java8, java8_home)
+ jc = namedtuple('JavaConfig', 'run_java8 java8_home')
+ return jc(run_java8, java8_home)
version_re = re.compile(r'(\d+\.\d+\.\d+(-ALPHA|-BETA)?)')
revision_re = re.compile(r'rev(\d+)')
Modified: lucene/dev/branches/lucene2878/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/CHANGES.txt?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene2878/lucene/CHANGES.txt Mon Dec 1 17:25:39 2014
@@ -115,6 +115,8 @@ New Features
suggesters from multi-valued fields. (Varun Thacker via Mike
McCandless)
+* LUCENE-6077: Added a filter cache. (Adrien Grand, Robert Muir)
+
API Changes
* LUCENE-5900: Deprecated more constructors taking Version in *InfixSuggester and
@@ -225,6 +227,8 @@ API Changes
* LUCENE-6068: LeafReader.fields() never returns null. (Robert Muir)
+* LUCENE-6082: Remove abort() from codec apis. (Robert Muir)
+
Bug Fixes
* LUCENE-5650: Enforce read-only access to any path outside the temporary
@@ -311,6 +315,9 @@ Tests
Some of the slow Monster tests now explicitly choose the default codec.
(Mike McCandless, Shawn Heisey)
+* LUCENE-5968: Improve error message when 'ant beast' is run on top-level
+ modules. (Ramkumar Aiyengar, Uwe Schindler)
+
Optimizations
* LUCENE-5960: Use a more efficient bitset, not a Set<Integer>, to
@@ -345,6 +352,11 @@ Optimizations
* LUCENE-6033: CachingTokenFilter now uses ArrayList not LinkedList, and has new
isCached() method. (David Smiley)
+* LUCENE-6031: TokenSources (in the default highlighter) converts term vectors into a
+ TokenStream much faster in linear time (not N*log(N) using less memory, and with reset()
+ implemented. Only one of offsets or positions are required of the term vector.
+ (David Smiley)
+
Build
* LUCENE-5909: Smoke tester now has better command line parsing and
Modified: lucene/dev/branches/lucene2878/lucene/analysis/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/build.xml?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/build.xml (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/build.xml Mon Dec 1 17:25:39 2014
@@ -105,6 +105,9 @@
<target name="test">
<forall-analyzers target="test"/>
</target>
+ <target name="beast">
+ <fail message="The Beast only works inside of individual modules"/>
+ </target>
<target name="jar">
<forall-analyzers target="jar-core"/>
</target>
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java Mon Dec 1 17:25:39 2014
@@ -232,8 +232,8 @@ public class BrazilianStemmer {
/**
* 1) Turn to lowercase
* 2) Remove accents
- * 3) ã -> a ; õ -> o
- * 4) ç -> c
+ * 3) ã -> a ; õ -> o
+ * 4) ç -> c
*
* @return null or a string transformed
*/
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilter.java?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilter.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilter.java Mon Dec 1 17:25:39 2014
@@ -294,7 +294,7 @@ public final class CJKBigramFilter exten
/**
* Flushes a bigram token to output from our buffer
- * This is the normal case, e.g. ABC -> AB BC
+ * This is the normal case, e.g. ABC -> AB BC
*/
private void flushBigram() {
clearAttributes();
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java Mon Dec 1 17:25:39 2014
@@ -108,7 +108,7 @@ public final class CzechAnalyzer extends
* @return {@link org.apache.lucene.analysis.Analyzer.TokenStreamComponents}
* built from a {@link StandardTokenizer} filtered with
* {@link StandardFilter}, {@link LowerCaseFilter}, {@link StopFilter}
- * , and {@link CzechStemFilter} (only if version is >= LUCENE_31). If
+ * , and {@link CzechStemFilter} (only if version is >= LUCENE_31). If
* a stem exclusion set is provided via
* {@link #CzechAnalyzer(CharArraySet, CharArraySet)} a
* {@link SetKeywordMarkerFilter} is added before
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java Mon Dec 1 17:25:39 2014
@@ -161,12 +161,12 @@ public class GermanStemmer
/**
* Do some substitutions for the term to reduce overstemming:
*
- * - Substitute Umlauts with their corresponding vowel: äöü -> aou,
+ * - Substitute Umlauts with their corresponding vowel:{@code äöü -> aou},
* "Ã" is substituted by "ss"
* - Substitute a second char of a pair of equal characters with
- * an asterisk: ?? -> ?*
+ * an asterisk: {@code ?? -> ?*}
* - Substitute some common character combinations with a token:
- * sch/ch/ei/ie/ig/st -> $/§/%/&/#/!
+ * {@code sch/ch/ei/ie/ig/st -> $/§/%/&/#/!}
*/
private void substitute( StringBuilder buffer )
{
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java Mon Dec 1 17:25:39 2014
@@ -248,7 +248,7 @@ public class KStemmer {
* word, use the method wordLength, which returns (k+1).
*/
- /***
+ /*
* private void initializeStemHash() { if (maxCacheSize > 0) cache = new
* CharArrayMap<String>(maxCacheSize,false); }
***/
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java Mon Dec 1 17:25:39 2014
@@ -447,7 +447,7 @@ public class Dictionary {
* @param reader BufferedReader to read the content of the rule from
* @param conditionPattern {@link String#format(String, Object...)} pattern to be used to generate the condition regex
* pattern
- * @param seenPatterns map from condition -> index of patterns, for deduplication.
+ * @param seenPatterns map from condition -> index of patterns, for deduplication.
* @throws IOException Can be thrown while reading the rule
*/
private void parseAffix(TreeMap<String,List<Integer>> affixes,
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemmer.java?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemmer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemmer.java Mon Dec 1 17:25:39 2014
@@ -87,10 +87,10 @@ public class LatvianStemmer {
/**
* Most cases are handled except for the ambiguous ones:
* <ul>
- * <li> s -> Å¡
- * <li> t -> Å¡
- * <li> d -> ž
- * <li> z -> ž
+ * <li> s -> Å¡
+ * <li> t -> Å¡
+ * <li> d -> ž
+ * <li> z -> ž
* </ul>
*/
private int unpalatalize(char s[], int len) {
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilter.java?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilter.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilter.java Mon Dec 1 17:25:39 2014
@@ -153,7 +153,7 @@ public final class ASCIIFoldingFilter ex
* accents are removed from accented characters.
* @param input The characters to fold
* @param inputPos Index of the first character to fold
- * @param output The result of the folding. Should be of size >= {@code length * 4}.
+ * @param output The result of the folding. Should be of size >= {@code length * 4}.
* @param outputPos Index of output where to put the result of the folding
* @param length The number of characters to fold
* @return length of output
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilter.java?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilter.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilter.java Mon Dec 1 17:25:39 2014
@@ -65,7 +65,7 @@ public final class CapitalizationFilter
* @param forceFirstLetter Force the first letter to be capitalized even if it is in the keep list.
* @param okPrefix do not change word capitalization if a word begins with something in this list.
* @param minWordLength how long the word needs to be to get capitalization applied. If the
- * minWordLength is 3, "and" > "And" but "or" stays "or".
+ * minWordLength is 3, "and" > "And" but "or" stays "or".
* @param maxWordCount if the token contains more then maxWordCount words, the capitalization is
* assumed to be correct.
* @param maxTokenLength ???
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java Mon Dec 1 17:25:39 2014
@@ -39,7 +39,7 @@ import java.util.Set;
* for example if "McK" is on the okPrefix list, the word "McKinley" should not be changed to
* "Mckinley"<br/>
* "minWordLength" - how long the word needs to be to get capitalization applied. If the
- * minWordLength is 3, "and" > "And" but "or" stays "or"<br/>
+ * minWordLength is 3, "and" > "And" but "or" stays "or"<br/>
* "maxWordCount" - if the token contains more then maxWordCount words, the capitalization is
* assumed to be correct.<br/>
*
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilter.java?rev=1642718&r1=1642717&r2=1642718&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilter.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilter.java Mon Dec 1 17:25:39 2014
@@ -25,7 +25,7 @@ import org.apache.lucene.analysis.util.S
import java.io.IOException;
/**
- * This filter folds Scandinavian characters Ã¥Ã
äæÃÃ->a and öÃøÃ->o.
+ * This filter folds Scandinavian characters Ã¥Ã
äæÃÃ->a and öÃøÃ->o.
* It also discriminate against use of double vowels aa, ae, ao, oe and oo, leaving just the first one.
* <p/>
* It's is a semantically more destructive solution than {@link ScandinavianNormalizationFilter} but