Revision 1143719

Jump to revision:
Author:	simonw
Date:	Thu Jul 7 09:03:58 2011 UTC (13 years, 3 months ago)
Changed paths:	1214 (showing only 100; show all)
Log Message:	merged with trunk

Changed paths

Path	Details
lucene/dev/branches/LUCENE2793/	modified , props changed
lucene/dev/branches/LUCENE2793/.gitignore (Copied from lucene/dev/trunk/.gitignore, r1143677)	added
lucene/dev/branches/LUCENE2793/dev-tools/eclipse/dot.classpath	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/eclipse/lucene-codestyle.xml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/ant.xml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/modules.xml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/.idea/workspace.xml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/	modified , props changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/demo/demo.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/memory/memory.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/misc/misc.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/queries/queries-contrib.iml (Copied from lucene/dev/trunk/dev-tools/idea/lucene/contrib/queries/queries-contrib.iml, r1143677)	added
lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/queries/queries.iml	deleted
lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/queryparser/queryparser-contrib.iml (Copied from lucene/dev/trunk/dev-tools/idea/lucene/contrib/queryparser/queryparser-contrib.iml, r1143677)	added
lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml	deleted
lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/spatial/spatial.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/common/analysis-common.iml (Copied from lucene/dev/trunk/dev-tools/idea/modules/analysis/common/analysis-common.iml, r1143677)	added
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/common/common.iml	deleted
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/icu/icu.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/morfologik/ (Copied from lucene/dev/trunk/dev-tools/idea/modules/analysis/morfologik, r1143677)	added
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/morfologik/morfologik.iml (Copied from lucene/dev/trunk/dev-tools/idea/modules/analysis/morfologik/morfologik.iml, r1143677)	replaced
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/phonetic/phonetic.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/smartcn/smartcn.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/analysis/stempel/stempel.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/benchmark/benchmark.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/facet/ (Copied from lucene/dev/trunk/dev-tools/idea/modules/facet, r1143677)	added
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/facet/facet.iml (Copied from lucene/dev/trunk/dev-tools/idea/modules/facet/facet.iml, r1143677)	replaced
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/join/ (Copied from lucene/dev/trunk/dev-tools/idea/modules/join, r1143677)	added
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/join/join.iml (Copied from lucene/dev/trunk/dev-tools/idea/modules/join/join.iml, r1143677)	replaced
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/queries/ (Copied from lucene/dev/trunk/dev-tools/idea/modules/queries, r1143677)	added
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/queries/queries.iml (Copied from lucene/dev/trunk/dev-tools/idea/modules/queries/queries.iml, r1143677)	replaced
lucene/dev/branches/LUCENE2793/dev-tools/idea/modules/suggest/suggest.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/contrib/clustering/clustering.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/idea/solr/solr.iml	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/maven/README.maven	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/misc/pom.xml.template	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/queries/pom.xml.template	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/queryparser/pom.xml.template	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/spatial/pom.xml.template	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/wordnet/pom.xml.template	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml.template	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/analysis/morfologik/ (Copied from lucene/dev/trunk/dev-tools/maven/modules/analysis/morfologik, r1143677)	added
lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/analysis/morfologik/pom.xml.template (Copied from lucene/dev/trunk/dev-tools/maven/modules/analysis/morfologik/pom.xml.template, r1143677)	replaced
lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/analysis/pom.xml.template	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/facet/ (Copied from lucene/dev/trunk/dev-tools/maven/modules/facet, r1143677)	added
lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/facet/pom.xml.template (Copied from lucene/dev/trunk/dev-tools/maven/modules/facet/pom.xml.template, r1143677)	replaced
lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/join/ (Copied from lucene/dev/trunk/dev-tools/maven/modules/join, r1143677)	added
lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/join/pom.xml.template (Copied from lucene/dev/trunk/dev-tools/maven/modules/join/pom.xml.template, r1143677)	replaced
lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/pom.xml.template	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/queries/ (Copied from lucene/dev/trunk/dev-tools/maven/modules/queries, r1143677)	added
lucene/dev/branches/LUCENE2793/dev-tools/maven/modules/queries/pom.xml.template (Copied from lucene/dev/trunk/dev-tools/maven/modules/queries/pom.xml.template, r1143677)	replaced
lucene/dev/branches/LUCENE2793/dev-tools/maven/pom.xml.template	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/maven/solr/src/pom.xml.template	modified , text changed
lucene/dev/branches/LUCENE2793/dev-tools/scripts/smokeTestRelease.py	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/	modified , props changed
lucene/dev/branches/LUCENE2793/lucene/BUILD.txt	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/CHANGES.txt	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/MIGRATE.txt	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/README.txt	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/common-build.xml	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/CHANGES.txt	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/contrib-build.xml	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/build.xml	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FastVectorHighlighter.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsEnum.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndex.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermsEnum.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/misc/build.xml	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/misc/src/java/org/apache/lucene/index/FieldNormModifier.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/misc/src/java/org/apache/lucene/index/TermVectorAccessor.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java	modified , text changed
lucene/dev/branches/LUCENE2793/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java	modified , text changed
[...]