Revision 1135759

Jump to revision:
Author:	sarowe
Date:	Tue Jun 14 19:26:27 2011 UTC (13 years, 4 months ago)
Changed paths:	152 (showing only 100; show all)
Log Message:	Merged with trunk up to r1135758

Changed paths

Path	Details
lucene/dev/branches/solr2452/	modified , props changed
lucene/dev/branches/solr2452/dev-tools/idea/.idea/compiler.xml	modified , text changed
lucene/dev/branches/solr2452/dev-tools/idea/lucene/lucene.iml	modified , text changed
lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml	modified , text changed
lucene/dev/branches/solr2452/lucene/	modified , props changed
lucene/dev/branches/solr2452/lucene/CHANGES.txt	modified , text changed
lucene/dev/branches/solr2452/lucene/backwards/backwards-readme.txt	modified , text changed
lucene/dev/branches/solr2452/lucene/build.xml	modified , text changed
lucene/dev/branches/solr2452/lucene/contrib/CHANGES.txt	modified , text changed
lucene/dev/branches/solr2452/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java	modified , text changed
lucene/dev/branches/solr2452/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java (Copied from lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManager.java, r1135665)	added
lucene/dev/branches/solr2452/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManagerReopenThread.java (Copied from lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/NRTManagerReopenThread.java, r1135665)	added
lucene/dev/branches/solr2452/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java	modified , text changed
lucene/dev/branches/solr2452/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java (Copied from lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java, r1135665)	added , text changed
lucene/dev/branches/solr2452/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java	modified , props changed
lucene/dev/branches/solr2452/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java	modified , props changed
lucene/dev/branches/solr2452/lucene/docs/	deleted
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/CheckIndex.java	modified , text changed
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/CompoundFileReader.java	modified , text changed
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java	modified , text changed
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/IndexWriter.java	modified , text changed
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/MergePolicy.java	modified , text changed
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java	modified , text changed
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/store/FSDirectory.java	modified , text changed
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/store/InputStreamDataInput.java (Copied from lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/InputStreamDataInput.java, r1135665)	added
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/store/MMapDirectory.java	modified , text changed
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/store/OutputStreamDataOutput.java (Copied from lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/OutputStreamDataOutput.java, r1135665)	added
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/util/TwoPhaseCommit.java (Copied from lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/TwoPhaseCommit.java, r1135665)	added
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/util/TwoPhaseCommitTool.java (Copied from lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/TwoPhaseCommitTool.java, r1135665)	added
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/util/fst/FST.java	modified , text changed
lucene/dev/branches/solr2452/lucene/src/site/	modified , props changed
lucene/dev/branches/solr2452/lucene/src/site/build/ (Copied from lucene/dev/trunk/lucene/src/site/build, r1135665)	added , props changed
lucene/dev/branches/solr2452/lucene/src/site/build/site/ (Copied from lucene/dev/trunk/lucene/src/site/build/site, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/.htaccess (Copied from lucene/dev/trunk/lucene/src/site/build/site/.htaccess, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/broken-links.xml (Copied from lucene/dev/trunk/lucene/src/site/build/site/broken-links.xml, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/contributions.html (Copied from lucene/dev/trunk/lucene/src/site/build/site/contributions.html, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/demo.html (Copied from lucene/dev/trunk/lucene/src/site/build/site/demo.html, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/demo2.html (Copied from lucene/dev/trunk/lucene/src/site/build/site/demo2.html, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/fileformats.html (Copied from lucene/dev/trunk/lucene/src/site/build/site/fileformats.html, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/gettingstarted.html (Copied from lucene/dev/trunk/lucene/src/site/build/site/gettingstarted.html, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/images/ (Copied from lucene/dev/trunk/lucene/src/site/build/site/images, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/images/built-with-forrest-button.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/images/built-with-forrest-button.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/images/favicon.ico (Copied from lucene/dev/trunk/lucene/src/site/build/site/images/favicon.ico, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/images/instruction_arrow.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/images/instruction_arrow.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/index.html (Copied from lucene/dev/trunk/lucene/src/site/build/site/index.html, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/linkmap.html (Copied from lucene/dev/trunk/lucene/src/site/build/site/linkmap.html, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/lucene-contrib/ (Copied from lucene/dev/trunk/lucene/src/site/build/site/lucene-contrib, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/lucene-contrib/index.html (Copied from lucene/dev/trunk/lucene/src/site/build/site/lucene-contrib/index.html, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/queryparsersyntax.html (Copied from lucene/dev/trunk/lucene/src/site/build/site/queryparsersyntax.html, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/scoring.html (Copied from lucene/dev/trunk/lucene/src/site/build/site/scoring.html, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/ (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/CommonMessages_de.xml (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/CommonMessages_de.xml, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/CommonMessages_en_US.xml (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/CommonMessages_en_US.xml, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/CommonMessages_es.xml (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/CommonMessages_es.xml, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/CommonMessages_fr.xml (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/CommonMessages_fr.xml, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/basic.css (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/basic.css, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/breadcrumbs-optimized.js (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/breadcrumbs-optimized.js, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/breadcrumbs.js (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/breadcrumbs.js, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/css/ (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/css, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/fontsize.js (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/fontsize.js, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/getBlank.js (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/getBlank.js, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/getMenu.js (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/getMenu.js, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/ (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/README.txt (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/README.txt, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/add.jpg (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/add.jpg, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/apache-thanks.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/apache-thanks.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/built-with-cocoon.gif (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/built-with-cocoon.gif, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/built-with-forrest-button.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/built-with-forrest-button.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/chapter.gif (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/chapter.gif, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/corner-imports.svg.xslt (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/corner-imports.svg.xslt, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/current.gif (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/current.gif, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/dc.svg.xslt (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/dc.svg.xslt, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/external-link.gif (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/external-link.gif, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/fix.jpg (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/fix.jpg, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/forrest-credit-logo.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/forrest-credit-logo.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/hack.jpg (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/hack.jpg, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/page.gif (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/page.gif, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/pdfdoc.gif (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/pdfdoc.gif, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/poddoc.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/poddoc.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/poddoc.svg.xslt (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/poddoc.svg.xslt, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/printer.gif (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/printer.gif, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/rc-b-l-15-1body-2menu-3menu.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/rc-b-l-15-1body-2menu-3menu.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/rc-b-r-15-1body-2menu-3menu.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/rc-b-r-15-1body-2menu-3menu.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/rc-t-r-15-1body-2menu-3menu.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/rc-t-r-15-1body-2menu-3menu.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/rc.svg.xslt (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/rc.svg.xslt, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/remove.jpg (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/remove.jpg, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/rss.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/rss.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/spacer.gif (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/spacer.gif, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/txtdoc.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/txtdoc.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/txtdoc.svg.xslt (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/txtdoc.svg.xslt, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/update.jpg (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/update.jpg, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/valid-html401.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/valid-html401.png, r1135665)	replaced
lucene/dev/branches/solr2452/lucene/src/site/build/site/skin/images/vcss.png (Copied from lucene/dev/trunk/lucene/src/site/build/site/skin/images/vcss.png, r1135665)	replaced
[...]