From ba2b0851b8813d5be2677864e489cc0a24b95168 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Thu, 21 Jan 2010 02:45:09 +0000 Subject: [PATCH] LUCENE-2226: move contrib/snowball to contrib/analyzers git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@901505 13f79535-47bb-0310-9956-ffa450edef68 --- NOTICE.txt | 4 +- README.txt | 2 +- contrib/CHANGES.txt | 10 +- .../{snowball => analyzers/common}/README.txt | 2 +- .../common}/SNOWBALL-LICENSE.txt | 0 contrib/analyzers/common/build.xml | 16 + .../analysis/snowball/SnowballAnalyzer.java | 0 .../analysis/snowball/SnowballFilter.java | 0 .../lucene/analysis/snowball/package.html} | 8 +- .../src/java/org/tartarus/snowball/Among.java | 0 .../tartarus/snowball/SnowballProgram.java | 0 .../java/org/tartarus/snowball/TestApp.java | 0 .../tartarus/snowball/ext/DanishStemmer.java | 0 .../tartarus/snowball/ext/DutchStemmer.java | 0 .../tartarus/snowball/ext/EnglishStemmer.java | 0 .../tartarus/snowball/ext/FinnishStemmer.java | 0 .../tartarus/snowball/ext/FrenchStemmer.java | 0 .../tartarus/snowball/ext/German2Stemmer.java | 0 .../tartarus/snowball/ext/GermanStemmer.java | 0 .../snowball/ext/HungarianStemmer.java | 0 .../tartarus/snowball/ext/ItalianStemmer.java | 0 .../org/tartarus/snowball/ext/KpStemmer.java | 0 .../tartarus/snowball/ext/LovinsStemmer.java | 0 .../snowball/ext/NorwegianStemmer.java | 0 .../tartarus/snowball/ext/PorterStemmer.java | 0 .../snowball/ext/PortugueseStemmer.java | 0 .../snowball/ext/RomanianStemmer.java | 0 .../tartarus/snowball/ext/RussianStemmer.java | 0 .../tartarus/snowball/ext/SpanishStemmer.java | 0 .../tartarus/snowball/ext/SwedishStemmer.java | 0 .../tartarus/snowball/ext/TurkishStemmer.java | 0 .../lucene/analysis/snowball/danish_stop.txt | 0 .../lucene/analysis/snowball/dutch_stop.txt | 0 .../lucene/analysis/snowball/english_stop.txt | 0 .../lucene/analysis/snowball/finnish_stop.txt | 0 .../lucene/analysis/snowball/french_stop.txt | 0 .../lucene/analysis/snowball/german_stop.txt | 0 .../analysis/snowball/hungarian_stop.txt | 0 .../lucene/analysis/snowball/italian_stop.txt | 0 .../analysis/snowball/norwegian_stop.txt | 0 .../analysis/snowball/portuguese_stop.txt | 0 .../lucene/analysis/snowball/russian_stop.txt | 0 .../lucene/analysis/snowball/spanish_stop.txt | 0 .../lucene/analysis/snowball/swedish_stop.txt | 0 .../analysis/snowball/TestSnowball.java | 0 .../analysis/snowball/TestSnowballVocab.java | 0 contrib/snowball/.cvsignore | 2 - contrib/snowball/LICENSE.txt | 16 - contrib/snowball/bin/.cvsignore | 1 - contrib/snowball/bin/snowball.sh | 7 - contrib/snowball/build.xml | 155 ------ contrib/snowball/docs/index.html | 148 ------ contrib/snowball/pom.xml.template | 43 -- contrib/snowball/snowball.cvspass | 1 - .../lucene/analysis/snowball/package.html | 24 - contrib/snowball/xdocs/index.xml | 17 - .../snowball/xdocs/stylesheets/project.xml | 32 -- docs/contributions.html | 3 - docs/demo.html | 3 - docs/demo2.html | 3 - docs/demo3.html | 3 - docs/demo4.html | 3 - docs/fileformats.html | 3 - docs/gettingstarted.html | 3 - docs/index.html | 3 - docs/linkmap.html | 9 - docs/linkmap.pdf | 24 +- docs/lucene-contrib/index.html | 25 +- docs/lucene-contrib/index.pdf | 478 +++++++++--------- docs/queryparsersyntax.html | 3 - docs/scoring.html | 3 - docs/systemrequirements.html | 3 - .../content/xdocs/lucene-contrib/index.xml | 7 +- .../src/documentation/content/xdocs/site.xml | 2 - 74 files changed, 274 insertions(+), 792 deletions(-) rename contrib/{snowball => analyzers/common}/README.txt (96%) rename contrib/{snowball => analyzers/common}/SNOWBALL-LICENSE.txt (100%) rename contrib/{snowball => analyzers/common}/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java (100%) rename contrib/{snowball/src/java/overview.html => analyzers/common/src/java/org/apache/lucene/analysis/snowball/package.html} (90%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/Among.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/SnowballProgram.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/TestApp.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/DanishStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/DutchStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/EnglishStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/FinnishStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/FrenchStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/German2Stemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/GermanStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/HungarianStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/ItalianStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/KpStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/LovinsStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/PorterStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/RomanianStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/RussianStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/SpanishStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/SwedishStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/java/org/tartarus/snowball/ext/TurkishStemmer.java (100%) rename contrib/{snowball => analyzers/common}/src/resources/org/apache/lucene/analysis/snowball/danish_stop.txt (100%) rename contrib/{snowball => analyzers/common}/src/resources/org/apache/lucene/analysis/snowball/dutch_stop.txt (100%) rename contrib/{snowball => analyzers/common}/src/resources/org/apache/lucene/analysis/snowball/english_stop.txt (100%) rename contrib/{snowball => analyzers/common}/src/resources/org/apache/lucene/analysis/snowball/finnish_stop.txt (100%) rename contrib/{snowball => analyzers/common}/src/resources/org/apache/lucene/analysis/snowball/french_stop.txt (100%) rename contrib/{snowball => analyzers/common}/src/resources/org/apache/lucene/analysis/snowball/german_stop.txt (100%) rename contrib/{snowball => analyzers/common}/src/resources/org/apache/lucene/analysis/snowball/hungarian_stop.txt (100%) rename contrib/{snowball => analyzers/common}/src/resources/org/apache/lucene/analysis/snowball/italian_stop.txt (100%) rename contrib/{snowball => analyzers/common}/src/resources/org/apache/lucene/analysis/snowball/norwegian_stop.txt (100%) rename contrib/{snowball => analyzers/common}/src/resources/org/apache/lucene/analysis/snowball/portuguese_stop.txt (100%) rename contrib/{snowball => analyzers/common}/src/resources/org/apache/lucene/analysis/snowball/russian_stop.txt (100%) rename contrib/{snowball => analyzers/common}/src/resources/org/apache/lucene/analysis/snowball/spanish_stop.txt (100%) rename contrib/{snowball => analyzers/common}/src/resources/org/apache/lucene/analysis/snowball/swedish_stop.txt (100%) rename contrib/{snowball => analyzers/common}/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java (100%) rename contrib/{snowball => analyzers/common}/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java (100%) delete mode 100644 contrib/snowball/.cvsignore delete mode 100644 contrib/snowball/LICENSE.txt delete mode 100644 contrib/snowball/bin/.cvsignore delete mode 100755 contrib/snowball/bin/snowball.sh delete mode 100644 contrib/snowball/build.xml delete mode 100644 contrib/snowball/docs/index.html delete mode 100644 contrib/snowball/pom.xml.template delete mode 100644 contrib/snowball/snowball.cvspass delete mode 100644 contrib/snowball/src/java/org/apache/lucene/analysis/snowball/package.html delete mode 100644 contrib/snowball/xdocs/index.xml delete mode 100644 contrib/snowball/xdocs/stylesheets/project.xml diff --git a/NOTICE.txt b/NOTICE.txt index 1e1bac2c2d2..0c7b8a3293f 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -5,10 +5,10 @@ This product includes software developed by The Apache Software Foundation (http://www.apache.org/). The snowball stemmers in - contrib/snowball/src/java/net/sf/snowball + contrib/analyzers/common/src/java/net/sf/snowball were developed by Martin Porter and Richard Boulton. The snowball stopword lists in - contrib/snowball/src/resources/org/apache/lucene/analysis/snowball + contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball were developed by Martin Porter and Richard Boulton. The full snowball package is available from http://snowball.tartarus.org/ diff --git a/README.txt b/README.txt index 721ba19a24f..d38f07b5b79 100644 --- a/README.txt +++ b/README.txt @@ -25,7 +25,7 @@ luceneweb.war contrib/* Contributed code which extends and enhances Lucene, but is not - part of the core library. Of special note are the JAR files in the analyzers and snowball directory which + part of the core library. Of special note are the JAR files in the analyzers directory which contain various analyzers that people may find useful in place of the StandardAnalyzer. diff --git a/contrib/CHANGES.txt b/contrib/CHANGES.txt index b360b66ad94..416149cb02c 100644 --- a/contrib/CHANGES.txt +++ b/contrib/CHANGES.txt @@ -15,6 +15,10 @@ Changes in backwards compatibility policy preserved, but some protected/public member variables changed type. This does NOT affect java code/class files produced by the snowball compiler, but technically is a backwards compatibility break. (Robert Muir) + + * 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) Changes in runtime behavior @@ -94,14 +98,10 @@ New features Build - * LUCENE-2117: SnowballAnalyzer now holds a runtime-dependency on - contrib-analyzers to correctly handle the unique Turkish casing behavior. - (Robert Muir via Simon Willnauer) - * LUCENE-2124: Moved the JDK-based collation support from contrib/collation into core, and moved the ICU-based collation support into contrib/icu. (Steven Rowe, Robert Muir) - + Optimizations * LUCENE-2157: DelimitedPayloadTokenFilter no longer copies the buffer diff --git a/contrib/snowball/README.txt b/contrib/analyzers/common/README.txt similarity index 96% rename from contrib/snowball/README.txt rename to contrib/analyzers/common/README.txt index 06bc451db99..f4338a4df40 100644 --- a/contrib/snowball/README.txt +++ b/contrib/analyzers/common/README.txt @@ -1,4 +1,4 @@ -Lucene Snowball README file +Lucene Contrib Analyzers README file This project provides pre-compiled version of the Snowball stemmers based on revision 500 of the Tartarus Snowball repository, diff --git a/contrib/snowball/SNOWBALL-LICENSE.txt b/contrib/analyzers/common/SNOWBALL-LICENSE.txt similarity index 100% rename from contrib/snowball/SNOWBALL-LICENSE.txt rename to contrib/analyzers/common/SNOWBALL-LICENSE.txt diff --git a/contrib/analyzers/common/build.xml b/contrib/analyzers/common/build.xml index a59f32d141c..6f8555c9e96 100644 --- a/contrib/analyzers/common/build.xml +++ b/contrib/analyzers/common/build.xml @@ -35,4 +35,20 @@ + + + + + + + + + + + + + + diff --git a/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java similarity index 100% rename from contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java rename to contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java diff --git a/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java similarity index 100% rename from contrib/snowball/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java rename to contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java diff --git a/contrib/snowball/src/java/overview.html b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/package.html similarity index 90% rename from contrib/snowball/src/java/overview.html rename to contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/package.html index 22636389152..d8b3471f560 100644 --- a/contrib/snowball/src/java/overview.html +++ b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/snowball/package.html @@ -1,3 +1,4 @@ + -

-Lucene Snowball README file -

- +{@link org.apache.lucene.analysis.TokenFilter} and {@link +org.apache.lucene.analysis.Analyzer} implementations that use Snowball +stemmers.

This project provides pre-compiled version of the Snowball stemmers based on revision 500 of the Tartarus Snowball repository, diff --git a/contrib/snowball/src/java/org/tartarus/snowball/Among.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/Among.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/Among.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/Among.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/SnowballProgram.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/SnowballProgram.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/SnowballProgram.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/SnowballProgram.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/TestApp.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/TestApp.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/TestApp.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/TestApp.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/DanishStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/DanishStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/DutchStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/DutchStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/EnglishStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/EnglishStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/FinnishStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/FinnishStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/FinnishStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/FinnishStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/FrenchStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/FrenchStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/German2Stemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/German2Stemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/German2Stemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/German2Stemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/GermanStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/GermanStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/HungarianStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/HungarianStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/ItalianStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/ItalianStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/KpStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/KpStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/KpStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/KpStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/LovinsStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/LovinsStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/LovinsStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/LovinsStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/PorterStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/PorterStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/RomanianStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/RomanianStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/RussianStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/RussianStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/SpanishStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/SpanishStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/SwedishStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/SwedishStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java diff --git a/contrib/snowball/src/java/org/tartarus/snowball/ext/TurkishStemmer.java b/contrib/analyzers/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java similarity index 100% rename from contrib/snowball/src/java/org/tartarus/snowball/ext/TurkishStemmer.java rename to contrib/analyzers/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java diff --git a/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/danish_stop.txt b/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/danish_stop.txt similarity index 100% rename from contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/danish_stop.txt rename to contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/danish_stop.txt diff --git a/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/dutch_stop.txt b/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/dutch_stop.txt similarity index 100% rename from contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/dutch_stop.txt rename to contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/dutch_stop.txt diff --git a/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/english_stop.txt b/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/english_stop.txt similarity index 100% rename from contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/english_stop.txt rename to contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/english_stop.txt diff --git a/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/finnish_stop.txt b/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/finnish_stop.txt similarity index 100% rename from contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/finnish_stop.txt rename to contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/finnish_stop.txt diff --git a/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/french_stop.txt b/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/french_stop.txt similarity index 100% rename from contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/french_stop.txt rename to contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/french_stop.txt diff --git a/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/german_stop.txt b/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/german_stop.txt similarity index 100% rename from contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/german_stop.txt rename to contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/german_stop.txt diff --git a/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/hungarian_stop.txt b/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/hungarian_stop.txt similarity index 100% rename from contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/hungarian_stop.txt rename to contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/hungarian_stop.txt diff --git a/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/italian_stop.txt b/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/italian_stop.txt similarity index 100% rename from contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/italian_stop.txt rename to contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/italian_stop.txt diff --git a/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/norwegian_stop.txt b/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/norwegian_stop.txt similarity index 100% rename from contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/norwegian_stop.txt rename to contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/norwegian_stop.txt diff --git a/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/portuguese_stop.txt b/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/portuguese_stop.txt similarity index 100% rename from contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/portuguese_stop.txt rename to contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/portuguese_stop.txt diff --git a/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/russian_stop.txt b/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/russian_stop.txt similarity index 100% rename from contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/russian_stop.txt rename to contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/russian_stop.txt diff --git a/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/spanish_stop.txt b/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/spanish_stop.txt similarity index 100% rename from contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/spanish_stop.txt rename to contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/spanish_stop.txt diff --git a/contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/swedish_stop.txt b/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/swedish_stop.txt similarity index 100% rename from contrib/snowball/src/resources/org/apache/lucene/analysis/snowball/swedish_stop.txt rename to contrib/analyzers/common/src/resources/org/apache/lucene/analysis/snowball/swedish_stop.txt diff --git a/contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java b/contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java similarity index 100% rename from contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java rename to contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java diff --git a/contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java b/contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java similarity index 100% rename from contrib/snowball/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java rename to contrib/analyzers/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java diff --git a/contrib/snowball/.cvsignore b/contrib/snowball/.cvsignore deleted file mode 100644 index 4184133fa5b..00000000000 --- a/contrib/snowball/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -build -snowball diff --git a/contrib/snowball/LICENSE.txt b/contrib/snowball/LICENSE.txt deleted file mode 100644 index 8c563ab525d..00000000000 --- a/contrib/snowball/LICENSE.txt +++ /dev/null @@ -1,16 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ diff --git a/contrib/snowball/bin/.cvsignore b/contrib/snowball/bin/.cvsignore deleted file mode 100644 index 6a1f952e1ba..00000000000 --- a/contrib/snowball/bin/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -snowball diff --git a/contrib/snowball/bin/snowball.sh b/contrib/snowball/bin/snowball.sh deleted file mode 100755 index ccce879d6af..00000000000 --- a/contrib/snowball/bin/snowball.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/csh -f -set infile = $1 -set outdir = $2 - -set name = $infile:h:t:uStemmer - -exec $0:h/snowball $infile -o $outdir/$name -n $name -java diff --git a/contrib/snowball/build.xml b/contrib/snowball/build.xml deleted file mode 100644 index e23fd642a35..00000000000 --- a/contrib/snowball/build.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - Snowball Analyzers - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Snowball building dependency ${analyzers.jar} - - - - - - - - - - - - - - - - diff --git a/contrib/snowball/docs/index.html b/contrib/snowball/docs/index.html deleted file mode 100644 index ba660000e97..00000000000 --- a/contrib/snowball/docs/index.html +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - Snowball Stemmers for Lucene - Overview - Snowball Stemmers for Lucene - - - - - - - - -
- -
- - - - - - - - - - - - -
-
-
- - - -

Documentation

- -

Download

- -

Links

- -

Jakarta

- - 		- - - - -
- - Snowball Stemmers for Lucene - -
-
-

-This project provides pre-compiled version of the Snowball stemmers -together with classes integrating them with the Lucene search engine. -

-
-

-

- - - - -
- - Download - -
-
-

-Releases of the stemmers are available - -here -

-
-

-

-
-
-
-
- Copyright © 1999-2004, The Apache Software Foundation -
-
- - - - - - - - - - - - - - - - - - - - - - - diff --git a/contrib/snowball/pom.xml.template b/contrib/snowball/pom.xml.template deleted file mode 100644 index 4667ba37b5f..00000000000 --- a/contrib/snowball/pom.xml.template +++ /dev/null @@ -1,43 +0,0 @@ - - - - - 4.0.0 - - org.apache.lucene - lucene-contrib - @version@ - - org.apache.lucene - lucene-snowball - Lucene Snowball - @version@ - Snowball Analyzers - jar - - - org.apache.lucene - lucene-analyzers - @version@ - - - diff --git a/contrib/snowball/snowball.cvspass b/contrib/snowball/snowball.cvspass deleted file mode 100644 index af3f4926bc9..00000000000 --- a/contrib/snowball/snowball.cvspass +++ /dev/null @@ -1 +0,0 @@ -:pserver:cvsuser@cvs.tartarus.org:/home/cvs Ay=0=a%0bZ diff --git a/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/package.html b/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/package.html deleted file mode 100644 index 907d9f45a19..00000000000 --- a/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/package.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - -{@link org.apache.lucene.analysis.TokenFilter} and {@link -org.apache.lucene.analysis.Analyzer} implementations that use Snowball -stemmers. - - diff --git a/contrib/snowball/xdocs/index.xml b/contrib/snowball/xdocs/index.xml deleted file mode 100644 index 42bede1a92a..00000000000 --- a/contrib/snowball/xdocs/index.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - -Overview - Snowball Stemmers for Lucene - - - -

-

-This project provides pre-compiled version of the Snowball stemmers -together with classes integrating them with the Lucene search engine. -

-
- - - - diff --git a/contrib/snowball/xdocs/stylesheets/project.xml b/contrib/snowball/xdocs/stylesheets/project.xml deleted file mode 100644 index d55ef7cc14f..00000000000 --- a/contrib/snowball/xdocs/stylesheets/project.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - Snowball Stemmers for Lucene - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/contributions.html b/docs/contributions.html index 013daab2db3..55ce4edf981 100644 --- a/docs/contributions.html +++ b/docs/contributions.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Remote
-Snowball -
-
Spatial
diff --git a/docs/demo.html b/docs/demo.html index 11170b2888b..045b44b4252 100644 --- a/docs/demo.html +++ b/docs/demo.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Remote
-Snowball -
-
Spatial
diff --git a/docs/demo2.html b/docs/demo2.html index 66ef79f5f01..9db2d4505a7 100644 --- a/docs/demo2.html +++ b/docs/demo2.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Remote
-Snowball -
-
Spatial
diff --git a/docs/demo3.html b/docs/demo3.html index 3ead1a8a882..597cd89a124 100644 --- a/docs/demo3.html +++ b/docs/demo3.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Remote
-Snowball -
-
Spatial
diff --git a/docs/demo4.html b/docs/demo4.html index 7ea76d5b859..4f2a0720448 100644 --- a/docs/demo4.html +++ b/docs/demo4.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Remote
-Snowball -
-
Spatial
diff --git a/docs/fileformats.html b/docs/fileformats.html index 7d1520edfa3..8572104579e 100644 --- a/docs/fileformats.html +++ b/docs/fileformats.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Remote
-Snowball -
-
Spatial
diff --git a/docs/gettingstarted.html b/docs/gettingstarted.html index 8392bd8b592..38207c011d9 100644 --- a/docs/gettingstarted.html +++ b/docs/gettingstarted.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Remote
-Snowball -
-
Spatial
diff --git a/docs/index.html b/docs/index.html index a395fa23672..3123ad3987d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -184,9 +184,6 @@ document.write("Last Published: " + document.lastModified); Remote
-Snowball -
-
Spatial
diff --git a/docs/linkmap.html b/docs/linkmap.html index c57588bf8f9..b4414ce9f3e 100644 --- a/docs/linkmap.html +++ b/docs/linkmap.html @@ -184,9 +184,6 @@ document.write("Last Published: " + document.lastModified); Remote
-Snowball -
-
Spatial
@@ -434,12 +431,6 @@ document.write("Last Published: " + document.lastModified); Remote  ___________________  javadoc-contrib-remote - -
    -
  • -Snowball  ___________________  javadoc-contrib-snowball -
    • -
  • diff --git a/docs/linkmap.pdf b/docs/linkmap.pdf index 0530d2668cf..e833b38d75d 100644 --- a/docs/linkmap.pdf +++ b/docs/linkmap.pdf @@ -20,10 +20,10 @@ endobj >> endobj 7 0 obj -<< /Length 1167 /Filter [ /ASCII85Decode /FlateDecode ] +<< /Length 1136 /Filter [ /ASCII85Decode /FlateDecode ] >> stream -GatUtgMYb*&;KZP'Y8*6biM,Qkcuf*"Vr\oM%"KWm:*oQ[%iU33L!e#DnjdN(?NsIki?KCB`=(B5;SNfXr"jTBS8'id<`ETd;FLZBRWg38Sg"7aoI'6[,+<&^\a$GI31$QUGoutuXoC'flqLq_+%$)8_7%./nqZ""feTVN7d!RjU/r1pd&SDo,N0bg0Rd%!8tU_Z;$%"=[_a#)5=kPtOT=$&RFdiV$l<$&ab'5dheasjbVY%Z]\I&$m,9.E*djmK:OkL^Q[_X&"bN/0G$lG.[]O^D4d9YKC6H_T`7;D5#2!lsk]dQ`iS8"HsEW:VN*t?5bBM?=)`I\if(SV=ubC!>EJtNX8p/CD<)h0sM7S;r>@6E!P+(Oh+E+K7\&N3ZGC_Rq#C]gG=$rNL@+tbj1WG-eg]71)O!+Y50`lU=0s;hiE]kbnl5Y#sCGH3Is5#g"tS>WO64Itu89B,qNf93)QS/s:.KX6Wk0md8->M2eX]&=,=#nYEY3!,;"RurYKdbg5Mh<>u%1FY<$`e8X5ZBkg^g0-ZTp4$(H.r:b;l,'(EMq@Aq7+*6I?/sESXP*XU9I$[6mG_REZ2Jisk*XZV&OE-:#(e5_(u3g@Gd:!Gqi-/=FZcOb0-H'KO>%T@^4J'(;gkYUB:\L_RkC=Hp\d1NkRq;0fd0fdX%Vs@+L>dP +GatUt?'!]!'Sc)P'tJ-6nG4C/aCSR-.oi_$)3DGX[]8+jR-]KZEC),SI\!Z6*7e4Ibgjgso013?O,q3Uc/Od!N=Z:Jg?]S/g+Q8*bo_fsM9SIY).5.Y2M^Lg2r?D1R2u0=`[`AQfkWc@.D;:8(HMYEJO:KS.pnpfSV0I0kWr#p<@&$?O9U0B&Zo!algUjCM1q?Ug$@lIZKe9+oL>tN1/"sBpkGPd0B&[ZDGRHsZHcu%Nen/kZR+b$eY(m[N.p$9l_E,YdO1;D2pM^eBEAfTb?VAKFaUtE3[_lBUigr4[_]0b)jA:M`YImALl[cEB.pC5=g>`BQT2DWXtVp@+!\VIB)7rZB1KASAGC1cO<6[HNnC4KIq143bWat8OAq!p%RWFj-8b_`r?GR+smL6L.S=HG[$W%EaIJg6f*fZV0>ZWecN,rhS)ss3fIW6Wg?Xr[S9cOGKb%`=05XDD'epRa)8A9ka(4-B4V[68[u<]YUu*nR=1%HmIJf>LL;k=kK.r=`D6Tl?=%3R)P?T#e-?ljJ-k7j9\=qYUTiM_M*7e>`6Q3gQ`B@h_sM0i[FDSk*Ya88Za2AjZTcp9^--Oa;F[5%@pX1T0j3)aQGK5kl^R=O,kG&HBRW0`ba_rp485m274j/g<+k^e+IqC8:Yr6_@`/'g^H5sPO=`Zet/9a2j8hLCeU32cNea&Y&37Gh#:?bZbj_]P?mt0c/PRJ_+tt;A.UaY-^H*0!7OK>BX`4g]Pi625]]V6n;&2a&d,t6@1;R@I68ql_/<\SWK,#@o"+st'I8W,VGe'r?)eFsnY3Ag;r-RLc+8DB'TE]ZOH%ZM8WCQuUJ.TU]%khKW@(bJc08%_]02P:QKMc)C0-U$R@3qFD8E`*rrKOE35G~> endstream endobj 8 0 obj @@ -87,19 +87,19 @@ endobj xref 0 14 0000000000 65535 f -0000003247 00000 n -0000003311 00000 n -0000003361 00000 n +0000003216 00000 n +0000003280 00000 n +0000003330 00000 n 0000000015 00000 n 0000000071 00000 n 0000001219 00000 n 0000001325 00000 n -0000002584 00000 n -0000002690 00000 n -0000002802 00000 n -0000002912 00000 n -0000003023 00000 n -0000003131 00000 n +0000002553 00000 n +0000002659 00000 n +0000002771 00000 n +0000002881 00000 n +0000002992 00000 n +0000003100 00000 n trailer << /Size 14 @@ -107,5 +107,5 @@ trailer /Info 4 0 R >> startxref -3483 +3452 %%EOF diff --git a/docs/lucene-contrib/index.html b/docs/lucene-contrib/index.html index 090f27ae352..7da3976dc8d 100644 --- a/docs/lucene-contrib/index.html +++ b/docs/lucene-contrib/index.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Remote
-Snowball -
-
Spatial
@@ -312,9 +309,6 @@ document.write("Last Published: " + document.lastModified); remote
  • -snowball -
    • -
  • spatial
  • @@ -458,42 +452,37 @@ document.write("Last Published: " + document.lastModified);

    Classes to help use Lucene with RMI.

    See remote javadoc

    - -

    snowball

    -

    Pre-compiled versions of the Snowball stemmers for Lucene.

    -

    See snowball javadoc -

    - +

    spatial

    Classes to help with efficient distance based sorting.

    See spatial javadoc

    - +

    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.

    See swing javadoc

    - +

    wikipedia

    Tools for working with wikipedia content.

    See wikipedia 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/docs/lucene-contrib/index.pdf b/docs/lucene-contrib/index.pdf index ed418836e05..e087422f5ab 100644 --- a/docs/lucene-contrib/index.pdf +++ b/docs/lucene-contrib/index.pdf @@ -5,10 +5,10 @@ /Producer (FOP 0.20.5) >> endobj 5 0 obj -<< /Length 1067 /Filter [ /ASCII85Decode /FlateDecode ] +<< /Length 1038 /Filter [ /ASCII85Decode /FlateDecode ] >> stream -Gb!$G_/e6`&;KX9KoX7UBi@,lnUlX^Ya@=b!tQPHh*BE5JtPsiMVekL6Jm<4G__Mk38VE>tB&&Y$1Lj1[%T!:#5Ii$"oV'E@+A7P1)+&qr9Y>>XdCh*8M:86ZrU@7KQt3DB660?0*3UVimTY7Nk^g]rSa?9\VOGQ;9W9CehIOk1Q"uO`\[!.GJ_@@LU2d`*I$H&`pjF:At*Y;T7,.W`Q`#`!!ZS_3oJ?oN8g0FJ&Ks*R:n%pgjtqV@_J@1l/kJ*Rs_mui3-#3lN8ib5pp1fQpZFX/93PApf1KVdoVelQ(E<\[hBb0nZZUqmU0N`/;hc[rQVG19*H9Nbp62k`6F;$oK9#jG>$M$!Xg>o^N-E$0ZO8=$2?WS0]q#_f![2UP*JjB/_Qq5Rk`L5Xur/TplrOAM7YCfT00MPjkt[qRB1@m;onFo@su!UPRl2e&rRMG%-aS-"s\eDmqFJL,s.MUG:98XGWTqfT$haS=nj8gaMXDeq#/ioLta,/^gk3.qY2H6=!WI79UCSWDC)g*Z<0I'!YjmAs#qW]h;dhp.YB[e6jYdL^dQD98sSLSLTM5UU"N^.V;_)&AJ;abQcM"@4u5D;*qtJ]%WKWI9>Yr:WUtD$uQ[afWZ*sa=*`GjQ5+q]"Zmhh9[/.A?TCXmDS-g&map(,ET`4U6:nuKAhKmD)&F^D!K,uR0aB&R,Cd3ac!9$gS-E80ob-[B^<%0iCK[X=\ZV**__PtFO,Zg7)Yce-#P=]SOJ^ci,j)cI]R]_D2JIEmJ;U"]Pe+rU:rM*p$h;DppY"g*)_d1Gr!eRqd +Gb!$G9lldX&;KZQ'fnA\X-,_q*1KWCkk*<&Df$!fb;L"BNkfYi?f.-I@I6fU\Pso>EFa6h4KNf#9)$N^LW=q$O>=+Hc^=OLB8gY=S1s`s,W4IJ+eq>fOQDLMT7>X/q,Z=6KnpDP2udp>RNX&^$4GN:,SIYNtp_Z,RB0q=1Kj[%B*\'1F9gP%Jnk4O&q4,<6'eM_i*P&PTt+(rH4-ohasY!7rA`Ds9>a3auT2e5]l>P.r&k$L\n@'5U8`@/1()ok1B.c9YLrToa)9Q$01!uPPpl@Hie?kgBHp_$q@VU/52\V"VaL^eZ"jYSoRh\M\u$,?k*>QZ=o[E`NQVF?+d2MXnBO=^FaCqh-nQcgr%.\YUI6,%lZ;N0,;]^Rn9D`aYYr60<1lQoe*ONXZVMDa?*qk_AjgU'!ZPA)98)!]I[rrg3/bLju@TE([rhA.`U-iH"+il_G9K5IC]Gh!kKDg'g!"[ZUADAgl5HGPcu[,r$G#Fe6j7)F9H%g:/ceA*5mesq_:a'&mc&?TD"[jHnJL/c5gok6k%h=6,r]0'=5V*6*#uk]7iQjlEI%D>c<@E'a+-=*Ac2)6,WTT.du$@JL8mWdUm!I1i1s)=_l#rs/5DaJugl,BNPgJbs=lrqR5Pof(9ppY/*Pc&0ObA]51(0$RRY02aU%2qjH7S-<$t]TUfXMa(a=*`B(=gG)]Y7RLj>8^g8L.a)B$G#Y:GSP,,>4pd=sUmn_[(R"p=L+%#Ol,oDPpee0&7?QU&5X4Q_ne**8k,E8o;eeLVfAN;U6fF;RGGjMVK70iJB-O,+m~> endstream endobj 6 0 obj @@ -44,7 +44,6 @@ endobj 46 0 R 48 0 R 50 0 R -52 0 R ] endobj 8 0 obj @@ -200,7 +199,7 @@ endobj 38 0 obj << /Type /Annot /Subtype /Link -/Rect [ 108.0 286.666 171.832 274.666 ] +/Rect [ 108.0 286.666 159.832 274.666 ] /C [ 0 0 0 ] /Border [ 0 0 0 ] /A 39 0 R @@ -210,7 +209,7 @@ endobj 40 0 obj << /Type /Annot /Subtype /Link -/Rect [ 108.0 268.466 159.832 256.466 ] +/Rect [ 108.0 268.466 188.476 256.466 ] /C [ 0 0 0 ] /Border [ 0 0 0 ] /A 41 0 R @@ -220,7 +219,7 @@ endobj 42 0 obj << /Type /Annot /Subtype /Link -/Rect [ 108.0 250.266 188.476 238.266 ] +/Rect [ 108.0 250.266 171.16 238.266 ] /C [ 0 0 0 ] /Border [ 0 0 0 ] /A 43 0 R @@ -230,7 +229,7 @@ endobj 44 0 obj << /Type /Annot /Subtype /Link -/Rect [ 108.0 232.066 171.16 220.066 ] +/Rect [ 108.0 232.066 157.168 220.066 ] /C [ 0 0 0 ] /Border [ 0 0 0 ] /A 45 0 R @@ -240,7 +239,7 @@ endobj 46 0 obj << /Type /Annot /Subtype /Link -/Rect [ 108.0 213.866 157.168 201.866 ] +/Rect [ 108.0 213.866 175.828 201.866 ] /C [ 0 0 0 ] /Border [ 0 0 0 ] /A 47 0 R @@ -250,7 +249,7 @@ endobj 48 0 obj << /Type /Annot /Subtype /Link -/Rect [ 108.0 195.666 175.828 183.666 ] +/Rect [ 108.0 195.666 167.824 183.666 ] /C [ 0 0 0 ] /Border [ 0 0 0 ] /A 49 0 R @@ -260,7 +259,7 @@ endobj 50 0 obj << /Type /Annot /Subtype /Link -/Rect [ 108.0 177.466 167.824 165.466 ] +/Rect [ 108.0 177.466 211.804 165.466 ] /C [ 0 0 0 ] /Border [ 0 0 0 ] /A 51 0 R @@ -268,22 +267,27 @@ endobj >> endobj 52 0 obj -<< /Type /Annot -/Subtype /Link -/Rect [ 108.0 159.266 211.804 147.266 ] -/C [ 0 0 0 ] -/Border [ 0 0 0 ] -/A 53 0 R -/H /I ->> -endobj -54 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 +53 0 obj +<< /Type /Page +/Parent 1 0 R +/MediaBox [ 0 0 612 792 ] +/Resources 3 0 R +/Contents 52 0 R +>> +endobj +54 0 obj +<< /Length 1328 /Filter [ /ASCII85Decode /FlateDecode ] + >> +stream +Gb!#[gN)%,&:N/3nBmi,&6oP2d<=eK3pfV0-r3PZ+;0jan5^*`l[F8uRgD&bD5F"qN^aW^E3X'MS6^`US(3RheXn?+mG7Nm.Y.RhE?)Stb1c/=,6DhE,,:n"lIXSRMZt"!m+qX&Sj`psL!=K=4!WrQ.-_6Z"u2q$VMK]5qP;WK1[fLtg8Znk'[hB"VZ)Z)R8rKooR!t@WCHu?8-C28qbIf=ru"Ku'UaBV]_M#&1uK\tL_2S?!&>00k7Jn$ndm[uJ0WjE7Y$'sA%)'hKh6:p39?nsM?.!R;s4W65T&dWI5'2CB<%@>lI)]GO]GQF2#3g3@2drOo/0U1e&:!F0VAh:0`_:n4U#B';-f1c(.1?a`4VZHjpWq:7NRr;_a3`%\bfQA(("E0!h@VY$"6rC+n]/[-C9^te"GDhf4ck,`oh/>R2Mg3geY81[-8a$EKLq9n%NFK;NGdlRU^6)H'0nN[Xs&]f'm6Op*3S-Hb[Zc(h*(gOQA+5K$[)t]he#6oRnHdhgFRt+4;X$WSp$u3)rE*7'I5;[3l&U2nX=Q/AZ<>44bf33/mhhg7C6`P%kDs%d`p6lu^#s71(_HHIuIin)Zu@2uKSs+eYOqn(2'i60[JEi@BcPkh\*S[Hr"TsF^Es77X!XT_S$Qj;9=`7lH!Wk.Mf2@N+V;14Irr0S[oaNlsf0Q$LrnhJ>ebu6R_/"hK=K,pp0kTiA5"mVsKlM9e-=DHhc!ESo8$m8N/mM$]6Jcbe/\qP>/!WmVe+]Z%9sXZ^'i83SN6IJ%9Kgl51*=cOVT*CkT`Z(sJR?Pe/Pdl2CK.k9`~> +endstream +endobj 55 0 obj << /Type /Page /Parent 1 0 R @@ -293,10 +297,10 @@ endobj >> endobj 56 0 obj -<< /Length 1328 /Filter [ /ASCII85Decode /FlateDecode ] +<< /Length 1312 /Filter [ /ASCII85Decode /FlateDecode ] >> stream -Gb!#[gN)%,&:N/3nBmi,&6oP2d<=eK3pfV0-r3PZ+;0jan5^*`l[F8uRgD&bD5F"qN^aW^E3X'MS6^`US(3RheXn?+mG7Nm.Y.RhE?)Stb1c/=,6DhE,,:n"lIXSRMZt"!m+qX&Sj`psL!=K=4!WrQ.-_6Z"u2q$VMK]5qP;WK1[fLtg8Znk'[hB"VZ)Z)R8rKooR!t@WCHu?8-C28qbIf=ru"Ku'UaBV]_M#&1uK\tL_2S?!&>00k7Jn$ndm[uJ0WjE7Y$'sA%)'hKh6:p39?nsM?.!R;s4W65T&dWI5'2CB<%@>lI)]GO]GQF2#3g3@2drOo/0U1e&:!F0VAh:0`_:n4U#B';-f1c(.1?a`4VZHjpWq:7NRr;_a3`%\bfQA(("E0!h@VY$"6rC+n]/[-C9^te"GDhf4ck,`oh/>R2Mg3geY81[-8a$EKLq9n%NFK;NGdlRU^6)H'0nN[Xs&]f'm6Op*3S-Hb[Zc(h*(gOQA+5K$[)t]he#6oRnHdhgFRt+4;X$WSp$u3)rE*7'I5;[3l&U2nX=Q/AZ<>44bf33/mhhg7C6`P%kDs%d`p6lu^#s71(_HHIuIin)Zu@2uKSs+eYOqn(2'i60[JEi@BcPkh\*S[Hr"TsF^Es77X!XT_S$Qj;9=`7lH!Wk.Mf2@N+V;14Irr0S[oaNlsf0Q$LrnhJ>ebu6R_/"hK=K,pp0kTiA5"mVsKlM9e-=DHhc!ESo8$m8N/mM$]6Jcbe/\qP>/!WmVe+]Z%9sXZ^'i83SN6IJ%9Kgl51*=cOVT*CkT`Z(sJR?Pe/Pdl2CK.k9`~> +Gau1.997gc&BF8='Kd^-Qf1l;Nle#b[V14di`k.>/^ZI\=`Pp)+8tgPad,K/Eaf,.$pQ.s1W0%e3?3NN/q.%X^+Lhf_#*.9,FG,L8`3OgrqDuE*6XQjB@(D`C%:/o'*Q2sGl$6K7$PNIja'4I8H`?6*@=C5'-beDLOOaEPML'Dp;X4M\'n>phP*(iR!dB8C/^S5U<^BAWEOd]Vem0-bcZ,mIVc(%]\p9_:UL&]`%S#jN./MYF5FoDqFQ=sUQK!L"KP3.Nr!Z[C&]bVV@[beFT1FcO6Dr^8oZU5M[E-'O4':;aq*`o6REL?apoRn$q>iAD%f>T_3#T8'^Gb1'_W0<]5,RNFjMH.`o4eR/1&)>F!+?"7.7UooTj;nFn>\6$,YCq&epgpX0]EdBmO4Pf%*iB`d:qAAM^A6.3qYYA$MI,0XoMoA.iOHmH&)G<._Ak;A0GfoX.2o+&JID'hS:qXqd5C";\4n;c-QWq)lS=*^:VhS&?#g$afN<[J;_^'lCZB!F8N#:h!bI^rsBjUBgDER5kib755aJ(9#p4>]jmsIgo!\U_X(oGjqK&.s37eQZ$_Vo!SoJCMWt)<-hQ!+a6Xbn*E8+Jn>`K')3H!Nt`RjiH@O'JjB%Jog0E6-B_mP1(T')bf7;cQ*=X)1I3ZR[UP"[@3q`4CdUo[gGY.`/dg@r>aPHs.T0hW$$3f3.pKkY1LG%08oZUU&A^E4rVpBe$#Fs\Zcb(CR6lbk'.+<"g=<;cbDD,cVb17)>hQ:];K[OrrG'MP%laFI'mLVhG3p^A:2VO2FM/Kg?uSFPr\5VWAI?JF7)9jqJ"2XVYg\hV#mhUJ]^/N:k5629[]NVIq8Is(7IEi9DGl;RE^PLPX1+c.9mO3&7D6*c78Q[7IOCDU6$kRia_eMOBZrF#-N"ChNse<;>cceZ@,AW>(~> endstream endobj 57 0 obj @@ -308,10 +312,10 @@ endobj >> endobj 58 0 obj -<< /Length 1316 /Filter [ /ASCII85Decode /FlateDecode ] +<< /Length 952 /Filter [ /ASCII85Decode /FlateDecode ] >> stream -Gau1.997gc&BF8='Kd^-c1!/Za(3Rl>I6YYorZJiQ=ubi*f_<=kbl`tZ:*-G',ub4=PK(YRGn)C*0/mX(;I!f?PX>miW&j#+deoNMVqFSrqB<2Nb(m]D:!V!EUiIP'*Q4iHhu"#7$PNIeRh+%8Hf#@)CJ.3,9kL75_$QFc#.aK]rO%Z?8)5D+eeXMQ2,F@pD,'>-W7loUQorusWOg)ThUpU?^\D3b]ZU;T]C`?aoudSG2l?;@e7IcfC3QQKmcCRM9AOpdrp3N]HK-j69lio,&epg/X0]c/2ncG;CTFa$j1VRp]K)r<.3sp$A"f=q0XoMoA.g8MmH&)G<._AcVq\rAC-T*R(_1N\bjEZ*n\f9rZaT+*,u?VBX(@3UP?+`gH#[Fq#3ZP"%4@4(1Aa&_Dc.'/)DS?8uo-eis1dog;[SEp*BTE8*tPq^a8]s]pp1oJM+=##`4#Qe*u[XUIf*l5:/3P-7EQSF^q5%>3+VP7hM=\`3I3*,jC\^Ys`'hZ?8/NVI8E-7s]QOZ?f^?4?lJp`A-L[?;$)C*%1Z'#(c927,%$IreQ^k+3_"PWU`'S>eJ71"`DjT\m5*SW4Wm[V6@EbV*c'V<*aZ\?!c\[d,&5+J:H0dT?1\MBVYu?g_N0/j0\C6?laTPk~> +Gatn%9iKe#&;KZL'fqXJKYD:FJLSfbkR<[q3n*dF&iig//>G1Xo[d/flpq2UO:IIGijC?)qL*Op3hM?p:I^Bi%-Hu)29HIu5R?=t)/l[uPS-M@!EOdKdI$/qbmB=o(-I"kaT3`+@$6RI3siG.#.o_^5_0c>/A[BCB.%(\g,2(MY*Ii"8@qdNhlIX"p=Fad3eF:^gJ[^n"B^qcR^ciOZecPFS%T[nKEq_)+ds"jK9L\G>;99*)8RR:14_-7[N^#`$eK-7NlEd4&RAFaAW3ra.5ga&&#l[=]VD!AXEc[[F4YE"kqKRjAW+iQ$"5C7b8#d?*C0+<.hhC:LU\m,iTPop$o7Gbol`6]cS%*@*5(EP0lZH1h90$7SPdq:P`uU:kXk5>udn9a?-dkXV'#t9ADR2F*jE,So8.q:9K)"[?DN3P"i50=jjR(G4\nD)D,]3;++R89epu.FT2d;QY@[np2NtE9FMeN:[@CrNtDFBP4]d=+RIn^F(mk?F[c#SR<<~> endstream endobj 59 0 obj @@ -322,233 +326,210 @@ endobj /Contents 58 0 R >> endobj -60 0 obj -<< /Length 1045 /Filter [ /ASCII85Decode /FlateDecode ] - >> -stream -Gau1-9lo#B&;KZO$6>TU.H@*gLd":E)_A-K]]\T.>Zbk1`?N(NoF2mp':aIHHNN-1t`bNV>hmnHr^RYA7XkkUB_707n>[RHd\f1[lDY5!0.3@`\E(DRCPVXeU]$W!>2de,?%FPn;11$rPCL1Q7fQNq*SY=+KTqA'tO@+jOIHM0!jhL_QRW=RqtKcK$Kh-9c^0+Qg3*q)8$F[*`c8UYIn2Wa;Vb%]QJ0X(1RU8F5)'Pu/$iQ!*O,D<'r:h@#EWb=XG7Q7$8*S_ts,;QnOgNB_QgXN;J<"oXG0YnVc:o9$`GWMN"eK$AM>F`[HUqn]pC[%lJWJ?!<4d(/]U5\-H-e_gEA*HFF3QJHu.#7PncWXmtY7BZ>EKU^'@+-48!i>ot@\V==.=4-^?l"Nm5C&rO0A68,BID/-C6^[sd5LQ/MgD7Nlacom0B;,%bMC5(g%9FUdOU0b&C,p2.bALSPS(TNJLdF]/W=HgERXV!#4g:)63Dj?7+>W0Jj5KFh1Fjj3#[(b.SXZaE(4bH&1hr#g'!r~> -endstream -endobj 61 0 obj -<< /Type /Page -/Parent 1 0 R -/MediaBox [ 0 0 612 792 ] -/Resources 3 0 R -/Contents 60 0 R ->> -endobj -63 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 62 0 R - /First 64 0 R - /Last 85 0 R - /Count -22 + /Parent 60 0 R + /First 62 0 R + /Last 82 0 R + /Count -21 /A 9 0 R >> endobj +62 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 61 0 R + /Next 63 0 R + /A 11 0 R +>> endobj +63 0 obj +<< + /Title (\376\377\0\61\0\56\0\62\0\40\0\141\0\156\0\164) + /Parent 61 0 R + /Prev 62 0 R + /Next 64 0 R + /A 13 0 R +>> endobj 64 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 63 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 61 0 R + /Prev 63 0 R /Next 65 0 R - /A 11 0 R + /A 15 0 R >> endobj 65 0 obj << - /Title (\376\377\0\61\0\56\0\62\0\40\0\141\0\156\0\164) - /Parent 63 0 R + /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142) + /Parent 61 0 R /Prev 64 0 R /Next 66 0 R - /A 13 0 R + /A 17 0 R >> endobj 66 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 63 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 61 0 R /Prev 65 0 R /Next 67 0 R - /A 15 0 R + /A 19 0 R >> endobj 67 0 obj << - /Title (\376\377\0\61\0\56\0\64\0\40\0\144\0\142) - /Parent 63 0 R + /Title (\376\377\0\61\0\56\0\66\0\40\0\146\0\141\0\163\0\164\0\55\0\166\0\145\0\143\0\164\0\157\0\162\0\55\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162) + /Parent 61 0 R /Prev 66 0 R /Next 68 0 R - /A 17 0 R + /A 21 0 R >> endobj 68 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 63 0 R + /Title (\376\377\0\61\0\56\0\67\0\40\0\151\0\143\0\165) + /Parent 61 0 R /Prev 67 0 R /Next 69 0 R - /A 19 0 R + /A 23 0 R >> endobj 69 0 obj << - /Title (\376\377\0\61\0\56\0\66\0\40\0\146\0\141\0\163\0\164\0\55\0\166\0\145\0\143\0\164\0\157\0\162\0\55\0\150\0\151\0\147\0\150\0\154\0\151\0\147\0\150\0\164\0\145\0\162) - /Parent 63 0 R + /Title (\376\377\0\61\0\56\0\70\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 61 0 R /Prev 68 0 R /Next 70 0 R - /A 21 0 R + /A 25 0 R >> endobj 70 0 obj << - /Title (\376\377\0\61\0\56\0\67\0\40\0\151\0\143\0\165) - /Parent 63 0 R + /Title (\376\377\0\61\0\56\0\71\0\40\0\154\0\165\0\143\0\154\0\151) + /Parent 61 0 R /Prev 69 0 R /Next 71 0 R - /A 23 0 R + /A 27 0 R >> endobj 71 0 obj << - /Title (\376\377\0\61\0\56\0\70\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 63 0 R + /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\155\0\145\0\155\0\157\0\162\0\171) + /Parent 61 0 R /Prev 70 0 R /Next 72 0 R - /A 25 0 R + /A 29 0 R >> endobj 72 0 obj << - /Title (\376\377\0\61\0\56\0\71\0\40\0\154\0\165\0\143\0\154\0\151) - /Parent 63 0 R + /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\155\0\151\0\163\0\143) + /Parent 61 0 R /Prev 71 0 R /Next 73 0 R - /A 27 0 R + /A 31 0 R >> endobj 73 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\60\0\40\0\155\0\145\0\155\0\157\0\162\0\171) - /Parent 63 0 R + /Title (\376\377\0\61\0\56\0\61\0\62\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 61 0 R /Prev 72 0 R /Next 74 0 R - /A 29 0 R + /A 33 0 R >> endobj 74 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\61\0\40\0\155\0\151\0\163\0\143) - /Parent 63 0 R + /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\162\0\145\0\147\0\145\0\170) + /Parent 61 0 R /Prev 73 0 R /Next 75 0 R - /A 31 0 R + /A 35 0 R >> endobj 75 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\62\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 63 0 R + /Title (\376\377\0\61\0\56\0\61\0\64\0\40\0\162\0\145\0\155\0\157\0\164\0\145) + /Parent 61 0 R /Prev 74 0 R /Next 76 0 R - /A 33 0 R + /A 37 0 R >> endobj 76 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\63\0\40\0\162\0\145\0\147\0\145\0\170) - /Parent 63 0 R + /Title (\376\377\0\61\0\56\0\61\0\65\0\40\0\163\0\160\0\141\0\164\0\151\0\141\0\154) + /Parent 61 0 R /Prev 75 0 R /Next 77 0 R - /A 35 0 R + /A 39 0 R >> endobj 77 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\64\0\40\0\162\0\145\0\155\0\157\0\164\0\145) - /Parent 63 0 R + /Title (\376\377\0\61\0\56\0\61\0\66\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 61 0 R /Prev 76 0 R /Next 78 0 R - /A 37 0 R + /A 41 0 R >> endobj 78 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\65\0\40\0\163\0\156\0\157\0\167\0\142\0\141\0\154\0\154) - /Parent 63 0 R + /Title (\376\377\0\61\0\56\0\61\0\67\0\40\0\163\0\165\0\162\0\162\0\157\0\165\0\156\0\144) + /Parent 61 0 R /Prev 77 0 R /Next 79 0 R - /A 39 0 R + /A 43 0 R >> endobj 79 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\66\0\40\0\163\0\160\0\141\0\164\0\151\0\141\0\154) - /Parent 63 0 R + /Title (\376\377\0\61\0\56\0\61\0\70\0\40\0\163\0\167\0\151\0\156\0\147) + /Parent 61 0 R /Prev 78 0 R /Next 80 0 R - /A 41 0 R + /A 45 0 R >> endobj 80 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\67\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 63 0 R + /Title (\376\377\0\61\0\56\0\61\0\71\0\40\0\167\0\151\0\153\0\151\0\160\0\145\0\144\0\151\0\141) + /Parent 61 0 R /Prev 79 0 R /Next 81 0 R - /A 43 0 R + /A 47 0 R >> endobj 81 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\70\0\40\0\163\0\165\0\162\0\162\0\157\0\165\0\156\0\144) - /Parent 63 0 R + /Title (\376\377\0\61\0\56\0\62\0\60\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164) + /Parent 61 0 R /Prev 80 0 R /Next 82 0 R - /A 45 0 R + /A 49 0 R >> endobj 82 0 obj << - /Title (\376\377\0\61\0\56\0\61\0\71\0\40\0\163\0\167\0\151\0\156\0\147) - /Parent 63 0 R + /Title (\376\377\0\61\0\56\0\62\0\61\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 61 0 R /Prev 81 0 R - /Next 83 0 R - /A 47 0 R ->> endobj -83 0 obj -<< - /Title (\376\377\0\61\0\56\0\62\0\60\0\40\0\167\0\151\0\153\0\151\0\160\0\145\0\144\0\151\0\141) - /Parent 63 0 R - /Prev 82 0 R - /Next 84 0 R - /A 49 0 R ->> endobj -84 0 obj -<< - /Title (\376\377\0\61\0\56\0\62\0\61\0\40\0\167\0\157\0\162\0\144\0\156\0\145\0\164) - /Parent 63 0 R - /Prev 83 0 R - /Next 85 0 R /A 51 0 R >> endobj -85 0 obj -<< - /Title (\376\377\0\61\0\56\0\62\0\62\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 63 0 R - /Prev 84 0 R - /A 53 0 R ->> endobj -86 0 obj +83 0 obj << /Type /Font /Subtype /Type1 /Name /F3 /BaseFont /Helvetica-Bold /Encoding /WinAnsiEncoding >> endobj -87 0 obj +84 0 obj << /Type /Font /Subtype /Type1 /Name /F5 /BaseFont /Times-Roman /Encoding /WinAnsiEncoding >> endobj -88 0 obj +85 0 obj << /Type /Font /Subtype /Type1 /Name /F1 /BaseFont /Helvetica /Encoding /WinAnsiEncoding >> endobj -89 0 obj +86 0 obj << /Type /Font /Subtype /Type1 /Name /F2 /BaseFont /Helvetica-Oblique /Encoding /WinAnsiEncoding >> endobj -90 0 obj +87 0 obj << /Type /Font /Subtype /Type1 /Name /F7 @@ -558,262 +539,253 @@ endobj 1 0 obj << /Type /Pages /Count 5 -/Kids [6 0 R 55 0 R 57 0 R 59 0 R 61 0 R ] >> +/Kids [6 0 R 53 0 R 55 0 R 57 0 R 59 0 R ] >> endobj 2 0 obj << /Type /Catalog /Pages 1 0 R - /Outlines 62 0 R + /Outlines 60 0 R /PageMode /UseOutlines >> endobj 3 0 obj << -/Font << /F3 86 0 R /F5 87 0 R /F1 88 0 R /F2 89 0 R /F7 90 0 R >> +/Font << /F3 83 0 R /F5 84 0 R /F1 85 0 R /F2 86 0 R /F7 87 0 R >> /ProcSet [ /PDF /ImageC /Text ] >> endobj 9 0 obj << /S /GoTo -/D [55 0 R /XYZ 85.0 659.0 null] +/D [53 0 R /XYZ 85.0 659.0 null] >> endobj 11 0 obj << /S /GoTo -/D [55 0 R /XYZ 85.0 339.066 null] +/D [53 0 R /XYZ 85.0 339.066 null] >> endobj 13 0 obj << /S /GoTo -/D [55 0 R /XYZ 85.0 266.613 null] +/D [53 0 R /XYZ 85.0 266.613 null] >> endobj 15 0 obj << /S /GoTo -/D [55 0 R /XYZ 85.0 194.16 null] +/D [53 0 R /XYZ 85.0 194.16 null] >> endobj 17 0 obj << /S /GoTo -/D [57 0 R /XYZ 85.0 637.8 null] +/D [55 0 R /XYZ 85.0 637.8 null] >> endobj 19 0 obj << /S /GoTo -/D [57 0 R /XYZ 85.0 565.347 null] +/D [55 0 R /XYZ 85.0 565.347 null] >> endobj 21 0 obj << /S /GoTo -/D [57 0 R /XYZ 85.0 492.894 null] +/D [55 0 R /XYZ 85.0 492.894 null] >> endobj 23 0 obj << /S /GoTo -/D [57 0 R /XYZ 85.0 394.041 null] +/D [55 0 R /XYZ 85.0 394.041 null] >> endobj 25 0 obj << /S /GoTo -/D [57 0 R /XYZ 85.0 308.388 null] +/D [55 0 R /XYZ 85.0 308.388 null] >> endobj 27 0 obj << /S /GoTo -/D [57 0 R /XYZ 85.0 222.735 null] +/D [55 0 R /XYZ 85.0 222.735 null] >> endobj 29 0 obj << /S /GoTo -/D [57 0 R /XYZ 85.0 150.282 null] +/D [55 0 R /XYZ 85.0 150.282 null] >> endobj 31 0 obj << /S /GoTo -/D [59 0 R /XYZ 85.0 616.6 null] +/D [57 0 R /XYZ 85.0 616.6 null] >> endobj 33 0 obj << /S /GoTo -/D [59 0 R /XYZ 85.0 530.947 null] +/D [57 0 R /XYZ 85.0 530.947 null] >> endobj 35 0 obj << /S /GoTo -/D [59 0 R /XYZ 85.0 445.294 null] +/D [57 0 R /XYZ 85.0 445.294 null] >> endobj 37 0 obj << /S /GoTo -/D [59 0 R /XYZ 85.0 372.841 null] +/D [57 0 R /XYZ 85.0 372.841 null] >> endobj 39 0 obj << /S /GoTo -/D [59 0 R /XYZ 85.0 300.388 null] +/D [57 0 R /XYZ 85.0 300.388 null] >> endobj 41 0 obj << /S /GoTo -/D [59 0 R /XYZ 85.0 227.935 null] +/D [57 0 R /XYZ 85.0 227.935 null] >> endobj 43 0 obj << /S /GoTo -/D [59 0 R /XYZ 85.0 155.482 null] +/D [57 0 R /XYZ 85.0 155.482 null] >> endobj 45 0 obj << /S /GoTo -/D [61 0 R /XYZ 85.0 616.6 null] +/D [59 0 R /XYZ 85.0 616.6 null] >> endobj 47 0 obj << /S /GoTo -/D [61 0 R /XYZ 85.0 544.147 null] +/D [59 0 R /XYZ 85.0 544.147 null] >> endobj 49 0 obj << /S /GoTo -/D [61 0 R /XYZ 85.0 471.694 null] +/D [59 0 R /XYZ 85.0 471.694 null] >> endobj 51 0 obj << /S /GoTo -/D [61 0 R /XYZ 85.0 399.241 null] +/D [59 0 R /XYZ 85.0 399.241 null] >> endobj -53 0 obj +60 0 obj << -/S /GoTo -/D [61 0 R /XYZ 85.0 326.788 null] ->> -endobj -62 0 obj -<< - /First 63 0 R - /Last 63 0 R + /First 61 0 R + /Last 61 0 R >> endobj xref -0 91 +0 88 0000000000 65535 f -0000015450 00000 n -0000015536 00000 n -0000015628 00000 n +0000015010 00000 n +0000015096 00000 n +0000015188 00000 n 0000000015 00000 n 0000000071 00000 n -0000001230 00000 n -0000001350 00000 n -0000001529 00000 n -0000015751 00000 n -0000001664 00000 n -0000015814 00000 n -0000001801 00000 n -0000015880 00000 n -0000001938 00000 n -0000015946 00000 n -0000002075 00000 n -0000016011 00000 n -0000002210 00000 n -0000016075 00000 n -0000002347 00000 n -0000016141 00000 n -0000002484 00000 n -0000016207 00000 n -0000002621 00000 n -0000016273 00000 n -0000002758 00000 n -0000016339 00000 n -0000002895 00000 n -0000016405 00000 n -0000003032 00000 n -0000016471 00000 n -0000003169 00000 n -0000016535 00000 n -0000003305 00000 n -0000016601 00000 n -0000003442 00000 n -0000016667 00000 n -0000003579 00000 n -0000016733 00000 n -0000003716 00000 n -0000016799 00000 n -0000003853 00000 n -0000016865 00000 n -0000003990 00000 n -0000016931 00000 n -0000004126 00000 n -0000016995 00000 n -0000004263 00000 n -0000017061 00000 n -0000004400 00000 n -0000017127 00000 n -0000004537 00000 n -0000017193 00000 n -0000004674 00000 n -0000006622 00000 n -0000006730 00000 n -0000008151 00000 n -0000008259 00000 n -0000009668 00000 n -0000009776 00000 n -0000010914 00000 n -0000017259 00000 n -0000011022 00000 n -0000011223 00000 n -0000011379 00000 n -0000011513 00000 n -0000011683 00000 n -0000011811 00000 n -0000011993 00000 n -0000012245 00000 n -0000012379 00000 n -0000012567 00000 n -0000012713 00000 n -0000012870 00000 n -0000013015 00000 n -0000013202 00000 n -0000013353 00000 n -0000013510 00000 n -0000013679 00000 n -0000013842 00000 n -0000014035 00000 n -0000014204 00000 n -0000014355 00000 n -0000014530 00000 n -0000014693 00000 n -0000014894 00000 n -0000015007 00000 n -0000015117 00000 n -0000015225 00000 n -0000015341 00000 n +0000001201 00000 n +0000001321 00000 n +0000001493 00000 n +0000015311 00000 n +0000001628 00000 n +0000015374 00000 n +0000001765 00000 n +0000015440 00000 n +0000001902 00000 n +0000015506 00000 n +0000002039 00000 n +0000015571 00000 n +0000002174 00000 n +0000015635 00000 n +0000002311 00000 n +0000015701 00000 n +0000002448 00000 n +0000015767 00000 n +0000002585 00000 n +0000015833 00000 n +0000002722 00000 n +0000015899 00000 n +0000002859 00000 n +0000015965 00000 n +0000002996 00000 n +0000016031 00000 n +0000003133 00000 n +0000016095 00000 n +0000003269 00000 n +0000016161 00000 n +0000003406 00000 n +0000016227 00000 n +0000003543 00000 n +0000016293 00000 n +0000003680 00000 n +0000016359 00000 n +0000003817 00000 n +0000016425 00000 n +0000003953 00000 n +0000016491 00000 n +0000004090 00000 n +0000016555 00000 n +0000004227 00000 n +0000016621 00000 n +0000004364 00000 n +0000016687 00000 n +0000004501 00000 n +0000006449 00000 n +0000006557 00000 n +0000007978 00000 n +0000008086 00000 n +0000009491 00000 n +0000009599 00000 n +0000010643 00000 n +0000016753 00000 n +0000010751 00000 n +0000010952 00000 n +0000011108 00000 n +0000011242 00000 n +0000011412 00000 n +0000011540 00000 n +0000011722 00000 n +0000011974 00000 n +0000012108 00000 n +0000012296 00000 n +0000012442 00000 n +0000012599 00000 n +0000012744 00000 n +0000012931 00000 n +0000013082 00000 n +0000013239 00000 n +0000013402 00000 n +0000013595 00000 n +0000013764 00000 n +0000013915 00000 n +0000014090 00000 n +0000014253 00000 n +0000014454 00000 n +0000014567 00000 n +0000014677 00000 n +0000014785 00000 n +0000014901 00000 n trailer << -/Size 91 +/Size 88 /Root 2 0 R /Info 4 0 R >> startxref -17310 +16804 %%EOF diff --git a/docs/queryparsersyntax.html b/docs/queryparsersyntax.html index a94efe1335c..6228c84a827 100644 --- a/docs/queryparsersyntax.html +++ b/docs/queryparsersyntax.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Remote

    • -Snowball -
    -
    Spatial
    diff --git a/docs/scoring.html b/docs/scoring.html index 34ffe42236f..0079c0775c9 100644 --- a/docs/scoring.html +++ b/docs/scoring.html @@ -186,9 +186,6 @@ document.write("Last Published: " + document.lastModified); Remote
    -Snowball -
    -
    Spatial
    diff --git a/docs/systemrequirements.html b/docs/systemrequirements.html index c456851d6fb..aea1ecedf79 100644 --- a/docs/systemrequirements.html +++ b/docs/systemrequirements.html @@ -184,9 +184,6 @@ document.write("Last Published: " + document.lastModified); Remote
    -Snowball -
    -
    Spatial
    diff --git a/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml b/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml index 95334872b19..f1f9c90daa8 100644 --- a/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml +++ b/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml @@ -120,12 +120,7 @@
    remote

    Classes to help use Lucene with RMI.

    See remote javadoc

    -
    - -
    snowball -

    Pre-compiled versions of the Snowball stemmers for Lucene.

    -

    See snowball javadoc

    -
    +
    spatial

    Classes to help with efficient distance based sorting.

    diff --git a/src/site/src/documentation/content/xdocs/site.xml b/src/site/src/documentation/content/xdocs/site.xml index ebc7cd83921..f65e960854c 100755 --- a/src/site/src/documentation/content/xdocs/site.xml +++ b/src/site/src/documentation/content/xdocs/site.xml @@ -72,7 +72,6 @@ See http://forrest.apache.org/docs/linking.html for more info --> - @@ -125,7 +124,6 @@ See http://forrest.apache.org/docs/linking.html for more info -