You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/05/06 12:41:05 UTC
svn commit: r941649 [1/2] - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/java/org/apache/lucene/search/
lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/docume...
Author: rmuir
Date: Thu May 6 10:41:02 2010
New Revision: 941649
URL: http://svn.apache.org/viewvc?rev=941649&view=rev
Log:
LUCENE-2323: backport
Added:
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/
- copied from r932541, lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
- copied unchanged from r932541, lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
- copied unchanged from r932541, lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
- copied unchanged from r932541, lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/package.html
- copied unchanged from r932541, lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/wikipedia/package.html
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/wikipedia/
- copied from r932541, lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/wikipedia/
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java
- copied unchanged from r932541, lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java
lucene/dev/branches/branch_3x/lucene/contrib/queries/src/java/org/apache/lucene/search/ChainedFilter.java
- copied unchanged from r932748, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/ChainedFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java
- copied unchanged from r932748, lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/README.txt
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/README.txt
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/
- copied from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/package.html
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/package.html
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/
- copied from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/CharStream.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/CharStream.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/FastCharStream.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/FastCharStream.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/ParseException.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/ParseException.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserConstants.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserConstants.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserTokenManager.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserTokenManager.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/Token.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/Token.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/TokenMgrError.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/TokenMgrError.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/package.html
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/package.html
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/
- copied from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/AndQuery.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/AndQuery.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/BasicQueryFactory.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/BasicQueryFactory.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/DistanceSubQuery.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/DistanceSubQuery.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/NotQuery.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/NotQuery.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/OrQuery.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/OrQuery.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SpanNearClauseFactory.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SpanNearClauseFactory.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndBooleanQuery.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndBooleanQuery.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java
- copied, changed from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java
- copied, changed from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java
- copied, changed from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/TooManyBasicQueries.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/TooManyBasicQueries.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/package.html
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/package.html
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/
- copied from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/
- copied from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java
- copied unchanged from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java
- copied unchanged from r932541, lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/analysis/TestWikipediaTokenizerFactory.java
- copied unchanged from r932541, lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestWikipediaTokenizerFactory.java
Removed:
lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java
lucene/dev/branches/branch_3x/lucene/contrib/misc/src/java/org/apache/lucene/queryParser/
lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/misc/ChainedFilterTest.java
lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/queryParser/
lucene/dev/branches/branch_3x/lucene/contrib/surround/
lucene/dev/branches/branch_3x/lucene/contrib/wikipedia/
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
lucene/dev/branches/branch_3x/lucene/build.xml (contents, props changed)
lucene/dev/branches/branch_3x/lucene/contrib/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/build.xml
lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/queryparser/build.xml
lucene/dev/branches/branch_3x/lucene/contrib/spatial/build.xml
lucene/dev/branches/branch_3x/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java
lucene/dev/branches/branch_3x/lucene/docs/contributions.html
lucene/dev/branches/branch_3x/lucene/docs/demo.html
lucene/dev/branches/branch_3x/lucene/docs/demo2.html
lucene/dev/branches/branch_3x/lucene/docs/demo3.html
lucene/dev/branches/branch_3x/lucene/docs/demo4.html
lucene/dev/branches/branch_3x/lucene/docs/fileformats.html
lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.html
lucene/dev/branches/branch_3x/lucene/docs/index.html
lucene/dev/branches/branch_3x/lucene/docs/linkmap.html
lucene/dev/branches/branch_3x/lucene/docs/linkmap.pdf
lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.html
lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.pdf
lucene/dev/branches/branch_3x/lucene/docs/queryparsersyntax.html
lucene/dev/branches/branch_3x/lucene/docs/scoring.html
lucene/dev/branches/branch_3x/lucene/docs/systemrequirements.html
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/site.xml
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar (props changed)
lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.5.5.jar (props changed)
lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/ (props changed)
lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template (props changed)
lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template (props changed)
lucene/dev/branches/branch_3x/solr/src/solrj/org/ (props changed)
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/ (props changed)
lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/ (props changed)
Propchange: lucene/dev/branches/branch_3x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1 +1 @@
-/lucene/dev/trunk:931337,931502,932129-932131,932163,932304,932369,932374,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk:931337,931502,932129-932131,932163,932304,932369,932374,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
Propchange: lucene/dev/branches/branch_3x/lucene/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk:932749
-/lucene/dev/trunk/lucene:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458:924791,924850,930201
/lucene/java/branches/lucene_2_4:748824
/lucene/java/branches/lucene_2_9:817269-818600,825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/CHANGES.txt:924791,924850,930201
/lucene/java/branches/lucene_2_9/CHANGES.txt:896850,909334
/lucene/java/trunk/CHANGES.txt:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1,3 +1,3 @@
-/lucene/dev/trunk/lucene/backwards/src:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src:924850,930201
/lucene/java/trunk/backwards/src:924781
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:748824
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:817269-818600,825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/util/TestAttributeSource.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:817269-818600,825998,829134,829881,831036
Modified: lucene/dev/branches/branch_3x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/build.xml?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/build.xml Thu May 6 10:41:02 2010
@@ -356,9 +356,7 @@ The source distribution does not contain
<packageset dir="contrib/remote/src/java"/>
<packageset dir="contrib/spatial/src/java"/>
<packageset dir="contrib/spellchecker/src/java"/>
- <packageset dir="contrib/surround/src/java"/>
<packageset dir="contrib/swing/src/java"/>
- <packageset dir="contrib/wikipedia/src/java"/>
<packageset dir="contrib/wordnet/src/java"/>
<packageset dir="contrib/xml-query-parser/src/java"/>
<packageset dir="contrib/queryparser/src/java"/>
@@ -386,9 +384,7 @@ The source distribution does not contain
<group title="contrib: Query Parser" packages="org.apache.lucene.queryParser.*"/>
<group title="contrib: Spatial" packages="org.apache.lucene.spatial*"/>
<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: Wikipedia" packages="org.apache.lucene.wikipedia*"/>
<group title="contrib: WordNet" packages="org.apache.lucene.wordnet*"/>
<group title="contrib: XML Query Parser" packages="org.apache.lucene.xmlparser*"/>
@@ -622,7 +618,7 @@ The source distribution does not contain
<fileset dir="src/java/org/apache/lucene/queryParser" includes="*.java">
<containsregexp expression="Generated.*By.*JavaCC"/>
</fileset>
- <fileset dir="contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser" includes="*.java">
+ <fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser" includes="*.java">
<containsregexp expression="Generated.*By.*JavaCC"/>
</fileset>
<fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser" includes="*.java">
@@ -634,7 +630,7 @@ The source distribution does not contain
</delete>
</target>
- <target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-HTMLParser,javacc-contrib-queryparser,javacc-contrib-surround"/>
+ <target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-HTMLParser,javacc-contrib-queryparser"/>
<target name="javacc-QueryParser" depends="init,javacc-check" if="javacc.present">
<sequential>
@@ -666,13 +662,6 @@ The source distribution does not contain
antfile="build.xml"
/>
</target>
-
- <target name="javacc-contrib-surround" depends="init,javacc-check" if="javacc.present">
- <ant target="javacc"
- dir="contrib/surround"
- antfile="build.xml"
- />
- </target>
<!-- ================================================================== -->
<!-- Build the JFlex files into the source tree -->
Propchange: lucene/dev/branches/branch_3x/lucene/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/build.xml:932749
-/lucene/dev/trunk/lucene/build.xml:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/build.xml:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/build.xml:924791,924850,930201
/lucene/java/branches/lucene_2_9/build.xml:896850,909334
/lucene/java/trunk/build.xml:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/contrib:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib:748824
/lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036,896850,909334
Modified: lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt Thu May 6 10:41:02 2010
@@ -19,6 +19,10 @@ Changes in backwards compatibility polic
* LUCENE-2226: Moved contrib/snowball functionality into contrib/analyzers.
Be sure to remove any old obselete lucene-snowball jar files from your
classpath! (Robert Muir)
+
+ * LUCENE-2323: Moved contrib/wikipedia functionality into contrib/analyzers.
+ Additionally the package was changed from org.apache.lucene.wikipedia.analysis
+ to org.apache.lucene.analysis.wikipedia. (Robert Muir)
Changes in runtime behavior
@@ -132,8 +136,10 @@ Build
(Steven Rowe, Robert Muir)
* LUCENE-2323: Moved contrib/regex into contrib/queries. Moved the
- queryparsers under contrib/misc into contrib/queryparser. Moved
- contrib/fast-vector-highlighter into contrib/highlighter. (Robert Muir)
+ queryparsers under contrib/misc and contrib/surround into contrib/queryparser.
+ Moved contrib/fast-vector-highlighter into contrib/highlighter.
+ Moved ChainedFilter from contrib/misc to contrib/queries. contrib/spatial now
+ depends on contrib/queries instead of contrib/misc. (Robert Muir)
* LUCENE-2333: Fix failures during contrib builds, when classes in
core were changed without ant clean. This fix also optimizes the
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/contrib/CHANGES.txt:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib/CHANGES.txt:748824
/lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334
Modified: lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/build.xml?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/build.xml Thu May 6 10:41:02 2010
@@ -35,4 +35,23 @@
<path refid="junit-path"/>
<pathelement location="${build.dir}/classes/java"/>
</path>
+
+ <target name="jflex" depends="clean-jflex,jflex-wiki-tokenizer"/>
+
+ <target name="jflex-wiki-tokenizer" depends="init,jflex-check" if="jflex.present">
+ <taskdef classname="JFlex.anttask.JFlexTask" name="jflex">
+ <classpath location="${jflex.home}/lib/JFlex.jar"/>
+ </taskdef>
+ <jflex file="src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex"
+ outdir="src/java/org/apache/lucene/analysis/wikipedia"
+ nobak="on"/>
+ </target>
+
+ <target name="clean-jflex">
+ <delete>
+ <fileset dir="src/java/org/apache/lucene/analysis/wikipedia" includes="*.java">
+ <containsregexp expression="generated.*by.*JFlex"/>
+ </fileset>
+ </delete>
+ </target>
</project>
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/highlighter/src/test:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib/highlighter/src/test:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/contrib/highlighter/src/test:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib/highlighter/src/test:748824
/lucene/java/branches/lucene_2_9/contrib/highlighter/src/test:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:41:02 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:896850,909334
/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924483-925561
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queryparser/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queryparser/build.xml?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queryparser/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queryparser/build.xml Thu May 6 10:41:02 2010
@@ -30,7 +30,7 @@
<!--
NOTE: see the README.javacc for details on how to fully regenerate the parser
-->
- <target name="javacc" depends="javacc-flexible,javacc-precedence"/>
+ <target name="javacc" depends="javacc-flexible,javacc-precedence,javacc-surround"/>
<target name="javacc-flexible" depends="javacc-check">
<delete>
@@ -107,4 +107,10 @@ import org.apache.lucene.queryParser.cor
outputDir="${javacc.precedence.path}"
/>
</target>
+
+ <target name="javacc-surround" depends="javacc-check" description="generate surround query parser from jj (requires javacc 4.1">
+ <invoke-javacc target="src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj"
+ outputDir="src/java/org/apache/lucene/queryParser/surround/parser"
+ />
+ </target>
</project>
Copied: lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java (from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java&r1=932746&r2=941649&rev=941649&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java Thu May 6 10:41:02 2010
@@ -17,21 +17,16 @@ package org.apache.lucene.queryParser.su
*/
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.Terms;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.index.TermEnum;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.MultiFields;
import java.io.IOException;
public class SrndPrefixQuery extends SimpleTerm {
- private final BytesRef prefixRef;
public SrndPrefixQuery(String prefix, boolean quoted, char truncator) {
super(quoted);
this.prefix = prefix;
- prefixRef = new BytesRef(prefix);
this.truncator = truncator;
}
@@ -58,35 +53,20 @@ public class SrndPrefixQuery extends Sim
MatchingTermVisitor mtv) throws IOException
{
/* inspired by PrefixQuery.rewrite(): */
- Terms terms = MultiFields.getTerms(reader, fieldName);
- if (terms != null) {
- TermsEnum termsEnum = terms.iterator();
-
- boolean skip = false;
- TermsEnum.SeekStatus status = termsEnum.seek(new BytesRef(getPrefix()));
- if (status == TermsEnum.SeekStatus.FOUND) {
- mtv.visitMatchingTerm(getLucenePrefixTerm(fieldName));
- } else if (status == TermsEnum.SeekStatus.NOT_FOUND) {
- if (termsEnum.term().startsWith(prefixRef)) {
- mtv.visitMatchingTerm(new Term(fieldName, termsEnum.term().utf8ToString()));
+ TermEnum enumerator = reader.terms(getLucenePrefixTerm(fieldName));
+ try {
+ do {
+ Term term = enumerator.term();
+ if ((term != null)
+ && term.text().startsWith(getPrefix())
+ && term.field().equals(fieldName)) {
+ mtv.visitMatchingTerm(term);
} else {
- skip = true;
- }
- } else {
- // EOF
- skip = true;
- }
-
- if (!skip) {
- while(true) {
- BytesRef text = termsEnum.next();
- if (text != null && text.startsWith(prefixRef)) {
- mtv.visitMatchingTerm(new Term(fieldName, text.utf8ToString()));
- } else {
- break;
- }
+ break;
}
- }
+ } while (enumerator.next());
+ } finally {
+ enumerator.close();
}
}
}
Copied: lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java (from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java&r1=932746&r2=941649&rev=941649&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java Thu May 6 10:41:02 2010
@@ -20,10 +20,7 @@ import java.io.IOException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.index.Terms;
-import org.apache.lucene.index.MultiFields;
-import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.index.TermEnum;
public class SrndTermQuery extends SimpleTerm {
@@ -49,14 +46,16 @@ public class SrndTermQuery extends Simpl
MatchingTermVisitor mtv) throws IOException
{
/* check term presence in index here for symmetry with other SimpleTerm's */
- Terms terms = MultiFields.getTerms(reader, fieldName);
- if (terms != null) {
- TermsEnum termsEnum = terms.iterator();
-
- TermsEnum.SeekStatus status = termsEnum.seek(new BytesRef(getTermText()));
- if (status == TermsEnum.SeekStatus.FOUND) {
- mtv.visitMatchingTerm(getLuceneTerm(fieldName));
+ TermEnum enumerator = reader.terms(getLuceneTerm(fieldName));
+ try {
+ Term it= enumerator.term(); /* same or following index term */
+ if ((it != null)
+ && it.text().equals(getTermText())
+ && it.field().equals(fieldName)) {
+ mtv.visitMatchingTerm(it);
}
+ } finally {
+ enumerator.close();
}
}
}
Copied: lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java (from r932746, lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java?p2=lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java&p1=lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java&r1=932746&r2=941649&rev=941649&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java Thu May 6 10:41:02 2010
@@ -17,11 +17,8 @@ package org.apache.lucene.queryParser.su
*/
import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.index.Terms;
-import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.index.TermEnum;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.MultiFields;
import java.io.IOException;
@@ -43,7 +40,6 @@ public class SrndTruncQuery extends Simp
private final char mask;
private String prefix;
- private BytesRef prefixRef;
private Pattern pattern;
@@ -72,7 +68,6 @@ public class SrndTruncQuery extends Simp
i++;
}
prefix = truncated.substring(0, i);
- prefixRef = new BytesRef(prefix);
StringBuilder re = new StringBuilder();
while (i < truncated.length()) {
@@ -89,37 +84,26 @@ public class SrndTruncQuery extends Simp
MatchingTermVisitor mtv) throws IOException
{
int prefixLength = prefix.length();
- Terms terms = MultiFields.getTerms(reader, fieldName);
- if (terms != null) {
- Matcher matcher = pattern.matcher("");
- try {
- TermsEnum termsEnum = terms.iterator();
-
- TermsEnum.SeekStatus status = termsEnum.seek(prefixRef);
- BytesRef text;
- if (status == TermsEnum.SeekStatus.FOUND) {
- text = prefixRef;
- } else if (status == TermsEnum.SeekStatus.NOT_FOUND) {
- text = termsEnum.term();
- } else {
- text = null;
- }
-
- while(text != null) {
- if (text != null && text.startsWith(prefixRef)) {
- String textString = text.utf8ToString();
- matcher.reset(textString.substring(prefixLength));
+ TermEnum enumerator = reader.terms(new Term(fieldName, prefix));
+ Matcher matcher = pattern.matcher("");
+ try {
+ do {
+ Term term = enumerator.term();
+ if (term != null) {
+ String text = term.text();
+ if ((! text.startsWith(prefix)) || (! term.field().equals(fieldName))) {
+ break;
+ } else {
+ matcher.reset( text.substring(prefixLength));
if (matcher.matches()) {
- mtv.visitMatchingTerm(new Term(fieldName, textString));
+ mtv.visitMatchingTerm(term);
}
- } else {
- break;
}
- text = termsEnum.next();
}
- } finally {
- matcher.reset();
- }
+ } while (enumerator.next());
+ } finally {
+ enumerator.close();
+ matcher.reset();
}
}
}
Modified: lucene/dev/branches/branch_3x/lucene/contrib/spatial/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/spatial/build.xml?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/spatial/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/spatial/build.xml Thu May 6 10:41:02 2010
@@ -25,18 +25,18 @@
<import file="../contrib-build.xml"/>
- <contrib-uptodate name="misc" property="misc.uptodate" classpath.property="misc.jar"/>
+ <contrib-uptodate name="queries" property="queries.uptodate" classpath.property="queries.jar"/>
<path id="classpath">
- <pathelement path="${misc.jar}"/>
+ <pathelement path="${queries.jar}"/>
<path refid="base.classpath"/>
</path>
- <target name="compile-core" depends="build-misc, common.compile-core" />
+ <target name="compile-core" depends="build-queries, common.compile-core" />
- <target name="build-misc" unless="misc.uptodate">
- <echo>Misc building dependency ${misc.jar}</echo>
- <ant antfile="../misc/build.xml" target="default" inheritall="false" dir="../misc" />
+ <target name="build-queries" unless="queries.uptodate">
+ <echo>Misc building dependency ${queries.jar}</echo>
+ <ant antfile="../queries/build.xml" target="default" inheritall="false" dir="../queries" />
</target>
</project>
Modified: lucene/dev/branches/branch_3x/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/spatial/src/java/org/apache/lucene/spatial/tier/DistanceQueryBuilder.java Thu May 6 10:41:02 2010
@@ -18,11 +18,11 @@
package org.apache.lucene.spatial.tier;
import org.apache.lucene.search.ConstantScoreQuery;
+import org.apache.lucene.search.ChainedFilter;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryWrapperFilter;
import org.apache.lucene.spatial.geohash.GeoHashDistanceFilter;
-import org.apache.lucene.misc.ChainedFilter;
/**
* <p><font color="red"><b>NOTE:</b> This API is still in
Modified: lucene/dev/branches/branch_3x/lucene/docs/contributions.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/contributions.html?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/contributions.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/contributions.html Thu May 6 10:41:02 2010
@@ -186,15 +186,9 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-swing/index.html">Swing</a>
</div>
<div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/branch_3x/lucene/docs/demo.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/demo.html?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/demo.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/demo.html Thu May 6 10:41:02 2010
@@ -186,15 +186,9 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-swing/index.html">Swing</a>
</div>
<div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/branch_3x/lucene/docs/demo2.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/demo2.html?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/demo2.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/demo2.html Thu May 6 10:41:02 2010
@@ -186,15 +186,9 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-swing/index.html">Swing</a>
</div>
<div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/branch_3x/lucene/docs/demo3.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/demo3.html?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/demo3.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/demo3.html Thu May 6 10:41:02 2010
@@ -186,15 +186,9 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-swing/index.html">Swing</a>
</div>
<div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/branch_3x/lucene/docs/demo4.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/demo4.html?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/demo4.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/demo4.html Thu May 6 10:41:02 2010
@@ -186,15 +186,9 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-swing/index.html">Swing</a>
</div>
<div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/branch_3x/lucene/docs/fileformats.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/fileformats.html?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/fileformats.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/fileformats.html Thu May 6 10:41:02 2010
@@ -186,15 +186,9 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-swing/index.html">Swing</a>
</div>
<div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.html?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/gettingstarted.html Thu May 6 10:41:02 2010
@@ -186,15 +186,9 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-swing/index.html">Swing</a>
</div>
<div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/branch_3x/lucene/docs/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/index.html?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/index.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/index.html Thu May 6 10:41:02 2010
@@ -184,15 +184,9 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-swing/index.html">Swing</a>
</div>
<div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/branch_3x/lucene/docs/linkmap.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/linkmap.html?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/linkmap.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/linkmap.html Thu May 6 10:41:02 2010
@@ -184,15 +184,9 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-swing/index.html">Swing</a>
</div>
<div class="menuitem">
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
@@ -424,25 +418,13 @@ document.write("Last Published: " + docu
<li>
<a href="api/contrib-spellchecker/index.html">Spellchecker</a> ___________________ <em>javadoc-contrib-spellchecker</em>
</li>
-</ul>
-
-<ul>
-<li>
-<a href="api/contrib-surround/index.html">Surround</a> ___________________ <em>javadoc-contrib-surround</em>
-</li>
</ul>
<ul>
<li>
<a href="api/contrib-swing/index.html">Swing</a> ___________________ <em>javadoc-contrib-swing</em>
</li>
-</ul>
-
-<ul>
-<li>
-<a href="api/contrib-wikipedia/index.html">Wikipedia</a> ___________________ <em>javadoc-contrib-wikipedia</em>
-</li>
-</ul>
+</ul>
<ul>
<li>
Modified: lucene/dev/branches/branch_3x/lucene/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/linkmap.pdf?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/linkmap.pdf (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/linkmap.pdf Thu May 6 10:41:02 2010
@@ -20,10 +20,10 @@ endobj
>>
endobj
7 0 obj
-<< /Length 1052 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 995 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-GatUs>Ar4L'Z],,'R<q*n9e%&fN)M1e4OLBlD/QkggFeb0%:3(I/>o_&r2oH!M5;pkPmX;\MuO+ak%DO&-gKaX<u:s:QP\O(HIjZ]uV&r*)^D]428NmA'D*G.7+I.T>'*9=WjJ1,Vn1eHC_lmq=!S2b5('KIV:0ZP\O_WFTK>.'`'36`A.n"6(6jaI$quXl0*bjpo%&H$`F7%@4,&'a$V&J+\dYSj'*`_KS_gAcX7g$N@XUu:mk:ja.jGO\E/eQfQ`f5&^,U&2P]:WUl;MCoX"<&gFeUO7clG`=^lcCELP(/:-t]o$@PlR9+4[<HZ%0=+qI+!*YW6]DG'OUZUSG\PM-[s^=<r8]ZOV\*6[!`pOVe$18h3ZSKVBW:\"6UWH=IX8&JdE32`Xn$11T#L_T]&`qN(!@Bpr6#sH(0C^Q\?<XJqfeFTf]oFu2[X^$Tir-#ZepTZ0qkM3Nr6`_oIQIJj5QANi+QW0*DSgeYGg1Un711Vu9?h\b]$a)S^-QSS;:'*>EH>Kms<G:Ge:4L2ZeUscP9c3C5&=pr16^Gp*%J*H2m6]VeAWgCS,Z.o+.qOt(I"7[\p2%LG[UPSYBegTj\9\0a;^a=_%l&D(/>$34N$]dRmsHG<L2".\QY0_PgJa]?.Mh%TQuH+KX_/!D[)-q83$(D_fK'k`b<2sHDG<4=L!&N@5s\aOG;a>Rk.<`Uk@\[,MM\`cmWO.T3nmi9j_.J=i'm;XP#84+'`Tj>,hB![>q5#m,SqPh<)7L>2[$1iPgtd!:pEOX\#qugcM4)+-n-g)L.'Vf*9,u%>"6Ju]r\4Cn,(O=r<.:+5l3J[%hluP"<d&4O3GN4cAZ$l.9qmU&r+LT(0b9c+^QAa?g5]eMbNM[iGXXr>PZS-(PkUX+d_H@=;VTWjs]Jq-4c<0i[#300q$$+*cZQ74P+Mki7c]$SM1YW?SZbG/nLST9uIn<3HOht+cImP\*<UZ_Y%\NqX]SmJ&Vo)(5@p
[f&B]<`q<@8?$i0Go"@kjQ!&)g'LfJ9S]@J'2+m8;@nSt+hrPKXHhSW7S\DB~>
+GatUs>u03/'Sc)R.sqX>p&#CLc6]-+dKIu@Q'aD*aeV\RRZB@H.K0!^^.=b,18Sr4%!ganf]O5%f?;j6"Tt,W"I?k4Jb9ERUjk*AeC'75Z_<@0Y`-E%M^LjD-(&2dOT*_J?'tLEMF8Z;IBM0>.[U1*r`k'4@/4)4g$_t$NFb,3'$E-..pg1Ep#gdmW%<=fa4fc`K:Q]*W76CL!:'MhAtb_)M4')T*Vt`,`aT>iF%AL24R/;5i=D(4192/I<ELD[,6h#?ZH,Eb%r&J?S0+S=IU1?^niLa$7)M#?c6+4MnNk0oP%U>=7Pu1^W**sl7VNCb[^Qu$'[_"rX>+S@U5t^$*b1_kE++)th1>Q`oJaao9Kde?]%jYQAaT>Q!L)ITpC:W;SkP#$ZlNToS=imm@uSKGCV@d`QtEBeWp,:GlmF_DqNQcT@t`=jmU.RD]Xr$976N^rQkbq9.Df\o9K`BR9[/[cVtLlre[1^)NXKZiJF&I$5NYSXD41uU[h!V6b=%mUc>h`!05WI3I#OL(=8>Ru'mg[ma^e*1kQOXR,MuHAA&Q8b^::bH9L_ld4:o,%)X7ganfj$'Hch7'MoG;jVRE8A\7ldnLO%5PO.gSNGW1#68l\6[VY-1pP[$pIB+A5!2EfSsV:k%@6VV=U_</;aq_IDPCL*6i5rE&trJ"l_H8Nl2NbadWIJr\rM%XaiFAMF9Bc'l\.BeHG:^J.Y*m`H91]8Mm(+im'%#_dG*90A-Y`0^A9mBuG)sW2VY'ts&%P;1N&ct(e^qg^oi`;+b@JP(:*.:aF2UOr1-C\+RNO>U-Nm.Mq"!]?H[53NO/n_felbk@dZ+bo3V?_>X+@m?j,RA#VZg6Ul#59j?`hT%*f7MdtRqlt[qNF[C(tG6G3]kAkSW=u=(j'U!\>9kYQ./O>4_E[L7?r23f_6c1E#TCBlo&%]a>UQ^$GRO,BqPq[l`;YcIBjL)["k3mU8SMnn%9<,IHS>e'l<X4+)rf
DZi~>
endstream
endobj
8 0 obj
@@ -87,19 +87,19 @@ endobj
xref
0 14
0000000000 65535 f
-0000003146 00000 n
-0000003210 00000 n
-0000003260 00000 n
+0000003088 00000 n
+0000003152 00000 n
+0000003202 00000 n
0000000015 00000 n
0000000071 00000 n
0000001233 00000 n
0000001339 00000 n
-0000002483 00000 n
-0000002589 00000 n
-0000002701 00000 n
-0000002811 00000 n
-0000002922 00000 n
-0000003030 00000 n
+0000002425 00000 n
+0000002531 00000 n
+0000002643 00000 n
+0000002753 00000 n
+0000002864 00000 n
+0000002972 00000 n
trailer
<<
/Size 14
@@ -107,5 +107,5 @@ trailer
/Info 4 0 R
>>
startxref
-3382
+3324
%%EOF
Modified: lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.html?rev=941649&r1=941648&r2=941649&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.html (original)
+++ lucene/dev/branches/branch_3x/lucene/docs/lucene-contrib/index.html Thu May 6 10:41:02 2010
@@ -186,15 +186,9 @@ document.write("Last Published: " + docu
<a href="../api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="../api/contrib-surround/index.html">Surround</a>
-</div>
-<div class="menuitem">
<a href="../api/contrib-swing/index.html">Swing</a>
</div>
<div class="menuitem">
-<a href="../api/contrib-wikipedia/index.html">Wikipedia</a>
-</div>
-<div class="menuitem">
<a href="../api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
@@ -306,15 +300,9 @@ document.write("Last Published: " + docu
<a href="#spellchecker">spellchecker</a>
</li>
<li>
-<a href="#surround">surround</a>
-</li>
-<li>
<a href="#swing">swing</a>
</li>
<li>
-<a href="#wikipedia">wikipedia</a>
-</li>
-<li>
<a href="#wordnet">wordnet</a>
</li>
<li>
@@ -447,27 +435,17 @@ document.write("Last Published: " + docu
<p>Provides tools for spellchecking and suggestions with Lucene.</p>
<p>See <a href="../api/contrib-spellchecker/index.html">spellchecker javadoc</a>
</p>
-<a name="N10116"></a><a name="surround"></a>
-<h3 class="boxed">surround</h3>
-<p>A QueryParser that supports the Span family of queries as well as pre and infix notation.</p>
-<p>See <a href="../api/contrib-surround/index.html">surround javadoc</a>
-</p>
-<a name="N10125"></a><a name="swing"></a>
+<a name="N10116"></a><a name="swing"></a>
<h3 class="boxed">swing</h3>
<p>Swing components designed to integrate with Lucene.</p>
<p>See <a href="../api/contrib-swing/index.html">swing javadoc</a>
</p>
-<a name="N10134"></a><a name="wikipedia"></a>
-<h3 class="boxed">wikipedia</h3>
-<p>Tools for working with wikipedia content.</p>
-<p>See <a href="../api/contrib-wikipedia/index.html">wikipedia javadoc</a>
-</p>
-<a name="N10143"></a><a name="wordnet"></a>
+<a name="N10125"></a><a name="wordnet"></a>
<h3 class="boxed">wordnet</h3>
<p>Tools to help utilize wordnet synonyms with Lucene</p>
<p>See <a href="../api/contrib-wordnet/index.html">wordnet javadoc</a>
</p>
-<a name="N10152"></a><a name="xml-query-parser"></a>
+<a name="N10134"></a><a name="xml-query-parser"></a>
<h3 class="boxed">xml-query-parser</h3>
<p>A QueryParser that can read queries written in an XML format.</p>
<p>See <a href="../api/contrib-wordnet/index.html">xml-query-parser javadoc</a>