lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r381429 - in /lucene/java/branches/lucene_1_9: ./ contrib/highlighter/src/java/org/apache/lucene/search/highlight/ contrib/highlighter/src/test/org/apache/lucene/search/highlight/ contrib/lucli/ contrib/queries/ contrib/queries/src/ contrib...
Date Mon, 27 Feb 2006 20:17:10 GMT
Author: cutting
Date: Mon Feb 27 12:17:01 2006
New Revision: 381429

URL: http://svn.apache.org/viewcvs?rev=381429&view=rev
Log:
Merge -r 379518:381427 from trunk to 1.9 branch prior to release.

Added:
    lucene/java/branches/lucene_1_9/contrib/queries/
      - copied from r381422, lucene/java/trunk/contrib/queries/
    lucene/java/branches/lucene_1_9/contrib/queries/build.xml
      - copied unchanged from r381422, lucene/java/trunk/contrib/queries/build.xml
    lucene/java/branches/lucene_1_9/contrib/queries/readme.txt
      - copied unchanged from r381422, lucene/java/trunk/contrib/queries/readme.txt
    lucene/java/branches/lucene_1_9/contrib/queries/src/
      - copied from r381422, lucene/java/trunk/contrib/queries/src/
    lucene/java/branches/lucene_1_9/contrib/queries/src/java/
      - copied from r381422, lucene/java/trunk/contrib/queries/src/java/
    lucene/java/branches/lucene_1_9/contrib/queries/src/java/org/
      - copied from r381422, lucene/java/trunk/contrib/queries/src/java/org/
    lucene/java/branches/lucene_1_9/contrib/queries/src/java/org/apache/
      - copied from r381422, lucene/java/trunk/contrib/queries/src/java/org/apache/
    lucene/java/branches/lucene_1_9/contrib/queries/src/java/org/apache/lucene/
      - copied from r381422, lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/
    lucene/java/branches/lucene_1_9/contrib/queries/src/java/org/apache/lucene/search/
      - copied from r381422, lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/search/
    lucene/java/branches/lucene_1_9/contrib/queries/src/java/org/apache/lucene/search/BoostingQuery.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/search/BoostingQuery.java
    lucene/java/branches/lucene_1_9/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/search/FuzzyLikeThisQuery.java
    lucene/java/branches/lucene_1_9/contrib/queries/src/java/org/apache/lucene/search/TermsFilter.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/search/TermsFilter.java
    lucene/java/branches/lucene_1_9/contrib/queries/src/java/org/apache/lucene/search/similar/
      - copied from r381422, lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/search/similar/
    lucene/java/branches/lucene_1_9/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java
    lucene/java/branches/lucene_1_9/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThisQuery.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThisQuery.java
    lucene/java/branches/lucene_1_9/contrib/queries/src/java/org/apache/lucene/search/similar/SimilarityQueries.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/search/similar/SimilarityQueries.java
    lucene/java/branches/lucene_1_9/contrib/queries/src/java/org/apache/lucene/search/similar/package.html
      - copied unchanged from r381422, lucene/java/trunk/contrib/queries/src/java/org/apache/lucene/search/similar/package.html
    lucene/java/branches/lucene_1_9/contrib/regex/lib/regexp.LICENSE
      - copied unchanged from r381422, lucene/java/trunk/contrib/regex/lib/regexp.LICENSE
    lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/package.html
      - copied unchanged from r381422, lucene/java/trunk/contrib/regex/src/java/org/apache/lucene/search/regex/package.html
    lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/regexp/package.html
      - copied unchanged from r381422, lucene/java/trunk/contrib/regex/src/java/org/apache/regexp/package.html
    lucene/java/branches/lucene_1_9/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/package.html
      - copied unchanged from r381422, lucene/java/trunk/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/package.html
    lucene/java/branches/lucene_1_9/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/package.html
      - copied unchanged from r381422, lucene/java/trunk/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/package.html
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/
      - copied from r381422, lucene/java/trunk/contrib/xml-query-parser/
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/build.xml
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/build.xml
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/readme.htm
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/readme.htm
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/
      - copied from r381422, lucene/java/trunk/contrib/xml-query-parser/src/
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/
      - copied from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/
      - copied from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/
      - copied from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/
      - copied from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/
      - copied from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CoreParser.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CoreParser.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CorePlusExtensionsParser.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/CorePlusExtensionsParser.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/DOMUtils.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/DOMUtils.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/FilterBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/FilterBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/FilterBuilderFactory.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/FilterBuilderFactory.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/FilteredQueryBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/FilteredQueryBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/ParserException.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/ParserException.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryBuilderFactory.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/QueryBuilderFactory.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/
      - copied from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/BooleanQueryBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/BooleanQueryBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/BoostingQueryBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/BoostingQueryBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/ConstantScoreQueryBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/ConstantScoreQueryBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/FuzzyLikeThisQueryBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/FuzzyLikeThisQueryBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/LikeThisQueryBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/RangeFilterBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/RangeFilterBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanBuilderBase.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanBuilderBase.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanFirstBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanFirstBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanNearBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanNearBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanNotBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanNotBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanOrTermsBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanQueryBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanQueryBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanQueryBuilderFactory.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanQueryBuilderFactory.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanTermBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/SpanTermBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermQueryBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermQueryBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsFilterBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/TermsFilterBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/UserInputQueryBuilder.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/builders/UserInputQueryBuilder.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/
      - copied from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/
      - copied from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/
      - copied from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/lucene/
      - copied from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/
      - copied from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/BooleanQuery.xml
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/BooleanQuery.xml
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/BoostingQuery.xml
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/BoostingQuery.xml
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/ConstantScoreQuery.xml
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/ConstantScoreQuery.xml
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/FuzzyLikeThisQuery.xml
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/FuzzyLikeThisQuery.xml
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/LikeThisQuery.xml
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/LikeThisQuery.xml
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/RangeFilterQuery.xml
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/RangeFilterQuery.xml
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/SpanQuery.xml
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/SpanQuery.xml
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TermQuery.xml
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TermQuery.xml
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TermsFilterQuery.xml
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TermsFilterQuery.xml
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/UserInputQuery.xml
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/UserInputQuery.xml
    lucene/java/branches/lucene_1_9/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/reuters21578.txt
      - copied unchanged from r381422, lucene/java/trunk/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/reuters21578.txt
