From 524b4470a11a5f60611f7624252a3afcacad29f8 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Sat, 10 Apr 2010 14:23:08 +0000 Subject: [PATCH] LUCENE-2323: move surround queryparser to queryparser contrib git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@932731 13f79535-47bb-0310-9956-ffa450edef68 --- lucene/build.xml | 13 +- lucene/contrib/CHANGES.txt | 4 +- .../{surround => queryparser}/README.txt | 0 lucene/contrib/queryparser/build.xml | 8 +- .../lucene/queryParser/surround/package.html} | 14 +- .../surround/parser/CharStream.java | 0 .../surround/parser/FastCharStream.java | 0 .../surround/parser/ParseException.java | 0 .../surround/parser/QueryParser.java | 0 .../surround/parser/QueryParser.jj | 0 .../surround/parser/QueryParserConstants.java | 0 .../parser/QueryParserTokenManager.java | 0 .../queryParser/surround/parser/Token.java | 0 .../surround/parser/TokenMgrError.java | 0 .../queryParser/surround/parser/package.html | 0 .../queryParser/surround/query/AndQuery.java | 0 .../surround/query/BasicQueryFactory.java | 0 .../surround/query/ComposedQuery.java | 0 .../surround/query/DistanceQuery.java | 0 .../surround/query/DistanceSubQuery.java | 0 .../surround/query/FieldsQuery.java | 0 .../queryParser/surround/query/NotQuery.java | 0 .../queryParser/surround/query/OrQuery.java | 0 .../surround/query/SimpleTerm.java | 0 .../surround/query/SpanNearClauseFactory.java | 0 .../surround/query/SrndBooleanQuery.java | 0 .../surround/query/SrndPrefixQuery.java | 0 .../queryParser/surround/query/SrndQuery.java | 0 .../surround/query/SrndTermQuery.java | 0 .../surround/query/SrndTruncQuery.java | 0 .../surround/query/TooManyBasicQueries.java | 0 .../queryParser/surround/query/package.html | 0 .../surround/query/BooleanQueryTst.java | 0 .../surround/query/ExceptionQueryTst.java | 0 .../surround/query/SingleFieldTestDb.java | 0 .../surround/query/Test01Exceptions.java | 0 .../surround/query/Test02Boolean.java | 0 .../surround/query/Test03Distance.java | 0 lucene/contrib/surround/build.xml | 33 -- lucene/contrib/surround/pom.xml.template | 36 -- lucene/docs/contributions.html | 3 - lucene/docs/demo.html | 3 - lucene/docs/demo2.html | 3 - lucene/docs/demo3.html | 3 - lucene/docs/demo4.html | 3 - lucene/docs/fileformats.html | 3 - lucene/docs/gettingstarted.html | 3 - lucene/docs/index.html | 3 - lucene/docs/linkmap.html | 9 - lucene/docs/linkmap.pdf | 24 +- lucene/docs/lucene-contrib/index.html | 17 +- lucene/docs/lucene-contrib/index.pdf | 428 ++++++++---------- lucene/docs/queryparsersyntax.html | 3 - lucene/docs/scoring.html | 3 - lucene/docs/systemrequirements.html | 3 - .../content/xdocs/lucene-contrib/index.xml | 7 +- .../src/documentation/content/xdocs/site.xml | 4 +- 57 files changed, 233 insertions(+), 397 deletions(-) rename lucene/contrib/{surround => queryparser}/README.txt (100%) rename lucene/contrib/{surround/src/java/overview.html => queryparser/src/java/org/apache/lucene/queryParser/surround/package.html} (81%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/parser/CharStream.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/parser/FastCharStream.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/parser/ParseException.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserConstants.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserTokenManager.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/parser/Token.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/parser/TokenMgrError.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/parser/package.html (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/AndQuery.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/BasicQueryFactory.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/DistanceSubQuery.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/NotQuery.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/OrQuery.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/SpanNearClauseFactory.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/SrndBooleanQuery.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/TooManyBasicQueries.java (100%) rename lucene/contrib/{surround => queryparser}/src/java/org/apache/lucene/queryParser/surround/query/package.html (100%) rename lucene/contrib/{surround => queryparser}/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java (100%) rename lucene/contrib/{surround => queryparser}/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java (100%) rename lucene/contrib/{surround => queryparser}/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java (100%) rename lucene/contrib/{surround => queryparser}/src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java (100%) rename lucene/contrib/{surround => queryparser}/src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java (100%) rename lucene/contrib/{surround => queryparser}/src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java (100%) delete mode 100644 lucene/contrib/surround/build.xml delete mode 100644 lucene/contrib/surround/pom.xml.template diff --git a/lucene/build.xml b/lucene/build.xml index 5e4dec714e2..e55289e8c74 100644 --- a/lucene/build.xml +++ b/lucene/build.xml @@ -347,7 +347,6 @@ The source distribution does not contain sources of the previous Lucene Java ver - @@ -376,7 +375,6 @@ The source distribution does not contain sources of the previous Lucene Java ver - @@ -611,7 +609,7 @@ The source distribution does not contain sources of the previous Lucene Java ver - + @@ -623,7 +621,7 @@ The source distribution does not contain sources of the previous Lucene Java ver - + @@ -655,13 +653,6 @@ The source distribution does not contain sources of the previous Lucene Java ver antfile="build.xml" /> - - - - diff --git a/lucene/contrib/CHANGES.txt b/lucene/contrib/CHANGES.txt index e02efbf1ced..da4baa787e7 100644 --- a/lucene/contrib/CHANGES.txt +++ b/lucene/contrib/CHANGES.txt @@ -126,8 +126,8 @@ 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. (Robert Muir) * LUCENE-2333: Fix failures during contrib builds, when classes in core were changed without ant clean. This fix also optimizes the diff --git a/lucene/contrib/surround/README.txt b/lucene/contrib/queryparser/README.txt similarity index 100% rename from lucene/contrib/surround/README.txt rename to lucene/contrib/queryparser/README.txt diff --git a/lucene/contrib/queryparser/build.xml b/lucene/contrib/queryparser/build.xml index c4f6b5dc9a5..467bfa4bd9a 100644 --- a/lucene/contrib/queryparser/build.xml +++ b/lucene/contrib/queryparser/build.xml @@ -28,7 +28,7 @@ - + @@ -105,4 +105,10 @@ import org.apache.lucene.queryParser.core.messages.*;" outputDir="${javacc.precedence.path}" /> + + + + diff --git a/lucene/contrib/surround/src/java/overview.html b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/package.html similarity index 81% rename from lucene/contrib/surround/src/java/overview.html rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/package.html index e4fbefcd079..3ea34b52bba 100644 --- a/lucene/contrib/surround/src/java/overview.html +++ b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/package.html @@ -1,3 +1,4 @@ + - - - surround - - - - surround - - \ No newline at end of file + +A QueryParser that supports the Span family of queries as well as pre and infix notation. + + diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/CharStream.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/CharStream.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/CharStream.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/CharStream.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/FastCharStream.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/FastCharStream.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/FastCharStream.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/FastCharStream.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/ParseException.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/ParseException.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/ParseException.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/ParseException.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserConstants.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserConstants.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserConstants.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserConstants.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserTokenManager.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserTokenManager.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserTokenManager.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParserTokenManager.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/Token.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/Token.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/Token.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/Token.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/TokenMgrError.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/TokenMgrError.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/TokenMgrError.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/TokenMgrError.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/package.html b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/package.html similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/package.html rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/package.html diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/AndQuery.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/AndQuery.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/AndQuery.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/AndQuery.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/BasicQueryFactory.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/BasicQueryFactory.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/BasicQueryFactory.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/BasicQueryFactory.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/DistanceQuery.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/DistanceSubQuery.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/DistanceSubQuery.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/DistanceSubQuery.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/DistanceSubQuery.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/NotQuery.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/NotQuery.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/NotQuery.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/NotQuery.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/OrQuery.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/OrQuery.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/OrQuery.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/OrQuery.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SpanNearClauseFactory.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SpanNearClauseFactory.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SpanNearClauseFactory.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SpanNearClauseFactory.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndBooleanQuery.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndBooleanQuery.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndBooleanQuery.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndBooleanQuery.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTermQuery.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/TooManyBasicQueries.java b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/TooManyBasicQueries.java similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/TooManyBasicQueries.java rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/TooManyBasicQueries.java diff --git a/lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/package.html b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/package.html similarity index 100% rename from lucene/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/package.html rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/query/package.html diff --git a/lucene/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java b/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java similarity index 100% rename from lucene/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java rename to lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/BooleanQueryTst.java diff --git a/lucene/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java b/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java similarity index 100% rename from lucene/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java rename to lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java diff --git a/lucene/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java b/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java similarity index 100% rename from lucene/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java rename to lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/SingleFieldTestDb.java diff --git a/lucene/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java b/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java similarity index 100% rename from lucene/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java rename to lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test01Exceptions.java diff --git a/lucene/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java b/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java similarity index 100% rename from lucene/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java rename to lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test02Boolean.java diff --git a/lucene/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java b/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java similarity index 100% rename from lucene/contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java rename to lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/surround/query/Test03Distance.java diff --git a/lucene/contrib/surround/build.xml b/lucene/contrib/surround/build.xml deleted file mode 100644 index 37584dd6a04..00000000000 --- a/lucene/contrib/surround/build.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - Surround query parser - - - - - - - - diff --git a/lucene/contrib/surround/pom.xml.template b/lucene/contrib/surround/pom.xml.template deleted file mode 100644 index e1dc1ba6f2c..00000000000 --- a/lucene/contrib/surround/pom.xml.template +++ /dev/null @@ -1,36 +0,0 @@ - - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-surround - Lucene Surround - @version@ - Surround query parser - jar - diff --git a/lucene/docs/contributions.html b/lucene/docs/contributions.html index 1866ec3a38b..882821a8774 100644 --- a/lucene/docs/contributions.html +++ b/lucene/docs/contributions.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Spellchecker
-Surround -
-
Swing
diff --git a/lucene/docs/demo.html b/lucene/docs/demo.html index 6e533948c9f..832cead3f1c 100644 --- a/lucene/docs/demo.html +++ b/lucene/docs/demo.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Spellchecker
-Surround -
-
Swing
diff --git a/lucene/docs/demo2.html b/lucene/docs/demo2.html index 4973a5e78a3..5c8599fc34f 100644 --- a/lucene/docs/demo2.html +++ b/lucene/docs/demo2.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Spellchecker
-Surround -
-
Swing
diff --git a/lucene/docs/demo3.html b/lucene/docs/demo3.html index b498e158e4b..50130c61f05 100644 --- a/lucene/docs/demo3.html +++ b/lucene/docs/demo3.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Spellchecker
-Surround -
-
Swing
diff --git a/lucene/docs/demo4.html b/lucene/docs/demo4.html index 585385a8791..93068ccd96a 100644 --- a/lucene/docs/demo4.html +++ b/lucene/docs/demo4.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Spellchecker
-Surround -
-
Swing
diff --git a/lucene/docs/fileformats.html b/lucene/docs/fileformats.html index f25bf4d9030..8757ca9ad24 100644 --- a/lucene/docs/fileformats.html +++ b/lucene/docs/fileformats.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Spellchecker
-Surround -
-
Swing
diff --git a/lucene/docs/gettingstarted.html b/lucene/docs/gettingstarted.html index 350e1096abe..7b46e22eabb 100644 --- a/lucene/docs/gettingstarted.html +++ b/lucene/docs/gettingstarted.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Spellchecker
-Surround -
-
Swing
diff --git a/lucene/docs/index.html b/lucene/docs/index.html index 92a000df853..de75c710c64 100644 --- a/lucene/docs/index.html +++ b/lucene/docs/index.html @@ -184,9 +184,6 @@ document.write("Last Published: " + document.lastModified); Spellchecker
-Surround -
-
Swing
diff --git a/lucene/docs/linkmap.html b/lucene/docs/linkmap.html index 5512a4722fb..864e33153e1 100644 --- a/lucene/docs/linkmap.html +++ b/lucene/docs/linkmap.html @@ -184,9 +184,6 @@ document.write("Last Published: " + document.lastModified); Spellchecker
-Surround -
-
Swing
@@ -421,12 +418,6 @@ document.write("Last Published: " + document.lastModified);
  • Spellchecker  ___________________  javadoc-contrib-spellchecker
    • - - -
      -
    • -Surround  ___________________  javadoc-contrib-surround -
      diff --git a/lucene/docs/linkmap.pdf b/lucene/docs/linkmap.pdf index e0bfcffe684..b8cf0fae78a 100644 --- a/lucene/docs/linkmap.pdf +++ b/lucene/docs/linkmap.pdf @@ -20,10 +20,10 @@ endobj >> endobj 7 0 obj -<< /Length 1025 /Filter [ /ASCII85Decode /FlateDecode ] +<< /Length 995 /Filter [ /ASCII85Decode /FlateDecode ] >> stream -GatUs>Aoub'Z],&.iq\084LWcqBkjKP7-^RjRU"jJ/6l'T:%RabD?5q^80iIA:,r:2Z-UDE/8&<+e3Y!;CUp$&CGSn,#deAK6`P*\I;j-Yu3XZTI2oA<8mo4JGN(J)2d[?Lakr$@EA5p8rR1&(Z7*:#A)rLr5iLsAE34DKpHToU]@i0(6Z^IT??Q^p^!kYlT>%r^;I*LA<)e`'Y&l7+%;^^ihDW5W1(R7[?KV[BD@jN6Ng>(K.,!ZC22[0jr5V2,7hG,%IFqlSU:SdSu1Vk]=PqBEo1VjEB;HK:;?5c]!g13\PKf*9m\>AG/(!]i7+IJ1KjYg7s/1.O#Ao7.R8#$ZO^1ki\&GFnQ(=C'o=3N@.9h_C0&GIc1r2612$E"]bNsWVTE@Bii!$6FeM(p4MjWOF-\J^+"!0`3-;msDrW[W3L:Oj,e?o\Ub_)]&"#%@m?jp^Y*HkOh)ZTEA]QhO^5G+WRoi&Dk?R.YEq:T;$TsL7RX($no)'JC88W/oT"?0X8T.h&[%%Q)[^3&a9er_*g>X3p`Pbk9K8Z1J894]L8bJ&hATWm/-cc;YZF'KLXeO%4).YQ%'(W^PASNfg=h_)7/F[H[:Y_mg?ZW5QF"'c4j#8eOd\THp&gX7'LrV;pdT`mCg4W8qG$]V=k1'<4f_9G6]"'?Lu=3>OMAEVPpgTKWMMGYG*hUGkV26jc,1bh&c20Mk\Lq['Q>UeBE=W/(!\>Im*jr!<~> +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=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_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 endstream endobj 8 0 obj @@ -87,19 +87,19 @@ endobj xref 0 14 0000000000 65535 f -0000003119 00000 n -0000003183 00000 n -0000003233 00000 n +0000003088 00000 n +0000003152 00000 n +0000003202 00000 n 0000000015 00000 n 0000000071 00000 n 0000001233 00000 n 0000001339 00000 n -0000002456 00000 n -0000002562 00000 n -0000002674 00000 n -0000002784 00000 n -0000002895 00000 n -0000003003 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 -3355 +3324 %%EOF diff --git a/lucene/docs/lucene-contrib/index.html b/lucene/docs/lucene-contrib/index.html index 805458bd2ff..70b961f73cd 100644 --- a/lucene/docs/lucene-contrib/index.html +++ b/lucene/docs/lucene-contrib/index.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Spellchecker
    -Surround -
    -
    Swing
    @@ -303,9 +300,6 @@ document.write("Last Published: " + document.lastModified); spellchecker
  • -surround -
    • -
  • swing
  • @@ -441,22 +435,17 @@ document.write("Last Published: " + document.lastModified);

    Provides tools for spellchecking and suggestions with Lucene.

    See spellchecker javadoc

    - -

    surround

    -

    A QueryParser that supports the Span family of queries as well as pre and infix notation.

    -

    See surround javadoc -

    - +

    swing

    Swing components designed to integrate with Lucene.

    See swing javadoc

    - +

    wordnet

    Tools to help utilize wordnet synonyms with Lucene

    See wordnet javadoc

    - +

    xml-query-parser

    A QueryParser that can read queries written in an XML format.

    See xml-query-parser javadoc diff --git a/lucene/docs/lucene-contrib/index.pdf b/lucene/docs/lucene-contrib/index.pdf index b8bd0da680b..4f41043078d 100644 --- a/lucene/docs/lucene-contrib/index.pdf +++ b/lucene/docs/lucene-contrib/index.pdf @@ -5,10 +5,10 @@ /Producer (FOP 0.20.5) >> endobj 5 0 obj -<< /Length 968 /Filter [ /ASCII85Decode /FlateDecode ] +<< /Length 941 /Filter [ /ASCII85Decode /FlateDecode ] >> stream -Gb!$G9lldX&;KZO$6>[iMB7rEm+Z=,B-TUf68NM=F6o1/lhCcCmeSN%moa!kV`f4ge/hXb"/rMR/JE77NMY,(q_h"m;GkCW/M@PmE,+Qa$X2"oF4r]3.Z.O0?6E2W4i3)WOo%q9_iWpIZj%RN#WN13qC7/.TVeWW#mY8+"GlrZDUaJG5PZ3GIm4rTg(t*]BkS7@67GYL2l)ma3ilrg83inOe6.a(nT:74#o_.EZko5.=dSEgfaULTqRcAp/iSP&hGAMA^e*3;58g-UGf#;DH`Y>mRgMU*0XA^:COsXPVG@=arE-.Yf*C3D+"27Ne_=T!"FuJUQ4kY8*6IAJqk%Rb+R;kQ?aIud;hP&9<]pp"2-'GNI9BN0M6@7'Z"jb];PJ7iLVch#X!!Z)Q'PuKa3FJ)u*fXlo[9$-Z33hSdi$a_@9j9?-N"Xj2Z@;Fq?XHg5"jl0`OG$>T0aE[N?5g/L[I4@c9*J8caP\D-Jk`j2LPujpn#NiHctcDlg3RVh:N/);I`d7T\$+sQfJne'%(=jVBu.)S`+ZFc^';&i5>Vd?L!`<,TgILb>Uc+2MPT/o?]"6?_o^O9b&O'BLJWA7$-&^EQ/TEolb15Tc*hu@%Jo2Cl3%fTVPYcDWlBc4]1$QGQi39-ck640i$0@o~> +Gb!$G9lldX&;KZO$6>[i@pt-_kL3c\kRefpQC>o16QMWAj>j:OiMtc"tr^aqjS'5Pr^8VSpXmn4Cn95glSq"@Q:jnEm.73g?X6\\uVm7.3c,bqr,uiTlaQgHYQQ!a6u$1B<&*TqGW'RbPjI7[R8#J)"miI*%e=f>rmue$2PeM!nX1Hs0-u!VU?M/=c#^lHd.h?<1MA#,eT4;ZMGau_(LFokGB5T`UXkBXc<6]KZpg*F"/)fVd6'@F0<2G_5qB7dCcp&0OS?h*&Mm?VaPqJW'OMpQZ?RbIFphC(KBjiA16.Hh-*uMhIW+q&F7N'9bW8mUHV4VcV2V`PjObZOKRM81hLT%-@4g%'=I&S7LoeI=@doYXN:CU\k(lld,qb-p)qpW=)To\m)BNfd*TPV/bX&"W#3Ku>h?1(aR)OapFs;mhe#(>Ej+R,f_.ltrLH[6_Eb]QZ8B.MYRA34XmD5#54B(E=rarMhZ]*`@%$hMTfX)`A^aPn).B5o<7D=rP"jl0VObc`$0aE[N?Ku-$);e5VDk>841Q[8aHSL;7&q9;m[9KcaSsCmB4CqmXR&nT>nl$Gh]1joegVd5_,Oge4K*UgA72eP%_:RVrDN9S4\hG%\-rakuN%7=1X[iLom$7@K5+EPgF>[r^r=FjI/]!eq>:JE"]A?ZeU:X?jVVf>hV.$<^FEV3U/pE+?AUD;_`"1)i9Krrp@bnGW~> endstream endobj 6 0 obj @@ -41,7 +41,6 @@ endobj 40 0 R 42 0 R 44 0 R -46 0 R ] endobj 8 0 obj @@ -207,7 +206,7 @@ endobj 40 0 obj << /Type /Annot /Subtype /Link -/Rect [ 108.0 268.466 171.16 256.466 ] +/Rect [ 108.0 268.466 157.168 256.466 ] /C [ 0 0 0 ] /Border [ 0 0 0 ] /A 41 0 R @@ -217,7 +216,7 @@ endobj 42 0 obj << /Type /Annot /Subtype /Link -/Rect [ 108.0 250.266 157.168 238.266 ] +/Rect [ 108.0 250.266 167.824 238.266 ] /C [ 0 0 0 ] /Border [ 0 0 0 ] /A 43 0 R @@ -227,7 +226,7 @@ endobj 44 0 obj << /Type /Annot /Subtype /Link -/Rect [ 108.0 232.066 167.824 220.066 ] +/Rect [ 108.0 232.066 211.804 220.066 ] /C [ 0 0 0 ] /Border [ 0 0 0 ] /A 45 0 R @@ -235,22 +234,27 @@ endobj >> endobj 46 0 obj -<< /Type /Annot -/Subtype /Link -/Rect [ 108.0 213.866 211.804 201.866 ] -/C [ 0 0 0 ] -/Border [ 0 0 0 ] -/A 47 0 R -/H /I ->> -endobj -48 0 obj << /Length 1855 /Filter [ /ASCII85Decode /FlateDecode ] >> stream Gau0DgMZ%0&:O:S#lBhd#qbGFm8Go;[U!\cmD^_S1ju#C3p'T]?&FN'IXO`\OXrM4g*/dudN[jpB$SWa_d[eqR/Jlu8Iu*'D%rTPV8]?JL4Nd3#@mVNY9/a,BG/e`>R16iDXm[g\qJdtTt%@trA+8SR*BPtK,+tK<\r3LR)'7$7ucf4A&I>uZ.KtES5F[$5HB:ndOVn?5@b>^!s4?*6r(8!(YBmJCP=pNe*J`emo3+5(N)tqd#%;JmXoMr+DEVrF]`L9T'n;0<6DREF6)io*M_3.K8WsJ?/,0eL'h:K>>Rr$+hIdmbtRuR;BkjGkJ49<$P,Pf/#B?L-'2.ZRTbXjELem)1_%QP/m[Sq'GP_hV:)ThEV`lMXmu#?&.@&eAc;-"<,RcN'2#o*I#@qA=f9m,.J2?u<+c',ms^;FC7)('g',[Db*VhAp:[\bR8g^S@2ND-==O?Im#5C_eOh,]YQd#P@obNoT&$N>gm^`2ek!BcHc]ZhO-Fo348Ihl]V/kuNT-/^&"'5NDnRa\a'l#iR_>KZndd#_ee`@nJsq?^?_o[?,)l?I[3mJP/edbjLYg)N-pQLgD,DeMcQO_D+h2JR*ac!ST!%)iLdt%YY#q`,lj)[>@qNWVd's11c8*<1[j0jl7]#lu*6HT&ahD-.*OC7m%X[51a8,m,b9=FeN3%K3ra/8G?*HfL1ik8Y5VQ#'Wa\bfcZ@Ys`Va/s1V-VV,RX3*K`Bp_/`'5`t?rf^#m1:8[N&L9[eh0#j3Kbb_7=6+i0qlaq!t+5G>l#dsdNXAgAG;]bH["%p?dG_sr*6HLn'5*%A$#c0tS-`gC\#GqhB'N#>KNua^(VYQ=D7h#'lakD1p>F49#4]?@Oa,=Z:'T)&F>>ZoZI2q_%1-Vk%'=PHaep@(>52V9X+:OdSk!Z5)GuCYfq$j^#Iq[?A`kq2j;8gOSJ19\lWa2"UNZ?ej'E0[@h@Q4`[(BWoiT"9`Y.jr#L?L!qd7P[tJr)Ji]QZbeXnUcCLolunE^7hlC6K'?qr?tdb/TTW'0*6VL)(-.'F3'Uip^F,2D]/J54A)I[[)2jU4QrZN[kJ)"clckAK,`IV9c('4NbchckZ:]X;i@1rPR0PO#M7ri=W1p3XArg..O?Op4.E&:S?-q(D5Eng[tJNk3*S8B9F\.+b![fL'k[U@_1P\R0bG[E\&/@IG;0a<3F=jHV?0gP]tAT[]3JD?F!D,_7X[Hjoc3bs)LfA@72ub&[e!_?$eOZgEV-)D:p3,K4[Zo@kr]1kkX[bl8]iCD<_^sg?i9a&a)#MZ#'P(csa,7KBT)+c'[$8[3d^@^##4`q?0U(FeTdMFT\.F"Q1il)$_i'I*_9_->J6W`0OY7>iY]HOIh06DRV6*H=5ga@e$%qdbFsZg_rMC5[jeHWs1jN<7;$Dm(bNr6JG\eTBg*jQ"M6rWEDXiKWO:QCtcQDV613:iYm@M#1J<^GL,CJWUdcrCqbHS\s6iq?FQqeVck3UQ0UNBdee@CX*/Al%ZhHg7*r2R(oeA-] endstream endobj +47 0 obj +<< /Type /Page +/Parent 1 0 R +/MediaBox [ 0 0 612 792 ] +/Resources 3 0 R +/Contents 46 0 R +>> +endobj +48 0 obj +<< /Length 1335 /Filter [ /ASCII85Decode /FlateDecode ] + >> +stream +Gau1.968iG&:j6G'g12+'nSBdU[?QF3phli.&WpILkI$3I&J0%fDYAJ^'m7B-W3j%8!X-q\VpF[`S8r&kLJS\"UVX,H+/Sa_L[parc?Kc?4%Sq&X'rn@(l?>\G`9)-&=U+^UY-]Tl=GJ=l"8W8Zq@4A[\S^&PKHNCNg0:,WfoL:/Z>l?-UM;%WJ3/2K.m@OE$*;AA&6$F4oYgo-it.SPP`1+Gf,I><9-tUn+@+AW.g.?HS[$neB5O8Ar(6J[BcRpXq15>eL@K;t^hR[hnJ4@UGD3D!'a;F."=SWkVfb>d#)FQ!=2jiY[*h)5>TZ<13RfH8.)MpY]S)]AH\e3>ta7WZdt*ks\R4jarVJ+b))sdj'^g'FGkM+t7UYWN7%=2OS<%3ZCsJieU"M\KSpYN5BgU)]s!I?`mD24Tqb`a%?&sEXI[VeN.n!Y\;jWhl,8PgS#nf"_=MNU7hO'AouI#k4s7%8[N22\+(@s'-S";8aL`e+$4$@6%2=HAmp%+YaD)P?ndFiA:I_3[BAZD-_9F*?npdMtobr?l)U>-aRcbZ6Ms$(QID?l\Ma*__B3bX0M(iR7oQ"O5/-c1IUE:.Ws:Q%6T8@rKE-dakP=G`ZJB$Sfa2r[;k[-H?'0LB\XjT>-smIo7#1/4nIg-"q_"#iB]hM2ka0@frJXSFI95j:f@%U03cV3?Z-?8dINt_@U260+##I=Gid;eT?2<\Z>GMVAjOPk=,>W7Kp%IMQsOhe``EMiHVA0J#YEOP;:G/IFXWt?W3(3QKNG=l`Qed#5jNC7FlJY!@-*U&-~> +endstream +endobj 49 0 obj << /Type /Page /Parent 1 0 R @@ -260,10 +264,10 @@ endobj >> endobj 50 0 obj -<< /Length 1335 /Filter [ /ASCII85Decode /FlateDecode ] +<< /Length 1262 /Filter [ /ASCII85Decode /FlateDecode ] >> stream -Gau1.968iG&:j6G'g12+'nSBdU[?QF3phli.&WpILkI$3I&J0%fDYAJ^'m7B-W3j%8!X-q\VpF[`S8r&kLJS\"UVX,H+/Sa_L[parc?Kc?4%Sq&X'rn@(l?>\G`9)-&=U+^UY-]Tl=GJ=l"8W8Zq@4A[\S^&PKHNCNg0:,WfoL:/Z>l?-UM;%WJ3/2K.m@OE$*;AA&6$F4oYgo-it.SPP`1+Gf,I><9-tUn+@+AW.g.?HS[$neB5O8Ar(6J[BcRpXq15>eL@K;t^hR[hnJ4@UGD3D!'a;F."=SWkVfb>d#)FQ!=2jiY[*h)5>TZ<13RfH8.)MpY]S)]AH\e3>ta7WZdt*ks\R4jarVJ+b))sdj'^g'FGkM+t7UYWN7%=2OS<%3ZCsJieU"M\KSpYN5BgU)]s!I?`mD24Tqb`a%?&sEXI[VeN.n!Y\;jWhl,8PgS#nf"_=MNU7hO'AouI#k4s7%8[N22\+(@s'-S";8aL`e+$4$@6%2=HAmp%+YaD)P?ndFiA:I_3[BAZD-_9F*?npdMtobr?l)U>-aRcbZ6Ms$(QID?l\Ma*__B3bX0M(iR7oQ"O5/-c1IUE:.Ws:Q%6T8@rKE-dakP=G`ZJB$Sfa2r[;k[-H?'0LB\XjT>-smIo7#1/4nIg-"q_"#iB]hM2ka0@frJXSFI95j:f@%U03cV3?Z-?8dINt_@U260+##I=Gid;eT?2<\Z>GMVAjOPk=,>W7Kp%IMQsOhe``EMiHVA0J#YEOP;:G/IFXWt?W3(3QKNG=l`Qed#5jNC7FlJY!@-*U&-~> +Gau1.9lo&I&;KZM'f[Nr21eVQ*"u,=Br@Ln@boHR-k`9$;M7Ago9S;.Ojdt/k2L!PUfgAf-r%u>G)hO81+WU1DK$sX(Ou,J'.FI^Q?Tt45r$fV41k-u/OZ[S*7[/rDKRsM49A(_\@Mm%?r77k0nW5W1C4)_+m5!d*MKgHo6,[?pK=!BWQqBE:IIC(blKEiW\m3eN9TKQ/AQ'SSqoO8+h!'4LOiV@Q;]]/To9-JA0Yfn*2VWp)F47'\,p8lmdqNQhHc_o*KPij:O2"\S?YH%X+bP]1Y0+CcZ6nICX)ctj[oq`TX#f!7^>uH)B!8r[#$n<;.3sp$nNm*X`UJ1b/=FGUX/D:#ZD8*;9BSWRB8*F6i_)^6ia0t>\jqi[U]Lp#58J69khaml\r_-IYVj[NH!eK4@ZK+unp`=r6iM<56?8HZ\/p24n0!R""PcAkW4fHNOau@&$ULsC^u25SA&d7QCYN6&HV7eFWe65@<\:eKUUFLFk8q;5!7eI5b1Qe)j\E=?XYe6,!nk!9e,69#B*ZoBE@5V*nPg9)u,HZn0Oks*QE)4W\78_b1ShicTda`ms^aT"Pi_2/o8\qt(\o/mM;/V0](-4.:&,S<".:At"f(a-rFra9JC?lfHdXNOc^Q^=bUXX]ga/p>MfW6k`kMHNM9/X5qgERBSp$1)tC'XgGuMA]L^iB!F)W0LWk7c@GaZ#iU\-tY+57QJAFTA&s!>\?iKDH9j8]=OZ\46)e+EW=7/43cpD*CC,IQmYXZCIoM>(lY3U[.rK"Z@"bV6bc1PM"s-uI-Ke()fAAe)ncQ6K9`2RE))=hPt!Hk]ntLc7!^IaJioWDPkJjirfraW52f5"Oq@ap%?"Y5GJ=i+he"'h&ciY0*KP-`iN^elDD3tDHK5!4P.HG]'"M\(11pkTZ\J83D!`rm]IS3'X,H585!N(J/f8W endstream endobj 51 0 obj @@ -275,10 +279,10 @@ endobj >> endobj 52 0 obj -<< /Length 1303 /Filter [ /ASCII85Decode /FlateDecode ] +<< /Length 568 /Filter [ /ASCII85Decode /FlateDecode ] >> stream -Gau0CgQ(#H&:O:Sn1asT%'R6)-AucgU'6^]hqC9@1+fht,t4QZh0scBOsQ8t.p3ZG$suI:B85T>)3-q_=$Nih?WRs'nG]pi#pq'X,5;kXs*Z6u`A4?++MhkE?^qWBYIS7435HdpcO3LD^Get;5!D6*$a@b;.+8X^3NqJSZ6s"-g2+OoIcq<"$)kd5h3EA['T$;;]U&;Uq[,6D;j"JDT-9UK:.ifa5nl/oNW9rf3td/\?XE\'XA1F43$bJ4?kAO8)9F:A''Ke2oE)8C9]0(i@2cC?YZm#\h$gl:@NA:'@DA[B)D\@$Z:8G`f*rcWIm>Bhj&)LY0Y&qlWI>Pm3Rr95c[9kSnS45KZuo+E&f3,@7`b&a>HCi?E#D!+#p/,*87C/amVGHItWk+;[IMu&]*icn'Zcu1%]gWD"@LUL;;pN:P"TI[O&)S5R:I_U6u)N;:+MoAb@5LJkIWt]p\s+=+qV=hA<2/K=^bK@BYUC=^A(pgW\&IY?QDMor#tI&O:4@*DeS0ol^c6KYk1^oaLAX5]>X<6c*?3Xe@?=l+A4nLfbLkg+L]oHT#bqm!kd/171&L.Ch5YI7S7r-K>]R,Q@k8$mo"7l6\\>T?jZSWih+kM+a:FP-D!t,Q^J-oO@7"32bEBZ@5Dg%2H9-2a,`loMhInVXS1TIu8PlKINO<+RS`jg7NBe"dsCD]SWblm.,Zo'0)a6!(+BCOP`e`1u\L"]3[!%c=E?#=Y$b\Q/b\G$UUO@d7#UW68FGOCP5#7_i13_MT94'^0,TWWtLl+`t#HZPF"?*PN4N1Fl"OYGfkaUrpG?2"9e*<,ljtkN_g/R:j/l5pU/.5%75tFj,!Mdq0_GpHOnn5V/=F'i#*XWEIcFjSr0"F-@>6*'6s.39aU(SKVPp#G&!Ep&*!t7S!8liK2u(_j+R;N9)HmL8X'M5n7a)]YNk;jjSPW%j.o35G:';q(a5$JegGD@_ZO\Y+01qqWlD[Ad*$ngSU&mjO/"GJDEV2k_g'U6m'-@'hoM3q~> +GasId?#SI?'Rf_Z\<#lADR^MlIU&qMdaUkUlA%r8+)!tR:PkVTVd9?$n<^q+X3.a,!1.ada'9D%f-5K4#e'`G:3)'tZ7PTS+kuuY:GJ%^3"(eh?#oc*H;;PVeVg7,idRWS,ciM*rZUJ5--(rN-k>`^G&Qc%0CO(P^!pq*fd7.*1!aH;Y:e`6MJp04L-!p;Ksh^aD(Abl!SeGST)e1@'_YOIk+G$i2g&de1**<.5KeG9k0skA^le8q>'t9J5,D@VSV68'AZPBUf$k3kI6Jb+8BlULQ&h,9c%jp@&Q>XhO;gP>gXnDoD"OmM>bG,M`*9R=P0)p<`.iVjRO]PVgHneISk7;GT6B_oW]n/.EkCX(Vrafcdg`+AR/_D[bh>:EM"FkI=BLcNPW,SE*`F(~> endstream endobj 53 0 obj @@ -289,209 +293,186 @@ endobj /Contents 52 0 R >> endobj -54 0 obj -<< /Length 678 /Filter [ /ASCII85Decode /FlateDecode ] - >> -stream -Gatm8?#Q2d'Rf.Gpp#7'lYCN8_fU$DEJ"+J0`3NoGg"`2t%MY^bhF,2!#c2)`G85::Kh,:npZj^c)tdg%tCNZQ(,`=qMqkBK*$X9.S5T13s4^7S>6c@>G1R@5Mr/3F%ii$2T[Z3nO0cM&.be=MCHLGkb&bH8F/e5N6Nhn`*O!CQGo@@eWq94D\p"4@lG&i>S7GM7?cB\OSo.:GX?B9?2XT`\1=474[tbBdJ[>#Z^7f&qq50+NOEIUj=Wr+\uhF=-tNLi=44*RhN)X$t\p/d+p<6N-<[*mNQ2E,1on22+QEtB9.CbhIWN:b:(rX5F5;j`bcP%:D,lgKa?k'AIA7cEU4ad5AYV%E#b:2MP?G=UAV2@OZYaa5`n/Yom~> -endstream -endobj 55 0 obj -<< /Type /Page -/Parent 1 0 R -/MediaBox [ 0 0 612 792 ] -/Resources 3 0 R -/Contents 54 0 R ->> -endobj -57 0 obj << /Title (\376\377\0\61\0\40\0\114\0\165\0\143\0\145\0\156\0\145\0\40\0\103\0\157\0\156\0\164\0\162\0\151\0\142) - /Parent 56 0 R - /First 58 0 R - /Last 76 0 R - /Count -19 + /Parent 54 0 R + /First 56 0 R + /Last 73 0 R + /Count -18 /A 9 0 R >> endobj +56 0 obj +<< + /Title (\376\377\0\61\0\56\0\61\0\40\0\141\0\156\0\141\0\154\0\171\0\172\0\145\0\162\0\163) + /Parent 55 0 R + /Next 57 0 R + /A 11 0 R +>> endobj +57 0 obj +<< + /Title (\376\377\0\61\0\56\0\62\0\40\0\141\0\156\0\164) + /Parent 55 0 R + /Prev 56 0 R + /Next 58 0 R + /A 13 0 R +>> endobj 58 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\40\0\141\0\156\0\141\0\154\0\171\0\172\0\145\0\162\0\163) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\63\0\40\0\142\0\145\0\156\0\143\0\150\0\155\0\141\0\162\0\153) + /Parent 55 0 R + /Prev 57 0 R /Next 59 0 R - /A 11 0 R + /A 15 0 R >> endobj 59 0 obj << - /Title (\376\377\0\61\0\56\0\62\0\40\0\141\0\156\0\164) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142) + /Parent 55 0 R /Prev 58 0 R /Next 60 0 R - /A 13 0 R + /A 17 0 R >> endobj 60 0 obj << - /Title (\376\377\0\61\0\56\0\63\0\40\0\142\0\145\0\156\0\143\0\150\0\155\0\141\0\162\0\153) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\65\0\40\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162) + /Parent 55 0 R /Prev 59 0 R /Next 61 0 R - /A 15 0 R + /A 19 0 R >> endobj 61 0 obj << - /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\66\0\40\0\151\0\143\0\165) + /Parent 55 0 R /Prev 60 0 R /Next 62 0 R - /A 17 0 R + /A 21 0 R >> endobj 62 0 obj << - /Title (\376\377\0\61\0\56\0\65\0\40\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\67\0\40\0\151\0\156\0\163\0\164\0\141\0\156\0\164\0\151\0\141\0\164\0\145\0\144) + /Parent 55 0 R /Prev 61 0 R /Next 63 0 R - /A 19 0 R + /A 23 0 R >> endobj 63 0 obj << - /Title (\376\377\0\61\0\56\0\66\0\40\0\151\0\143\0\165) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\70\0\40\0\154\0\165\0\143\0\154\0\151) + /Parent 55 0 R /Prev 62 0 R /Next 64 0 R - /A 21 0 R + /A 25 0 R >> endobj 64 0 obj << - /Title (\376\377\0\61\0\56\0\67\0\40\0\151\0\156\0\163\0\164\0\141\0\156\0\164\0\151\0\141\0\164\0\145\0\144) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\71\0\40\0\155\0\145\0\155\0\157\0\162\0\171) + /Parent 55 0 R /Prev 63 0 R /Next 65 0 R - /A 23 0 R + /A 27 0 R >> endobj 65 0 obj << - /Title (\376\377\0\61\0\56\0\70\0\40\0\154\0\165\0\143\0\154\0\151) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\155\0\151\0\163\0\143) + /Parent 55 0 R /Prev 64 0 R /Next 66 0 R - /A 25 0 R + /A 29 0 R >> endobj 66 0 obj << - /Title (\376\377\0\61\0\56\0\71\0\40\0\155\0\145\0\155\0\157\0\162\0\171) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\161\0\165\0\145\0\162\0\171\0\160\0\141\0\162\0\163\0\145\0\162) + /Parent 55 0 R /Prev 65 0 R /Next 67 0 R - /A 27 0 R + /A 31 0 R >> endobj 67 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\155\0\151\0\163\0\143) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\61\0\62\0\40\0\161\0\165\0\145\0\162\0\151\0\145\0\163) + /Parent 55 0 R /Prev 66 0 R /Next 68 0 R - /A 29 0 R + /A 33 0 R >> endobj 68 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\161\0\165\0\145\0\162\0\171\0\160\0\141\0\162\0\163\0\145\0\162) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\162\0\145\0\155\0\157\0\164\0\145) + /Parent 55 0 R /Prev 67 0 R /Next 69 0 R - /A 31 0 R + /A 35 0 R >> endobj 69 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\62\0\40\0\161\0\165\0\145\0\162\0\151\0\145\0\163) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\61\0\64\0\40\0\163\0\160\0\141\0\164\0\151\0\141\0\154) + /Parent 55 0 R /Prev 68 0 R /Next 70 0 R - /A 33 0 R + /A 37 0 R >> endobj 70 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\162\0\145\0\155\0\157\0\164\0\145) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\61\0\65\0\40\0\163\0\160\0\145\0\154\0\154\0\143\0\150\0\145\0\143\0\153\0\145\0\162) + /Parent 55 0 R /Prev 69 0 R /Next 71 0 R - /A 35 0 R + /A 39 0 R >> endobj 71 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\64\0\40\0\163\0\160\0\141\0\164\0\151\0\141\0\154) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\61\0\66\0\40\0\163\0\167\0\151\0\156\0\147) + /Parent 55 0 R /Prev 70 0 R /Next 72 0 R - /A 37 0 R + /A 41 0 R >> endobj 72 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\65\0\40\0\163\0\160\0\145\0\154\0\154\0\143\0\150\0\145\0\143\0\153\0\145\0\162) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\61\0\67\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164) + /Parent 55 0 R /Prev 71 0 R /Next 73 0 R - /A 39 0 R + /A 43 0 R >> endobj 73 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\66\0\40\0\163\0\165\0\162\0\162\0\157\0\165\0\156\0\144) - /Parent 57 0 R + /Title (\376\377\0\61\0\56\0\61\0\70\0\40\0\170\0\155\0\154\0\55\0\161\0\165\0\145\0\162\0\171\0\55\0\160\0\141\0\162\0\163\0\145\0\162) + /Parent 55 0 R /Prev 72 0 R - /Next 74 0 R - /A 41 0 R ->> endobj -74 0 obj -<< - /Title (\376\377\0\61\0\56\0\61\0\67\0\40\0\163\0\167\0\151\0\156\0\147) - /Parent 57 0 R - /Prev 73 0 R - /Next 75 0 R - /A 43 0 R ->> endobj -75 0 obj -<< - /Title (\376\377\0\61\0\56\0\61\0\70\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164) - /Parent 57 0 R - /Prev 74 0 R - /Next 76 0 R /A 45 0 R >> endobj -76 0 obj -<< - /Title (\376\377\0\61\0\56\0\61\0\71\0\40\0\170\0\155\0\154\0\55\0\161\0\165\0\145\0\162\0\171\0\55\0\160\0\141\0\162\0\163\0\145\0\162) - /Parent 57 0 R - /Prev 75 0 R - /A 47 0 R ->> endobj -77 0 obj +74 0 obj << /Type /Font /Subtype /Type1 /Name /F3 /BaseFont /Helvetica-Bold /Encoding /WinAnsiEncoding >> endobj -78 0 obj +75 0 obj << /Type /Font /Subtype /Type1 /Name /F5 /BaseFont /Times-Roman /Encoding /WinAnsiEncoding >> endobj -79 0 obj +76 0 obj << /Type /Font /Subtype /Type1 /Name /F1 /BaseFont /Helvetica /Encoding /WinAnsiEncoding >> endobj -80 0 obj +77 0 obj << /Type /Font /Subtype /Type1 /Name /F2 /BaseFont /Helvetica-Oblique /Encoding /WinAnsiEncoding >> endobj -81 0 obj +78 0 obj << /Type /Font /Subtype /Type1 /Name /F7 @@ -501,235 +482,226 @@ endobj 1 0 obj << /Type /Pages /Count 5 -/Kids [6 0 R 49 0 R 51 0 R 53 0 R 55 0 R ] >> +/Kids [6 0 R 47 0 R 49 0 R 51 0 R 53 0 R ] >> endobj 2 0 obj << /Type /Catalog /Pages 1 0 R - /Outlines 56 0 R + /Outlines 54 0 R /PageMode /UseOutlines >> endobj 3 0 obj << -/Font << /F3 77 0 R /F5 78 0 R /F1 79 0 R /F2 80 0 R /F7 81 0 R >> +/Font << /F3 74 0 R /F5 75 0 R /F1 76 0 R /F2 77 0 R /F7 78 0 R >> /ProcSet [ /PDF /ImageC /Text ] >> endobj 9 0 obj << /S /GoTo -/D [49 0 R /XYZ 85.0 659.0 null] +/D [47 0 R /XYZ 85.0 659.0 null] >> endobj 11 0 obj << /S /GoTo -/D [49 0 R /XYZ 85.0 339.066 null] +/D [47 0 R /XYZ 85.0 339.066 null] >> endobj 13 0 obj << /S /GoTo -/D [49 0 R /XYZ 85.0 266.613 null] +/D [47 0 R /XYZ 85.0 266.613 null] >> endobj 15 0 obj << /S /GoTo -/D [49 0 R /XYZ 85.0 194.16 null] +/D [47 0 R /XYZ 85.0 194.16 null] >> endobj 17 0 obj << /S /GoTo -/D [51 0 R /XYZ 85.0 637.8 null] +/D [49 0 R /XYZ 85.0 637.8 null] >> endobj 19 0 obj << /S /GoTo -/D [51 0 R /XYZ 85.0 565.347 null] +/D [49 0 R /XYZ 85.0 565.347 null] >> endobj 21 0 obj << /S /GoTo -/D [51 0 R /XYZ 85.0 492.894 null] +/D [49 0 R /XYZ 85.0 492.894 null] >> endobj 23 0 obj << /S /GoTo -/D [51 0 R /XYZ 85.0 407.241 null] +/D [49 0 R /XYZ 85.0 407.241 null] >> endobj 25 0 obj << /S /GoTo -/D [51 0 R /XYZ 85.0 321.588 null] +/D [49 0 R /XYZ 85.0 321.588 null] >> endobj 27 0 obj << /S /GoTo -/D [51 0 R /XYZ 85.0 249.135 null] +/D [49 0 R /XYZ 85.0 249.135 null] >> endobj 29 0 obj << /S /GoTo -/D [51 0 R /XYZ 85.0 176.682 null] +/D [49 0 R /XYZ 85.0 176.682 null] >> endobj 31 0 obj << /S /GoTo -/D [53 0 R /XYZ 85.0 616.6 null] +/D [51 0 R /XYZ 85.0 616.6 null] >> endobj 33 0 obj << /S /GoTo -/D [53 0 R /XYZ 85.0 530.947 null] +/D [51 0 R /XYZ 85.0 530.947 null] >> endobj 35 0 obj << /S /GoTo -/D [53 0 R /XYZ 85.0 458.494 null] +/D [51 0 R /XYZ 85.0 458.494 null] >> endobj 37 0 obj << /S /GoTo -/D [53 0 R /XYZ 85.0 386.041 null] +/D [51 0 R /XYZ 85.0 386.041 null] >> endobj 39 0 obj << /S /GoTo -/D [53 0 R /XYZ 85.0 313.588 null] +/D [51 0 R /XYZ 85.0 313.588 null] >> endobj 41 0 obj << /S /GoTo -/D [53 0 R /XYZ 85.0 241.135 null] +/D [51 0 R /XYZ 85.0 241.135 null] >> endobj 43 0 obj << /S /GoTo -/D [53 0 R /XYZ 85.0 168.682 null] +/D [51 0 R /XYZ 85.0 168.682 null] >> endobj 45 0 obj << /S /GoTo -/D [55 0 R /XYZ 85.0 637.8 null] +/D [53 0 R /XYZ 85.0 637.8 null] >> endobj -47 0 obj +54 0 obj << -/S /GoTo -/D [55 0 R /XYZ 85.0 565.347 null] ->> -endobj -56 0 obj -<< - /First 57 0 R - /Last 57 0 R + /First 55 0 R + /Last 55 0 R >> endobj xref -0 82 +0 79 0000000000 65535 f -0000013955 00000 n -0000014041 00000 n -0000014133 00000 n +0000013465 00000 n +0000013551 00000 n +0000013643 00000 n 0000000015 00000 n 0000000071 00000 n -0000001130 00000 n -0000001250 00000 n -0000001408 00000 n -0000014256 00000 n -0000001543 00000 n -0000014319 00000 n -0000001680 00000 n -0000014385 00000 n -0000001817 00000 n -0000014451 00000 n -0000001954 00000 n -0000014516 00000 n -0000002089 00000 n -0000014580 00000 n -0000002226 00000 n -0000014646 00000 n -0000002363 00000 n -0000014712 00000 n -0000002500 00000 n -0000014778 00000 n -0000002637 00000 n -0000014844 00000 n -0000002774 00000 n -0000014910 00000 n -0000002911 00000 n -0000014976 00000 n -0000003047 00000 n -0000015040 00000 n -0000003184 00000 n -0000015106 00000 n -0000003321 00000 n -0000015172 00000 n -0000003458 00000 n -0000015238 00000 n -0000003595 00000 n -0000015304 00000 n -0000003731 00000 n -0000015370 00000 n -0000003868 00000 n -0000015436 00000 n -0000004005 00000 n -0000015500 00000 n -0000004142 00000 n -0000006090 00000 n -0000006198 00000 n -0000007626 00000 n -0000007734 00000 n -0000009130 00000 n -0000009238 00000 n -0000010008 00000 n -0000015566 00000 n -0000010116 00000 n -0000010317 00000 n -0000010473 00000 n -0000010607 00000 n -0000010777 00000 n -0000010905 00000 n -0000011087 00000 n -0000011221 00000 n -0000011409 00000 n -0000011555 00000 n -0000011707 00000 n -0000011852 00000 n -0000012039 00000 n -0000012202 00000 n -0000012359 00000 n -0000012522 00000 n -0000012715 00000 n -0000012884 00000 n -0000013035 00000 n -0000013198 00000 n -0000013399 00000 n -0000013512 00000 n -0000013622 00000 n -0000013730 00000 n -0000013846 00000 n +0000001103 00000 n +0000001223 00000 n +0000001374 00000 n +0000013766 00000 n +0000001509 00000 n +0000013829 00000 n +0000001646 00000 n +0000013895 00000 n +0000001783 00000 n +0000013961 00000 n +0000001920 00000 n +0000014026 00000 n +0000002055 00000 n +0000014090 00000 n +0000002192 00000 n +0000014156 00000 n +0000002329 00000 n +0000014222 00000 n +0000002466 00000 n +0000014288 00000 n +0000002603 00000 n +0000014354 00000 n +0000002740 00000 n +0000014420 00000 n +0000002877 00000 n +0000014486 00000 n +0000003013 00000 n +0000014550 00000 n +0000003150 00000 n +0000014616 00000 n +0000003287 00000 n +0000014682 00000 n +0000003424 00000 n +0000014748 00000 n +0000003561 00000 n +0000014814 00000 n +0000003698 00000 n +0000014880 00000 n +0000003835 00000 n +0000014946 00000 n +0000003972 00000 n +0000005920 00000 n +0000006028 00000 n +0000007456 00000 n +0000007564 00000 n +0000008919 00000 n +0000009027 00000 n +0000009687 00000 n +0000015010 00000 n +0000009795 00000 n +0000009996 00000 n +0000010152 00000 n +0000010286 00000 n +0000010456 00000 n +0000010584 00000 n +0000010766 00000 n +0000010900 00000 n +0000011088 00000 n +0000011234 00000 n +0000011386 00000 n +0000011531 00000 n +0000011718 00000 n +0000011881 00000 n +0000012038 00000 n +0000012201 00000 n +0000012394 00000 n +0000012545 00000 n +0000012708 00000 n +0000012909 00000 n +0000013022 00000 n +0000013132 00000 n +0000013240 00000 n +0000013356 00000 n trailer << -/Size 82 +/Size 79 /Root 2 0 R /Info 4 0 R >> startxref -15617 +15061 %%EOF diff --git a/lucene/docs/queryparsersyntax.html b/lucene/docs/queryparsersyntax.html index a8642d31531..b70e6c08e90 100644 --- a/lucene/docs/queryparsersyntax.html +++ b/lucene/docs/queryparsersyntax.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Spellchecker

    • -Surround -
    -
    Swing
    diff --git a/lucene/docs/scoring.html b/lucene/docs/scoring.html index b56e145959e..b8b5129545b 100644 --- a/lucene/docs/scoring.html +++ b/lucene/docs/scoring.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Spellchecker
    -Surround -
    -
    Swing
    diff --git a/lucene/docs/systemrequirements.html b/lucene/docs/systemrequirements.html index 973a8053f80..771c2bd6a7b 100644 --- a/lucene/docs/systemrequirements.html +++ b/lucene/docs/systemrequirements.html @@ -184,9 +184,6 @@ document.write("Last Published: " + document.lastModified); Spellchecker
    -Surround -
    -
    Swing
    diff --git a/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml b/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml index db52629f0b0..ec85ac9d779 100644 --- a/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml +++ b/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml @@ -124,12 +124,7 @@
    spellchecker

    Provides tools for spellchecking and suggestions with Lucene.

    See spellchecker javadoc

    -
    - -
    surround -

    A QueryParser that supports the Span family of queries as well as pre and infix notation.

    -

    See surround javadoc

    -
    +
    swing

    Swing components designed to integrate with Lucene.

    diff --git a/lucene/src/site/src/documentation/content/xdocs/site.xml b/lucene/src/site/src/documentation/content/xdocs/site.xml index 91ffa414fc0..3488203949c 100755 --- a/lucene/src/site/src/documentation/content/xdocs/site.xml +++ b/lucene/src/site/src/documentation/content/xdocs/site.xml @@ -71,8 +71,7 @@ See http://forrest.apache.org/docs/linking.html for more info --> - - + @@ -121,7 +120,6 @@ See http://forrest.apache.org/docs/linking.html for more info -