Modified:
    lucene/java/branches/lucene_1_9/BUILD.txt
    lucene/java/branches/lucene_1_9/CHANGES.txt
    lucene/java/branches/lucene_1_9/README.txt
    lucene/java/branches/lucene_1_9/build.xml
    lucene/java/branches/lucene_1_9/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java
    lucene/java/branches/lucene_1_9/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
    lucene/java/branches/lucene_1_9/contrib/lucli/build.xml
    lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java
    lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/JavaUtilRegexCapabilities.java
    lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexCapabilities.java
    lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexQuery.java
    lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexQueryCapable.java
    lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermEnum.java
    lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/SpanRegexQuery.java
    lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/regexp/RegexpTunnel.java
    lucene/java/branches/lucene_1_9/contrib/regex/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java
    lucene/java/branches/lucene_1_9/docs/fileformats.html
    lucene/java/branches/lucene_1_9/docs/index.html
    lucene/java/branches/lucene_1_9/docs/queryparsersyntax.html
    lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/DeleteFiles.java
    lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/IndexFiles.java
    lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/IndexHTML.java
    lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/SearchFiles.java
    lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/document/DateField.java
    lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/index/IndexWriter.java
    lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/store/BufferedIndexOutput.java
    lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/store/RAMOutputStream.java
    lucene/java/branches/lucene_1_9/src/jsp/README.txt
    lucene/java/branches/lucene_1_9/src/jsp/configuration.jsp
    lucene/java/branches/lucene_1_9/src/test/org/apache/lucene/StoreTest.java
    lucene/java/branches/lucene_1_9/xdocs/fileformats.xml
    lucene/java/branches/lucene_1_9/xdocs/index.xml
    lucene/java/branches/lucene_1_9/xdocs/queryparsersyntax.xml

Modified: lucene/java/branches/lucene_1_9/BUILD.txt
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/BUILD.txt?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/BUILD.txt (original)
+++ lucene/java/branches/lucene_1_9/BUILD.txt Mon Feb 27 12:17:01 2006
@@ -38,7 +38,7 @@
 route, or you might have an incomplete copy of the Lucene, so: Lucene
 releases are available for download at:
 
-  http://www.apache.org/dyn/closer.cgi/jakarta/lucene/
+  http://www.apache.org/dyn/closer.cgi/lucene/java/
 
 Download either a zip or a tarred/gzipped version of the archive, and
 uncompress it into a directory of your choice.

Modified: lucene/java/branches/lucene_1_9/CHANGES.txt
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/CHANGES.txt?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/CHANGES.txt (original)
+++ lucene/java/branches/lucene_1_9/CHANGES.txt Mon Feb 27 12:17:01 2006
@@ -2,6 +2,22 @@
 
 $Id$
 
+1.9 RC2
+
+Bug fixes
+ 
+ 1. The fix that made IndexWriter.setMaxBufferedDocs(1) work had negative 
+    effects on indexing performance and has thus been reverted. The 
+    argument for setMaxBufferedDocs(int) must now at least be 2, otherwise
+    an exception is thrown.
+ 
+Optimizations
+     
+ 1. Optimized BufferedIndexOutput.writeBytes() to use
+    System.arraycopy() in more cases, rather than copying byte-by-byte.
+    (Lukas Zapletal via Cutting)
+
+
 1.9 RC1
 
 Note that this realease is mostly but not 100% source compatible with the

Modified: lucene/java/branches/lucene_1_9/README.txt
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/README.txt?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/README.txt (original)
+++ lucene/java/branches/lucene_1_9/README.txt Mon Feb 27 12:17:01 2006
@@ -16,14 +16,25 @@
 
 FILES
 
-lucene-XX.jar
+lucene-core-XX.jar
   The compiled lucene library.
 
+lucene-demos-XX.jar
+  The compiled simple example code.
+
+luceneweb.war
+  The compiled simple example Web Application.
+
+contrib/*
+  Contributed code which extends and enhances Lucene, but is not
+  part of the core library.
+
 docs/index.html
   The contents of the Lucene website.
 
 docs/api/index.html
-  The Javadoc Lucene API documentation.
+  The Javadoc Lucene API documentation.  This includes the core
+  library, the demo, as well as all of the contrib modules.
 
 src/java
   The Lucene source code.

Modified: lucene/java/branches/lucene_1_9/build.xml
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/build.xml?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/build.xml (original)
+++ lucene/java/branches/lucene_1_9/build.xml Mon Feb 27 12:17:01 2006
@@ -364,25 +364,45 @@
         <tag name="todo" description="To Do:"/>
 
         <!-- TODO: find a dynamic way to do include multiple source roots -->
+	
         <packageset dir="src/java"/>
+
+	<packageset dir="src/demo"/>
+	
         <packageset dir="contrib/analyzers/src/java"/>
-        <packageset dir="contrib/wordnet/src/java"/>
+        <packageset dir="contrib/ant/src/java"/>
         <packageset dir="contrib/highlighter/src/java"/>
+        <packageset dir="contrib/lucli/src/java"/>
+        <packageset dir="contrib/memory/src/java"/>
+        <packageset dir="contrib/miscellaneous/src/java"/>
         <packageset dir="contrib/similarity/src/java"/>
-        <packageset dir="contrib/spellchecker/src/java"/>
+        <packageset dir="contrib/regex/src/java"/>
         <packageset dir="contrib/snowball/src/java"/>
+        <packageset dir="contrib/spellchecker/src/java"/>
+        <packageset dir="contrib/surround/src/java"/>
         <packageset dir="contrib/swing/src/java"/>
-        <packageset dir="contrib/memory/src/java"/>
+        <packageset dir="contrib/wordnet/src/java"/>
 
         <group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*"/>
-        <group title="Analysis" packages="org.apache.lucene.analysis.*"/>
-        <group title="Snowball Stemmers" packages="org.apache.lucene.analysis.snowball*:net.sf.snowball*"/>
-        <group title="Highlighter" packages="org.apache.lucene.search.highlight*"/>
-        <group title="MoreLikeThis" packages="org.apache.lucene.search.similar*"/>
-        <group title="SpellChecker" packages="org.apache.lucene.search.spell*"/>
-        <group title="WordNet" packages="org.apache.lucene.wordnet*"/>
-        <group title="Swing" packages="org.apache.lucene.swing*"/>
-        <group title="Memory" packages="org.apache.lucene.index.memory*"/>
+
+        <group title="Demo" packages="org.apache.lucene.demo*"/>
+
+        <group title="contrib: Analysis" packages="org.apache.lucene.analysis.*"/>
+        <group title="contrib: Ant" packages="org.apache.lucene.ant*"/>
+
+        <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*"/>
+        <group title="contrib: Lucli" packages="lucli*"/>
+        <group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
+        <group title="contrib: Miscellaneous " packages="org.apache.lucene.misc*:org.apache.lucene.queryParser.analyzing*:org.apache.lucene.queryParser.precedence*"/>
+        <group title="contrib: MoreLikeThis" packages="org.apache.lucene.search.similar*"/>
+        <group title="contrib: RegEx" packages="org.apache.lucene.search.regex*:org.apache.regexp*"/>
+        <group title="contrib: Snowball" packages="org.apache.lucene.analysis.snowball*:net.sf.snowball*"/>
+	<group title="contrib: SpellChecker" packages="org.apache.lucene.search.spell*"/>
+	<group title="contrib: Surround Parser" packages="org.apache.lucene.queryParser.surround*"/>
+        <group title="contrib: Swing" packages="org.apache.lucene.swing*"/>
+        <group title="contrib: WordNet" packages="org.apache.lucene.wordnet*"/>
+
+	
       </javadoc>
     </sequential>
   </macrodef>

Modified: lucene/java/branches/lucene_1_9/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java (original)
+++ lucene/java/branches/lucene_1_9/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java Mon Feb 27 12:17:01 2006
@@ -134,8 +134,12 @@
 
 		for (i = 0; i < queryClauses.length; i++)
 		{
-			if (prohibited || !queryClauses[i].prohibited)
-				getTerms(queryClauses[i].query, terms, prohibited, fieldName);
+			//Pre Lucene 2.0 code
+//			if (prohibited || !queryClauses[i].prohibited)
+//				getTerms(queryClauses[i].query, terms, prohibited, fieldName);
+			// Lucene 2.0 ready code
+			if (prohibited || queryClauses[i].getOccur()!=BooleanClause.Occur.MUST_NOT)
+				getTerms(queryClauses[i].getQuery(), terms, prohibited, fieldName);
 		}
 	}
 

Modified: lucene/java/branches/lucene_1_9/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/java/branches/lucene_1_9/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Mon Feb 27 12:17:01 2006
@@ -222,7 +222,8 @@
 		String srchkey = "football";
 
 		String s = "football-soccer in the euro 2004 footie competition";
-		Query query = QueryParser.parse(srchkey, "bookid", analyzer);
+		QueryParser parser=new QueryParser("bookid",analyzer);
+		Query query = parser.parse(srchkey);
 
 		Highlighter highlighter = new Highlighter(new QueryScorer(query));
 		TokenStream tokenStream =
@@ -289,7 +290,7 @@
 			new Highlighter(this,new QueryScorer(query));
 		highlighter.setMaxDocBytesToAnalyze(30);
 		TokenStream tokenStream=analyzer.tokenStream(FIELD_NAME,new StringReader(texts[0]));
-		String result = highlighter.getBestFragment(tokenStream,texts[0]);
+		highlighter.getBestFragment(tokenStream,texts[0]);
 		assertTrue("Setting MaxDocBytesToAnalyze should have prevented " +
 			"us from finding matches for this record: " + numHighlights +
 			 " found", numHighlights == 0);
@@ -302,7 +303,9 @@
 		//test to show how rewritten query can still be used
 		searcher = new IndexSearcher(ramDir);
 		Analyzer analyzer=new StandardAnalyzer();
-		Query query = QueryParser.parse("JF? or Kenned*", FIELD_NAME, analyzer);
+
+		QueryParser parser=new QueryParser(FIELD_NAME,analyzer);	
+		Query query = parser.parse("JF? or Kenned*");
 		System.out.println("Searching with primitive query");
 		//forget to set this and...
 		//query=query.rewrite(reader);
@@ -406,7 +409,7 @@
 		RAMDirectory ramDir1 = new RAMDirectory();
 		IndexWriter writer1 = new IndexWriter(ramDir1, new StandardAnalyzer(), true);
 		Document d = new Document();
-		Field f = new Field(FIELD_NAME, "multiOne", true, true, true);
+		Field f = new Field(FIELD_NAME, "multiOne", Field.Store.YES, Field.Index.TOKENIZED);
 		d.add(f);
 		writer1.addDocument(d);
 		writer1.optimize();
@@ -417,7 +420,7 @@
 		RAMDirectory ramDir2 = new RAMDirectory();
 		IndexWriter writer2 = new IndexWriter(ramDir2, new StandardAnalyzer(), true);
 		d = new Document();
-		f = new Field(FIELD_NAME, "multiTwo", true, true, true);
+		f = new Field(FIELD_NAME, "multiTwo", Field.Store.YES, Field.Index.TOKENIZED);
 		d.add(f);
 		writer2.addDocument(d);
 		writer2.optimize();
@@ -430,7 +433,8 @@
 		searchers[0] = new IndexSearcher(ramDir1);
 		searchers[1] = new IndexSearcher(ramDir2);
 		MultiSearcher multiSearcher=new MultiSearcher(searchers);
-		query = QueryParser.parse("multi*", FIELD_NAME, new StandardAnalyzer());
+		QueryParser parser=new QueryParser(FIELD_NAME, new StandardAnalyzer());
+		query = parser.parse("multi*");
 		System.out.println("Searching for: " + query.toString(FIELD_NAME));
 		//at this point the multisearcher calls combine(query[])
 		hits = multiSearcher.search(query);
@@ -536,7 +540,8 @@
 	public void doSearching(String queryString) throws Exception
 	{
 		searcher = new IndexSearcher(ramDir);
-		query = QueryParser.parse(queryString, FIELD_NAME, new StandardAnalyzer());
+		QueryParser parser=new QueryParser(FIELD_NAME, new StandardAnalyzer());
+		query = parser.parse(queryString);
 		//for any multi-term queries to work (prefix, wildcard, range,fuzzy etc) you must use a rewritten query!
 		query=query.rewrite(reader);
 		System.out.println("Searching for: " + query.toString(FIELD_NAME));
@@ -585,7 +590,7 @@
 	private void addDoc(IndexWriter writer, String text) throws IOException
 	{
 		Document d = new Document();
-		Field f = new Field(FIELD_NAME, text, true, true, true);
+		Field f = new Field(FIELD_NAME, text,Field.Store.YES, Field.Index.TOKENIZED);
 		d.add(f);
 		writer.addDocument(d);
 

Modified: lucene/java/branches/lucene_1_9/contrib/lucli/build.xml
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/contrib/lucli/build.xml?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/contrib/lucli/build.xml (original)
+++ lucene/java/branches/lucene_1_9/contrib/lucli/build.xml Mon Feb 27 12:17:01 2006
@@ -18,12 +18,13 @@
 
   <property name="src.dir" location="src"/>
 
-  <target name="dist" depends="compile" description="Create JAR">
-    <jar jarfile="${dist.dir}/${dist.name}.jar"
-         basedir="${build.dir}/classes"
+
+  <import file="../contrib-build.xml"/>
+
+  <target name="jar" depends="compile" description="Create JAR">
+    <jar jarfile="${build.dir}/${final.name}.jar"
+         basedir="${build.dir}/classes/java"
          manifest="META-INF/MANIFEST.MF"
     />
   </target>
-
-  <import file="../contrib-build.xml"/>
 </project>

Modified: lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java (original)
+++ lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java Mon Feb 27 12:17:01 2006
@@ -1,8 +1,29 @@
 package org.apache.lucene.search.regex;
 
+/**
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.apache.regexp.RE;
 import org.apache.regexp.RegexpTunnel;
 
+/**
+ * Implementation tying <a href="http://jakarta.apache.org/regexp">Jakarta Regexp</a>
+ * to RegexQuery.  Thanks to some internals of Jakarta Regexp, this
+ * has a solid {@link #prefix} implementation.
+ */
 public class JakartaRegexpCapabilities implements RegexCapabilities {
   private RE regexp;
 

Modified: lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/JavaUtilRegexCapabilities.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/JavaUtilRegexCapabilities.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/JavaUtilRegexCapabilities.java (original)
+++ lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/JavaUtilRegexCapabilities.java Mon Feb 27 12:17:01 2006
@@ -1,7 +1,30 @@
 package org.apache.lucene.search.regex;
 
+/**
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import java.util.regex.Pattern;
 
+/**
+ * An implementation tying Java's built-in java.util.regex to RegexQuery.
+ *
+ * Note that because this implementation currently only returns null from
+ * {@link #prefix} that queries using this implementation will enumerate and
+ * attempt to {@link #match} each term for the specified field in the index.
+ */
 public class JavaUtilRegexCapabilities implements RegexCapabilities {
   private Pattern pattern;
 

Modified: lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexCapabilities.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexCapabilities.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexCapabilities.java (original)
+++ lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexCapabilities.java Mon Feb 27 12:17:01 2006
@@ -1,7 +1,47 @@
 package org.apache.lucene.search.regex;
 
-public interface RegexCapabilities {
+/**
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Defines basic operations needed by {@link RegexQuery} for a regular
+ * expression implementation.
+ */
+interface RegexCapabilities {
+  /**
+   * Called by the constructor of {@link RegexTermEnum} allowing
+   * implementations to cache a compiled version of the regular
+   * expression pattern.
+   *
+   * @param pattern regular expression pattern
+   */
   void compile(String pattern);
+
+  /**
+   *
+   * @param string
+   * @return true if string matches the pattern last passed to {@link #compile}.
+   */
   boolean match(String string);
+
+  /**
+   * A wise prefix implementation can reduce the term enumeration (and thus performance)
+   * of RegexQuery dramatically!
+   *
+   * @return static non-regex prefix of the pattern last passed to {@link #compile}.  May return null.
+   */
   String prefix();
 }

Modified: lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexQuery.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexQuery.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexQuery.java (original)
+++ lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexQuery.java Mon Feb 27 12:17:01 2006
@@ -1,5 +1,21 @@
 package org.apache.lucene.search.regex;
 
+/**
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.apache.lucene.search.MultiTermQuery;
 import org.apache.lucene.search.FilteredTermEnum;
 import org.apache.lucene.index.Term;
@@ -7,17 +23,32 @@
 
 import java.io.IOException;
 
+/** Implements the regular expression term search query.
+ * The expressions supported depend on the regular expression implementation
+ * used by way of the {@link RegexCapabilities} interface.
+ *
+ * @see RegexTermEnum
+ */
 public class RegexQuery extends MultiTermQuery implements RegexQueryCapable {
   private RegexCapabilities regexImpl = new JavaUtilRegexCapabilities();
 
+  /** Constructs a query for terms matching <code>term</code>. */
   public RegexQuery(Term term) {
     super(term);
   }
 
+  /**
+   * Defines which {@link RegexCapabilities} implementation is used by this instance.
+   *
+   * @param impl
+   */
   public void setRegexImplementation(RegexCapabilities impl) {
     this.regexImpl = impl;
   }
 
+  /**
+   * @return The implementation used by this instance.
+   */
   public RegexCapabilities getRegexImplementation() {
     return regexImpl;
   }

Modified: lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexQueryCapable.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexQueryCapable.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexQueryCapable.java (original)
+++ lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexQueryCapable.java Mon Feb 27 12:17:01 2006
@@ -1,6 +1,26 @@
 package org.apache.lucene.search.regex;
 
-public interface RegexQueryCapable {
+/**
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/**
+ * Defines methods for regular expression supporting Querys to use.
+ */
+interface RegexQueryCapable {
   void setRegexImplementation(RegexCapabilities impl);
   RegexCapabilities getRegexImplementation();
 }

Modified: lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermEnum.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermEnum.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermEnum.java (original)
+++ lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/RegexTermEnum.java Mon Feb 27 12:17:01 2006
@@ -1,10 +1,35 @@
 package org.apache.lucene.search.regex;
 
+/**
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.apache.lucene.search.FilteredTermEnum;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
 
 import java.io.IOException;
+
+/**
+ * Subclass of FilteredTermEnum for enumerating all terms that match the
+ * specified regular expression term using the specified regular expression
+ * implementation.
+ * <p>
+ * Term enumerations are always ordered by Term.compareTo().  Each term in
+ * the enumeration is greater than all that precede it.
+ */
 
 public class RegexTermEnum extends FilteredTermEnum {
   private String field = "";

Modified: lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/SpanRegexQuery.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/SpanRegexQuery.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/SpanRegexQuery.java (original)
+++ lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/lucene/search/regex/SpanRegexQuery.java Mon Feb 27 12:17:01 2006
@@ -1,5 +1,21 @@
 package org.apache.lucene.search.regex;
 
+/**
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.apache.lucene.index.Term;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.Query;
@@ -16,6 +32,10 @@
 import java.util.Collection;
 import java.util.ArrayList;
 
+/**
+ * A SpanQuery version of {@link RegexQuery} allowing regular expression
+ * queries to be nested within other SpanQuery subclasses.
+ */
 public class SpanRegexQuery extends SpanQuery implements RegexQueryCapable {
   private RegexCapabilities regexImpl = new JavaUtilRegexCapabilities();
   private Term term;

Modified: lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/regexp/RegexpTunnel.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/regexp/RegexpTunnel.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/regexp/RegexpTunnel.java (original)
+++ lucene/java/branches/lucene_1_9/contrib/regex/src/java/org/apache/regexp/RegexpTunnel.java Mon Feb 27 12:17:01 2006
@@ -1,6 +1,23 @@
 package org.apache.regexp;
 
 /**
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/**
  * This class exists as a gateway to access useful Jakarta Regexp package protected data.
  */
 public class RegexpTunnel {

Modified: lucene/java/branches/lucene_1_9/contrib/regex/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/contrib/regex/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/contrib/regex/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java (original)
+++ lucene/java/branches/lucene_1_9/contrib/regex/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java Mon Feb 27 12:17:01 2006
@@ -12,22 +12,29 @@
 import org.apache.lucene.search.spans.SpanTermQuery;
 import org.apache.lucene.search.spans.SpanNearQuery;
 import org.apache.lucene.search.spans.SpanQuery;
+import org.apache.lucene.search.spans.SpanFirstQuery;
 
 public class TestSpanRegexQuery extends TestCase {
   public void testSpanRegex() throws Exception {
     RAMDirectory directory = new RAMDirectory();
     IndexWriter writer = new IndexWriter(directory, new SimpleAnalyzer(), true);
     Document doc = new Document();
-    doc.add(new Field("field", "the quick brown fox jumps over the lazy dog", Field.Store.NO, Field.Index.TOKENIZED));
+//    doc.add(new Field("field", "the quick brown fox jumps over the lazy dog", Field.Store.NO, Field.Index.TOKENIZED));
+//    writer.addDocument(doc);
+//    doc = new Document();
+    doc.add(new Field("field", "auto update", Field.Store.NO, Field.Index.TOKENIZED));
+    writer.addDocument(doc);
+    doc = new Document();
+    doc.add(new Field("field", "first auto update", Field.Store.NO, Field.Index.TOKENIZED));
     writer.addDocument(doc);
     writer.optimize();
     writer.close();
 
     IndexSearcher searcher = new IndexSearcher(directory);
-    SpanRegexQuery srq = new SpanRegexQuery(new Term("field", "q.[aeiou]c.*"));
-    SpanTermQuery stq = new SpanTermQuery(new Term("field","dog"));
-    SpanNearQuery query = new SpanNearQuery(new SpanQuery[] {srq, stq}, 6, true);
-    Hits hits = searcher.search(query);
+    SpanRegexQuery srq = new SpanRegexQuery(new Term("field", "aut.*"));
+    SpanFirstQuery sfq = new SpanFirstQuery(srq, 1);
+//    SpanNearQuery query = new SpanNearQuery(new SpanQuery[] {srq, stq}, 6, true);
+    Hits hits = searcher.search(sfq);
     assertEquals(1, hits.length());
   }
 }

Modified: lucene/java/branches/lucene_1_9/docs/fileformats.html
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/docs/fileformats.html?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/docs/fileformats.html (original)
+++ lucene/java/branches/lucene_1_9/docs/fileformats.html Mon Feb 27 12:17:01 2006
@@ -113,7 +113,10 @@
         <blockquote>
                                     <p>
                 This document defines the index file formats used
-                in Lucene version 1.4 and above.
+                in Lucene version 1.9.  If you are using a different
+		version of Lucene, please consult the copy of
+		<code>docs/fileformats.html</code> that was distributed
+		with the version you are using.
             </p>
                                                 <p>
                 Apache Lucene is written in Java, but several

Modified: lucene/java/branches/lucene_1_9/docs/index.html
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/docs/index.html?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/docs/index.html (original)
+++ lucene/java/branches/lucene_1_9/docs/index.html Mon Feb 27 12:17:01 2006
@@ -126,7 +126,7 @@
             </p>
                                                 <p>
                 Apache Lucene is an open source project available for
-                <a href="http://www.apache.org/dyn/closer.cgi/lucene/java/">free download</a> from Apache Jakarta.
+                <a href="http://www.apache.org/dyn/closer.cgi/lucene/java/">free download</a>.
                 Please use the links on the left to access Lucene.
             </p>
                             </blockquote>

Modified: lucene/java/branches/lucene_1_9/docs/queryparsersyntax.html
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/docs/queryparsersyntax.html?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/docs/queryparsersyntax.html (original)
+++ lucene/java/branches/lucene_1_9/docs/queryparsersyntax.html Mon Feb 27 12:17:01 2006
@@ -117,10 +117,15 @@
         <blockquote>
                                     <p>Although Lucene provides the ability to create your own
             queries through its API, it also provides a rich query
-            language through the Query Parser.</p>
-                                                <p>This page
-            provides syntax of Lucene's Query Parser, a lexer which
-            interprets a string into a Lucene Query using JavaCC.</p>
+            language through the Query Parser, a lexer which
+            interprets a string into a Lucene Query using JavaCC.
+	    </p>
+                                                <p>This page provides the Query Parser syntax in Lucene 1.9.
+	    If you are using a different
+	    version of Lucene, please consult the copy of
+	    <code>docs/queryparsersyntax.html</code> that was distributed
+	    with the version you are using.
+	    </p>
                                                 <p>
             Before choosing to use the provided Query Parser, please consider the following:
             <ol>

Modified: lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/DeleteFiles.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/DeleteFiles.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/DeleteFiles.java (original)
+++ lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/DeleteFiles.java Mon Feb 27 12:17:01 2006
@@ -22,8 +22,13 @@
 import org.apache.lucene.index.Term;
 //import org.apache.lucene.index.Term;
 
-class DeleteFiles {
+
+/** Deletes documents from an index that do not contain a term. */
+public class DeleteFiles {
   
+  private DeleteFiles() {}                         // singleton
+
+  /** Deletes documents from an index that do not contain a term. */
   public static void main(String[] args) {
     String usage = "java org.apache.lucene.demo.DeleteFiles <unique_term>";
     if (args.length == 0) {

Modified: lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/IndexFiles.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/IndexFiles.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/IndexFiles.java (original)
+++ lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/IndexFiles.java Mon Feb 27 12:17:01 2006
@@ -24,10 +24,14 @@
 import java.io.IOException;
 import java.util.Date;
 
-class IndexFiles {
+/** Index all text files under a directory. */
+public class IndexFiles {
   
+  private IndexFiles() {}
+
   static final File INDEX_DIR = new File("index");
   
+  /** Index all text files under a directory. */
   public static void main(String[] args) {
     String usage = "java org.apache.lucene.demo.IndexFiles <root_directory>";
     if (args.length == 0) {
@@ -64,7 +68,7 @@
     }
   }
 
-  public static void indexDocs(IndexWriter writer, File file)
+  static void indexDocs(IndexWriter writer, File file)
     throws IOException {
     // do not try to index files that cannot be read
     if (file.canRead()) {

Modified: lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/IndexHTML.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/IndexHTML.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/IndexHTML.java (original)
+++ lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/IndexHTML.java Mon Feb 27 12:17:01 2006
@@ -26,13 +26,16 @@
 import java.util.Date;
 import java.util.Arrays;
 
-class IndexHTML {
+/** Indexer for HTML files. */
+public class IndexHTML {
+  private IndexHTML() {}
 
   private static boolean deleting = false;	  // true during deletion pass
   private static IndexReader reader;		  // existing index
   private static IndexWriter writer;		  // new index being built
   private static TermEnum uidIter;		  // document id iterator
 
+  /** Indexer for HTML files.*/
   public static void main(String[] argv) {
     try {
       String index = "index";

Modified: lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/SearchFiles.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/SearchFiles.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/SearchFiles.java (original)
+++ lucene/java/branches/lucene_1_9/src/demo/org/apache/lucene/demo/SearchFiles.java Mon Feb 27 12:17:01 2006
@@ -33,7 +33,8 @@
 import org.apache.lucene.search.Hits;
 import org.apache.lucene.queryParser.QueryParser;
 
-class SearchFiles {
+/** Simple command-line based search demo. */
+public class SearchFiles {
 
   /** Use the norms from one field for all fields.  Norms are read into memory,
    * using a byte of memory per document per searched field.  This can cause
@@ -53,6 +54,9 @@
     }
   }
 
+  private SearchFiles() {}
+
+  /** Simple command-line based search demo. */
   public static void main(String[] args) throws Exception {
     String usage =
       "Usage: java org.apache.lucene.demo.SearchFiles [-index dir] [-field f] [-repeat n] [-queries file] [-raw] [-norms field]";

Modified: lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/document/DateField.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/document/DateField.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/document/DateField.java (original)
+++ lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/document/DateField.java Mon Feb 27 12:17:01 2006
@@ -76,12 +76,13 @@
    */
   public static String timeToString(long time) {
     if (time < 0)
-      throw new RuntimeException("time too early");
+      throw new RuntimeException("time '" + time + "' is too early, must be >= 0");
 
     String s = Long.toString(time, Character.MAX_RADIX);
 
     if (s.length() > DATE_LEN)
-      throw new RuntimeException("time too late");
+      throw new RuntimeException("time '" + time + "' is too late, length of string " +
+          "representation must be <= " + DATE_LEN);
 
     // Pad with leading zeros
     if (s.length() < DATE_LEN) {

Modified: lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/index/IndexWriter.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/index/IndexWriter.java Mon Feb 27 12:17:01 2006
@@ -318,11 +318,11 @@
    *
    * <p> The default value is 10.
    * 
-   * @throws IllegalArgumentException if maxBufferedDocs is smaller than 1 
+   * @throws IllegalArgumentException if maxBufferedDocs is smaller than 2
    */
   public void setMaxBufferedDocs(int maxBufferedDocs) {
-    if (maxBufferedDocs < 1)
-      throw new IllegalArgumentException("maxBufferedDocs must at least be 1");
+    if (maxBufferedDocs < 2)
+      throw new IllegalArgumentException("maxBufferedDocs must at least be 2");
     this.minMergeDocs = maxBufferedDocs;
   }
 
@@ -637,7 +637,7 @@
       int mergeDocs = 0;
       while (--minSegment >= 0) {
         SegmentInfo si = segmentInfos.info(minSegment);
-        if (si.docCount > targetMergeDocs)
+        if (si.docCount >= targetMergeDocs)
           break;
         mergeDocs += si.docCount;
       }

Modified: lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/store/BufferedIndexOutput.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/store/BufferedIndexOutput.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/store/BufferedIndexOutput.java (original)
+++ lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/store/BufferedIndexOutput.java Mon Feb 27 12:17:01 2006
@@ -41,8 +41,41 @@
    * @see IndexInput#readBytes(byte[],int,int)
    */
   public void writeBytes(byte[] b, int length) throws IOException {
-    for (int i = 0; i < length; i++)
-      writeByte(b[i]);
+    int bytesLeft = BUFFER_SIZE - bufferPosition;
+    // is there enough space in the buffer?
+    if (bytesLeft >= length) {
+      // we add the data to the end of the buffer
+      System.arraycopy(b, 0, buffer, bufferPosition, length);
+      bufferPosition += length;
+      // if the buffer is full, flush it
+      if (BUFFER_SIZE - bufferPosition == 0)
+        flush();
+    } else {
+      // is data larger then buffer?
+      if (length > BUFFER_SIZE) {
+        // we flush the buffer
+        if (bufferPosition > 0)
+          flush();
+        // and write data at once
+        flushBuffer(b, length);
+      } else {
+        // we fill/flush the buffer (until the input is written)
+        int pos = 0; // position in the input data
+        int pieceLength;
+        while (pos < length) {
+          pieceLength = (length - pos < bytesLeft) ? length - pos : bytesLeft;
+          System.arraycopy(b, pos, buffer, bufferPosition, pieceLength);
+          pos += pieceLength;
+          bufferPosition += pieceLength;
+          // if the buffer is full, flush it
+          bytesLeft = BUFFER_SIZE - bufferPosition;
+          if (bytesLeft == 0) {
+            flush();
+            bytesLeft = BUFFER_SIZE;
+          }
+        }
+      }
+    }
   }
 
   /** Forces any buffered output to be written. */

Modified: lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/store/RAMOutputStream.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/store/RAMOutputStream.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/store/RAMOutputStream.java (original)
+++ lucene/java/branches/lucene_1_9/src/java/org/apache/lucene/store/RAMOutputStream.java Mon Feb 27 12:17:01 2006
@@ -66,27 +66,27 @@
   }
 
   public void flushBuffer(byte[] src, int len) {
-    int bufferNumber = pointer/BUFFER_SIZE;
-    int bufferOffset = pointer%BUFFER_SIZE;
-    int bytesInBuffer = BUFFER_SIZE - bufferOffset;
-    int bytesToCopy = bytesInBuffer >= len ? len : bytesInBuffer;
+    byte[] buffer;
+    int bufferPos = 0;
+    while (bufferPos != len) {
+      int bufferNumber = pointer/BUFFER_SIZE;
+      int bufferOffset = pointer%BUFFER_SIZE;
+      int bytesInBuffer = BUFFER_SIZE - bufferOffset;
+      int remainInSrcBuffer = len - bufferPos;
+      int bytesToCopy = bytesInBuffer >= remainInSrcBuffer ? remainInSrcBuffer : bytesInBuffer;
 
-    if (bufferNumber == file.buffers.size())
-      file.buffers.addElement(new byte[BUFFER_SIZE]);
+      if (bufferNumber == file.buffers.size()) {
+        buffer = new byte[BUFFER_SIZE];
+        file.buffers.addElement(buffer);
+      } else {
+        buffer = (byte[]) file.buffers.elementAt(bufferNumber);
+      }
 
-    byte[] buffer = (byte[])file.buffers.elementAt(bufferNumber);
-    System.arraycopy(src, 0, buffer, bufferOffset, bytesToCopy);
-
-    if (bytesToCopy < len) {			  // not all in one buffer
-      int srcOffset = bytesToCopy;
-      bytesToCopy = len - bytesToCopy;		  // remaining bytes
-      bufferNumber++;
-      if (bufferNumber == file.buffers.size())
-        file.buffers.addElement(new byte[BUFFER_SIZE]);
-      buffer = (byte[])file.buffers.elementAt(bufferNumber);
-      System.arraycopy(src, srcOffset, buffer, 0, bytesToCopy);
+      System.arraycopy(src, bufferPos, buffer, bufferOffset, bytesToCopy);
+      bufferPos += bytesToCopy;
+      pointer += bytesToCopy;
     }
-    pointer += len;
+
     if (pointer > file.length)
       file.length = pointer;
 

Modified: lucene/java/branches/lucene_1_9/src/jsp/README.txt
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/src/jsp/README.txt?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/src/jsp/README.txt (original)
+++ lucene/java/branches/lucene_1_9/src/jsp/README.txt Mon Feb 27 12:17:01 2006
@@ -1,8 +1,8 @@
-To build the Jakarta Lucene web app demo just run 
-"ant war-demo" from the Jakarta Lucene Installation
+To build the Apache Lucene web app demo just run 
+"ant war-demo" from the Apache Lucene Installation
 directory (follow the master instructions in 
 BUILD.txt).  If you have questions please post 
-them to the Jakarta Lucene mailing lists.  To 
+them to the Apache Lucene mailing lists.  To 
 actually figure this out you really need to 
 read the Lucene "Getting Started" guide provided
 with the doc build ("ant docs").

Modified: lucene/java/branches/lucene_1_9/src/jsp/configuration.jsp
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/src/jsp/configuration.jsp?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/src/jsp/configuration.jsp (original)
+++ lucene/java/branches/lucene_1_9/src/jsp/configuration.jsp Mon Feb 27 12:17:01 2006
@@ -1,7 +1,7 @@
 <%
 /* Author: Andrew C. Oliver (acoliver2@users.sourceforge.net) */
-String appTitle = "Jakarta Lucene Example - Intranet Server Search Application";
+String appTitle = "Apache Lucene Example - Intranet Server Search Application";
 /* make sure you point the below string to the index you created with IndexHTML */
 String indexLocation = "/opt/lucene/index";
-String appfooter = "Jakarta Lucene Template WebApp 1.0";
+String appfooter = "Apache Lucene Template WebApp 1.0";
 %>

Modified: lucene/java/branches/lucene_1_9/src/test/org/apache/lucene/StoreTest.java
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/src/test/org/apache/lucene/StoreTest.java?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/src/test/org/apache/lucene/StoreTest.java (original)
+++ lucene/java/branches/lucene_1_9/src/test/org/apache/lucene/StoreTest.java Mon Feb 27 12:17:01 2006
@@ -28,14 +28,13 @@
 class StoreTest {
   public static void main(String[] args) {
     try {
-      test(1000, true);
+      test(1000, true, true);
     } catch (Exception e) {
-      System.out.println(" caught a " + e.getClass() +
-			 "\n with message: " + e.getMessage());
+		e.printStackTrace();
     }
   }
 
-  public static void test(int count, boolean ram)
+  public static void test(int count, boolean ram, boolean buffered)
        throws Exception {
     Random gen = new Random(1251971);
     int i;
@@ -51,6 +50,8 @@
 
     final int LENGTH_MASK = 0xFFF;
 
+	final byte[] buffer = new byte[LENGTH_MASK];
+
     for (i = 0; i < count; i++) {
       String name = i + ".dat";
       int length = gen.nextInt() & LENGTH_MASK;
@@ -59,8 +60,14 @@
 
       IndexOutput file = store.createOutput(name);
 
-      for (int j = 0; j < length; j++)
-	file.writeByte(b);
+      if (buffered) {
+        for (int j = 0; j < length; j++)
+          buffer[j] = b;
+        file.writeBytes(buffer, length);
+      } else {
+        for (int j = 0; j < length; j++)
+          file.writeByte(b);
+      }
       
       file.close();
     }
@@ -89,9 +96,18 @@
       if (file.length() != length)
 	throw new Exception("length incorrect");
 
-      for (int j = 0; j < length; j++)
-	if (file.readByte() != b)
-	  throw new Exception("contents incorrect");
+      byte[] content = new byte[length];
+      if (buffered) {
+        file.readBytes(content, 0, length);
+        // check the buffer
+        for (int j = 0; j < length; j++)
+          if (content[j] != b)
+            throw new Exception("contents incorrect");
+      } else {
+        for (int j = 0; j < length; j++)
+          if (file.readByte() != b)
+            throw new Exception("contents incorrect");
+      }
 
       file.close();
     }

Modified: lucene/java/branches/lucene_1_9/xdocs/fileformats.xml
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/xdocs/fileformats.xml?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/xdocs/fileformats.xml (original)
+++ lucene/java/branches/lucene_1_9/xdocs/fileformats.xml Mon Feb 27 12:17:01 2006
@@ -14,7 +14,10 @@
 
             <p>
                 This document defines the index file formats used
-                in Lucene version 1.4 and above.
+                in Lucene version 1.9.  If you are using a different
+		version of Lucene, please consult the copy of
+		<code>docs/fileformats.html</code> that was distributed
+		with the version you are using.
             </p>
 
             <p>

Modified: lucene/java/branches/lucene_1_9/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/xdocs/index.xml?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/xdocs/index.xml (original)
+++ lucene/java/branches/lucene_1_9/xdocs/index.xml Mon Feb 27 12:17:01 2006
@@ -16,7 +16,7 @@
             </p>
             <p>
                 Apache Lucene is an open source project available for
-                <a href="http://www.apache.org/dyn/closer.cgi/lucene/java/">free download</a> from Apache Jakarta.
+                <a href="http://www.apache.org/dyn/closer.cgi/lucene/java/">free download</a>.
                 Please use the links on the left to access Lucene.
             </p>
         </section>

Modified: lucene/java/branches/lucene_1_9/xdocs/queryparsersyntax.xml
URL: http://svn.apache.org/viewcvs/lucene/java/branches/lucene_1_9/xdocs/queryparsersyntax.xml?rev=381429&r1=381428&r2=381429&view=diff
==============================================================================
--- lucene/java/branches/lucene_1_9/xdocs/queryparsersyntax.xml (original)
+++ lucene/java/branches/lucene_1_9/xdocs/queryparsersyntax.xml Mon Feb 27 12:17:01 2006
@@ -10,9 +10,16 @@
         <section name="Overview">
             <p>Although Lucene provides the ability to create your own
             queries through its API, it also provides a rich query
-            language through the Query Parser.</p> <p>This page
-            provides syntax of Lucene's Query Parser, a lexer which
-            interprets a string into a Lucene Query using JavaCC.</p>
+            language through the Query Parser, a lexer which
+            interprets a string into a Lucene Query using JavaCC.
+	    </p>
+
+	    <p>This page provides the Query Parser syntax in Lucene 1.9.
+	    If you are using a different
+	    version of Lucene, please consult the copy of
+	    <code>docs/queryparsersyntax.html</code> that was distributed
+	    with the version you are using.
+	    </p>
             <p>
             Before choosing to use the provided Query Parser, please consider the following:
             <ol>



Mime
View raw message